diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2004-08-02 13:04:46 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2004-08-02 13:04:46 +0000 |
| commit | 4644549b78232a217760bb440a773637e1954053 (patch) | |
| tree | ca647461f9c2c63311c5526dca652b4a4d8792cc | |
| parent | 50eb6bd1bcb7ee81fa38618b8a72f95b67be95e7 (diff) | |
| download | MPC-4644549b78232a217760bb440a773637e1954053.tar.gz | |
ChangeLogTag: Mon Aug 2 08:04:27 2004 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | templates/bmake.mpd | 5 | ||||
| -rw-r--r-- | templates/bmakecommon.mpt | 1 |
3 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,12 @@ +Mon Aug 2 08:04:27 2004 Chad Elliott <elliott_c@ociweb.com> + + * templates/bmake.mpd: + * templates/bmakecommon.mpt: + + Removed ACE specific portions of the bmake template. They will + need to be supplied on the command line using the -value_template + and -value_project options. + Sun Aug 1 08:31:49 2004 J.T. Conklin <jtc@acorntoolworks.com> * templates/automake.mpd: diff --git a/templates/bmake.mpd b/templates/bmake.mpd index adf24875..519143fd 100644 --- a/templates/bmake.mpd +++ b/templates/bmake.mpd @@ -53,7 +53,7 @@ NAME = <%staticname%>$(LIBMODIFIER) <%endif%> <%endif%> CPPDIR = <%cppdir%> -UNICODE_CFLAGS = -DACE_USES_WCHAR -WU +UNICODE_CFLAGS = <%unicode_flags%> <%if(exename || sharedname || staticname)%> @@ -90,7 +90,6 @@ RESOURCE = \ <%endif%> CFLAGS = \ - -DACE_LD_DECORATOR_STR=ACE_LIB_TEXT(\"$(LIBMODIFIER)\") \ <%if(pch_header)%> <%foreach(pch_defines)%> # Borland precompiled headers choke on some header files. @@ -254,7 +253,7 @@ realclean: clean <%endif%> if exist "$(OUTPUTDIR)$(NAME)$(POSTLINKRM)" del $(OUTPUTDIR)$(NAME)$(POSTLINKRM) <%if(sharedname)%> - if exist "$(OUTPUTDIR)$(NAME)$(DLL_EXT)" del $(OUTPUTDIR)$(NAME)$(DLL_EXT) + if exist "$(OUTPUTDIR)$(NAME)$(DLL_EXT)" del $(OUTPUTDIR)$(NAME)$(DLL_EXT) <%endif%> <%marker(bottom)%> diff --git a/templates/bmakecommon.mpt b/templates/bmakecommon.mpt index e1af917a..62219538 100644 --- a/templates/bmakecommon.mpt +++ b/templates/bmakecommon.mpt @@ -8,6 +8,7 @@ compilers = bcc common_defines = WIN32 _WINDOWS _NO_VCL common_libs = import32$(LIB_EXT) cw32mt.lib ws2_32.lib common_flags = -a8 +unicode_flags = -WU bcc { obj_ext = .obj |