ChangeLogTag: Mon Mar 11 12:28:12 2002 Johnny Willemsen <jwillemsen@remedy.nl>

7 files changed, 68 insertions, 23 deletions

diff --git a/include/makeinclude/build_dll.bor b/include/makeinclude/build_dll.bor
index 8101289214d..e44e309b4fb 100644
--- a/include/makeinclude/build_dll.bor
+++ b/include/makeinclude/build_dll.bor
@@ -10,6 +10,7 @@
 # LIBFILES - list of (non-system) libraries
 # PASCAL - if defined means link dll against pascal run-time library
 # DEBUG	- if defined means building with debug information
+# UNICODE - if defined when building a unicode dll
 #
 
 # All DLLs are copied into the common bin directory so that they always
diff --git a/include/makeinclude/build_exe.bor b/include/makeinclude/build_exe.bor
index 3e601e8f61d..b90489cebcf 100644
--- a/include/makeinclude/build_exe.bor
+++ b/include/makeinclude/build_exe.bor
@@ -11,6 +11,7 @@
 # STATIC - if defined means link exe with static libraries
 # PASCAL - if defined means link dll against pascal run-time library
 # DEBUG	- if defined means building with debug information
+# UNICODE - if defined when building a unicode exe
 #
 
 !include <$(ACE_ROOT)\include\makeinclude\decorator.bor>
diff --git a/include/makeinclude/build_lib.bor b/include/makeinclude/build_lib.bor
index 49f9850ea17..6b279396c09 100644
--- a/include/makeinclude/build_lib.bor
+++ b/include/makeinclude/build_lib.bor
@@ -10,6 +10,7 @@
 # LIBFILES - list of (non-system) libraries
 # PASCAL - if defined means link dll against pascal run-time library
 # DEBUG	- if defined means building with debug information
+# UNICODE - if defined when building a unicode lib
 #
 
 !ifdef INSTALL_THIS_TARGET
diff --git a/include/makeinclude/compiler.bor b/include/makeinclude/compiler.bor
index 6e0d1818c76..8b380503165 100644
--- a/include/makeinclude/compiler.bor
+++ b/include/makeinclude/compiler.bor
@@ -6,6 +6,7 @@
 # STATIC - if defined means creating a static library or executable
 # PASCAL - if defined means link dll against pascal run-time library
 # DEBUG - if defined means building with debug information
+# UNICODE - if defined means building unicode
 #
 # Outputs:
 # ~~~~~~~~
@@ -63,6 +64,10 @@ STATIC_LFLAGS =
 CODEGUARD_CFLAGS = -vG
 !endif
 
+!ifdef UNICODE
+UNICODE_CFLAGS = -DACE_USES_WCHAR -WU -DUNICODE -D_UNICODE
+!endif
+
 THREAD_CFLAGS = -D_MT -tWM
 WARNINGS_CFLAGS = -w-rvl -w-rch -w-ccc -w-obs -w-aus -w-pia -w-inl
 DEFINES_CFLAGS = -DWIN32;_NO_VCL
@@ -71,7 +76,7 @@ MISC_CFLAGS = -a8 -b
 
 COMMON_CFLAGS = $(QUIET_CFLAGS) $(DEBUG_CFLAGS) $(THREAD_CFLAGS) \
 	$(STATIC_CFLAGS) $(WARNINGS_CFLAGS) $(DEFINES_CFLAGS) \
-	$(MISC_CFLAGS) $(CODEGUARD_CFLAGS)
+        $(MISC_CFLAGS) $(CODEGUARD_CFLAGS) $(UNICODE_CFLAGS)
 
 COMMON_LFLAGS = $(DEBUG_LFLAGS) $(STATIC_LFLAGS) -x -w-dup -Gn
 
@@ -82,10 +87,18 @@ COMMON_LFLAGS = $(DEBUG_LFLAGS) $(STATIC_LFLAGS) -x -w-dup -Gn
 DLL_CFLAGS = -tWD
 DLL_LFLAGS = -Tpd -Gi
 !ifdef PASCAL
+!ifdef UNICODE
+DLL_STARTUP_OBJ = c0d32w.obj sysinit.obj
+!else
 DLL_STARTUP_OBJ = c0d32.obj sysinit.obj
+!endif
+!else
+!ifdef UNICODE
+DLL_STARTUP_OBJ = c0d32w.obj
 !else
 DLL_STARTUP_OBJ = c0d32.obj
 !endif
+!endif
 
 #
 # EXE specific flags
@@ -94,10 +107,18 @@ DLL_STARTUP_OBJ = c0d32.obj
 EXE_CFLAGS =
 EXE_LFLAGS = -Tpe
 !ifdef PASCAL
+!ifdef UNICODE
+EXE_STARTUP_OBJ = c0x32w.obj sysinit.obj
+!else
 EXE_STARTUP_OBJ = c0x32.obj sysinit.obj
+!endif
+!else
+!ifdef UNICODE
+EXE_STARTUP_OBJ = c0x32w.obj
 !else
 EXE_STARTUP_OBJ = c0x32.obj
 !endif
+!endif
 
 #
 # Static lib specific flags
diff --git a/include/makeinclude/decorator.bor b/include/makeinclude/decorator.bor
index 0b20bcbdeb5..5083017b2f8 100644
--- a/include/makeinclude/decorator.bor
+++ b/include/makeinclude/decorator.bor
@@ -1,18 +1,19 @@
 #
 # Creates a suffix for decorating output file names
 #
-# Inputs: 
-# ~~~~~~~ 
+# Inputs:
+# ~~~~~~~
 # DEBUG - defined if building a debug library/executable
-# STATIC - defined if building a static library 
+# STATIC - defined if building a static library
 # PASCAL - defined if linking against cp32*
+# UNICODE - defined if building a unicode version
 #
 # Outputs:
 # ~~~~~~~~
 # LIB_DECORATOR - suffix to be added to library output file name
 # EXE_DECORATOR - suffix to be added to executable output file name
-#    
-     
+#
+
 DECO_PREFIX=
 
 # If you want decoration for Borland, set this to something like "B"
@@ -27,22 +28,27 @@ DECO_PREFIX=_
 DECO_PREFIX=_
 PASCAL_DECO=p
 !endif
-     
+
 !ifdef STATIC
 DECO_PREFIX=_
 STATIC_DECO=s
 !endif
-     
+
 !ifdef DEBUG
 DECO_PREFIX=_
 DEBUG_DECO=d
 !endif
-     
-LIB_DECORATOR=$(DECO_PREFIX)$(BORLAND_DECO)$(PASCAL_DECO)$(STATIC_DECO)$(DEBUG_DECO)
+
+!ifdef UNICODE
+DECO_PREFIX=_
+UNICODE_DECO=u
+!endif
+
+LIB_DECORATOR=$(DECO_PREFIX)$(BORLAND_DECO)$(PASCAL_DECO)$(STATIC_DECO)$(UNICODE_DECO)$(DEBUG_DECO)
 
 !ifdef NO_EXE_DECORATION
 EXE_DECORATOR=
 !else
-EXE_DECORATOR=$(DECO_PREFIX)$(BORLAND_DECO)$(PASCAL_DECO)$(STATIC_DECO)$(DEBUG_DECO)
+EXE_DECORATOR=$(DECO_PREFIX)$(BORLAND_DECO)$(PASCAL_DECO)$(STATIC_DECO)$(UNICODE_DECO)$(DEBUG_DECO)
 !endif
 
diff --git a/include/makeinclude/make_flags.bor b/include/makeinclude/make_flags.bor
index e6fa2a94418..78fe5678615 100644
--- a/include/makeinclude/make_flags.bor
+++ b/include/makeinclude/make_flags.bor
@@ -3,7 +3,7 @@
 #
 
 !ifdef DEBUG
-DEBUG_FLAG = -DDEBUG 
+DEBUG_FLAG = -DDEBUG
 !endif
 
 !ifdef STATIC
@@ -42,5 +42,9 @@ CODEGUARD_FLAG = -DCODEGUARD
 INSTALL_DIR_FLAG = -DINSTALL_DIR=$(INSTALL_DIR)
 !endif
 
-MAKE_FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG) \
+!ifdef UNICODE
+UNICODE_FLAG = -DUNICODE
+!endif
+
+MAKE_FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG) $(UNICODE_FLAG) \
        $(CODEGUARD_FLAG) $(INSTALL_DIR_FLAG)
diff --git a/include/makeinclude/outputdir.bor b/include/makeinclude/outputdir.bor
index 026dada72d0..0979d6fcfde 100644
--- a/include/makeinclude/outputdir.bor
+++ b/include/makeinclude/outputdir.bor
@@ -1,11 +1,12 @@
 #
 # Creates output object and binary file directories
 #
-# Inputs: 
-# ~~~~~~~ 
+# Inputs:
+# ~~~~~~~
 # NAME - undecorated name of target
 # DEBUG - defined if building a debug library/executable
 # STATIC - defined if building a static library
+# UNICODE - defined if building with unicode enabled
 #
 # Outputs:
 # ~~~~~~~~
@@ -14,12 +15,12 @@
 # OBJDIR - name of directory where object fils are placed
 # MAKE_OBJDIR - command to be used for creating OBJDIR
 #
-     
+
 !ifdef STATIC
 STATIC_DIR=Static
 !else
 STATIC_DIR=Dynamic
-!endif 
+!endif
 
 !ifdef DEBUG
 DEBUG_DIR=Debug
@@ -32,7 +33,13 @@ PASCAL_DIR=Pascal
 !else
 PASCAL_DIR=.
 !endif
-     
+
+!ifdef UNICODE
+UNICODE_DIR=Unicode
+!else
+UNICODE_DIR=.
+!endif
+
 # By default binaries are built underneath the current build directory
 !ifndef BASE_BINDIR
 BASE_BINDIR=.
@@ -44,11 +51,11 @@ BASE_OBJDIR=.\obj
 !endif
 
 !ifndef BINDIR
-BINDIR=$(BASE_BINDIR)\$(STATIC_DIR)\$(DEBUG_DIR)\$(PASCAL_DIR)
+BINDIR=$(BASE_BINDIR)\$(STATIC_DIR)\$(DEBUG_DIR)\$(PASCAL_DIR)\$(UNICODE_DIR)
 !endif
 
 !ifndef CORE_BINDIR
-CORE_BINDIR=$(ACE_ROOT)\bin\$(STATIC_DIR)\$(DEBUG_DIR)\$(PASCAL_DIR)
+CORE_BINDIR=$(ACE_ROOT)\bin\$(STATIC_DIR)\$(DEBUG_DIR)\$(PASCAL_DIR)\$(UNICODE_DIR)
 !endif
 
 !ifdef MKDIR
@@ -59,7 +66,7 @@ MAKE_BINDIR=if not exist "$(BINDIR)" mkdir "$(BINDIR)"
 !endif
 
 !ifndef OBJDIR
-OBJDIR=$(BASE_OBJDIR)\$(NAME)\$(STATIC_DIR)\$(DEBUG_DIR)\$(PASCAL_DIR)
+OBJDIR=$(BASE_OBJDIR)\$(NAME)\$(STATIC_DIR)\$(DEBUG_DIR)\$(PASCAL_DIR)\$(UNICODE_DIR)
 !endif
 
 !ifdef MKDIR
@@ -72,12 +79,16 @@ MAKE_OBJDIR=if not exist "$(OBJDIR)" mkdir "$(OBJDIR)"
 !ifndef INSTALL_EXEDIR
 !ifndef STATIC
 !ifndef DEBUG
+!ifndef UNICODE
 INSTALL_EXEDIR=$(INSTALL_DIR)\bin
 !else
-INSTALL_EXEDIR=$(INSTALL_DIR)\bin\$(STATIC_DIR)\$(DEBUG_DIR)
+INSTALL_EXEDIR=$(INSTALL_DIR)\bin\$(STATIC_DIR)\$(DEBUG_DIR)\$(UNICODE_DIR)
+!endif
+!else
+INSTALL_EXEDIR=$(INSTALL_DIR)\bin\$(STATIC_DIR)\$(DEBUG_DIR)\$(UNICODE_DIR)
 !endif
 !else
-INSTALL_EXEDIR=$(INSTALL_DIR)\bin\$(STATIC_DIR)\$(DEBUG_DIR)
+INSTALL_EXEDIR=$(INSTALL_DIR)\bin\$(STATIC_DIR)\$(DEBUG_DIR)\$(UNICODE_DIR)
 !endif
 !endif