X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/15e8daecf594d38a57bc750f58de0ea33b79f4ee..f284605f65f6f957c90452b574f4131079819b53:/contrib/build/deprecated/makefile.bcc diff --git a/contrib/build/deprecated/makefile.bcc b/contrib/build/deprecated/makefile.bcc index e163d219a8..fea7b8f34f 100644 --- a/contrib/build/deprecated/makefile.bcc +++ b/contrib/build/deprecated/makefile.bcc @@ -8,7 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -!include ../../../build/config.bcc +!include ../../../build/msw/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -23,71 +23,57 @@ BCCDIR = $(MAKEDIR)\.. DEPRECATEDDLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \ - -I$(LIBDIRNAME) -I..\..\src\deprecated\..\..\..\src\tiff \ - -I..\..\src\deprecated\..\..\..\src\jpeg \ - -I..\..\src\deprecated\..\..\..\src\png \ - -I..\..\src\deprecated\..\..\..\src\zlib \ - -I..\..\src\deprecated\..\..\..\src\regex \ - -I..\..\src\deprecated\..\..\..\src\expat\lib \ - -I..\..\src\deprecated\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED \ - $(CFLAGS) + -I$(SETUPHDIR) -I..\..\src\deprecated\..\..\include -DWXUSINGDLL \ + -DWXMAKINGDLL_DEPRECATED -I..\..\src\deprecated $(CFLAGS) DEPRECATEDDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \ - -I$(LIBDIRNAME) -I..\..\src\deprecated\..\..\..\src\tiff \ - -I..\..\src\deprecated\..\..\..\src\jpeg \ - -I..\..\src\deprecated\..\..\..\src\png \ - -I..\..\src\deprecated\..\..\..\src\zlib \ - -I..\..\src\deprecated\..\..\..\src\regex \ - -I..\..\src\deprecated\..\..\..\src\expat\lib \ - -I..\..\src\deprecated\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED \ - $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_deprecateddll.csm + -I$(SETUPHDIR) -I..\..\src\deprecated\..\..\include -DWXUSINGDLL \ + -DWXMAKINGDLL_DEPRECATED -I..\..\src\deprecated $(CXXFLAGS) -Hu \ + -H=$(OBJS)\wxprec_deprecateddll.csm DEPRECATEDDLL_OBJECTS = \ $(OBJS)\deprecateddll_dummy.obj \ $(OBJS)\deprecateddll_prop.obj \ $(OBJS)\deprecateddll_propform.obj \ $(OBJS)\deprecateddll_proplist.obj \ $(OBJS)\deprecateddll_resource.obj \ + $(OBJS)\deprecateddll_tbarsmpl.obj \ $(OBJS)\deprecateddll_treelay.obj \ $(OBJS)\deprecateddll_wxexpr.obj \ $(OBJS)\deprecateddll_dosyacc.obj DEPRECATEDLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \ - -I$(LIBDIRNAME) -I..\..\src\deprecated\..\..\..\src\tiff \ - -I..\..\src\deprecated\..\..\..\src\jpeg \ - -I..\..\src\deprecated\..\..\..\src\png \ - -I..\..\src\deprecated\..\..\..\src\zlib \ - -I..\..\src\deprecated\..\..\..\src\regex \ - -I..\..\src\deprecated\..\..\..\src\expat\lib \ - -I..\..\src\deprecated\..\..\include $(CFLAGS) + -I$(SETUPHDIR) -I..\..\src\deprecated\..\..\include -I..\..\src\deprecated \ + $(CFLAGS) DEPRECATEDLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \ - -I$(LIBDIRNAME) -I..\..\src\deprecated\..\..\..\src\tiff \ - -I..\..\src\deprecated\..\..\..\src\jpeg \ - -I..\..\src\deprecated\..\..\..\src\png \ - -I..\..\src\deprecated\..\..\..\src\zlib \ - -I..\..\src\deprecated\..\..\..\src\regex \ - -I..\..\src\deprecated\..\..\..\src\expat\lib \ - -I..\..\src\deprecated\..\..\include $(CXXFLAGS) -Hu \ - -H=$(OBJS)\wxprec_deprecatedlib.csm + -I$(SETUPHDIR) -I..\..\src\deprecated\..\..\include -I..\..\src\deprecated \ + $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_deprecatedlib.csm DEPRECATEDLIB_OBJECTS = \ $(OBJS)\deprecatedlib_dummy.obj \ $(OBJS)\deprecatedlib_prop.obj \ $(OBJS)\deprecatedlib_propform.obj \ $(OBJS)\deprecatedlib_proplist.obj \ $(OBJS)\deprecatedlib_resource.obj \ + $(OBJS)\deprecatedlib_tbarsmpl.obj \ $(OBJS)\deprecatedlib_treelay.obj \ $(OBJS)\deprecatedlib_wxexpr.obj \ $(OBJS)\deprecatedlib_dosyacc.obj -LIBDIRNAME = \ - ..\..\src\deprecated\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) ### Conditionally set variables: ### +!if "$(SHARED)" == "0" +LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\bcc_lib$(CFG) +!endif +!if "$(SHARED)" == "1" +LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\bcc_dll$(CFG) +!endif !if "$(USE_GUI)" == "0" PORTNAME = base !endif @@ -163,6 +149,9 @@ __RUNTIME_LIBS_7 = !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 !endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif !if "$(MONOLITHIC)" == "0" __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif @@ -213,6 +202,9 @@ $(OBJS)\deprecateddll_proplist.obj: ../../src/deprecated\proplist.cpp $(OBJS)\deprecateddll_resource.obj: ../../src/deprecated\resource.cpp $(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) $** +$(OBJS)\deprecateddll_tbarsmpl.obj: ../../src/deprecated\tbarsmpl.cpp + $(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) $** + $(OBJS)\deprecateddll_treelay.obj: ../../src/deprecated\treelay.cpp $(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) $** @@ -237,6 +229,9 @@ $(OBJS)\deprecatedlib_proplist.obj: ../../src/deprecated\proplist.cpp $(OBJS)\deprecatedlib_resource.obj: ../../src/deprecated\resource.cpp $(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) $** +$(OBJS)\deprecatedlib_tbarsmpl.obj: ../../src/deprecated\tbarsmpl.cpp + $(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) $** + $(OBJS)\deprecatedlib_treelay.obj: ../../src/deprecated\treelay.cpp $(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) $** @@ -251,15 +246,15 @@ clean: -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib !if "$(SHARED)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).dll: $(DEPRECATEDDLL_OBJECTS) $(OBJS)\deprecateddll_dummy.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).dll: $(OBJS)\deprecateddll_dummy.obj $(DEPRECATEDDLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(DEPRECATEDDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, + c0d32.obj $(DEPRECATEDDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) import32.lib ole2w32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated $@ !endif !if "$(SHARED)" == "0" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib: $(DEPRECATEDLIB_OBJECTS) $(OBJS)\deprecatedlib_dummy.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib: $(OBJS)\deprecatedlib_dummy.obj $(DEPRECATEDLIB_OBJECTS) if exist $@ del $@ tlib /a /p2048 $@ @&&| $(DEPRECATEDLIB_OBJECTS)