X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a420c7ed70d128c5a4d01fb656234cca0c2c3a4d..673ae68a3c63f85da2f58f50c858efb9deeff79c:/build/bakefiles/common.bkl diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 0ff98160d5..f2abec66fd 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -3,7 +3,7 @@ <makefile> - <requires version="0.1.6"/> + <requires version="0.2.3"/> <!-- bakefile modules we need: --> <using module="datafiles"/> @@ -22,41 +22,17 @@ <set var="PLATFORM_MACOS">0</set> </if> - <include file="config.bkl"/> + <!-- FIXME: PalmOS is another candidate to bakefiles --> + <set var="PLATFORM_PALMOS">0</set> - <include file="plugins_deps.bkl"/> - <!-- ================================================================== --> - <!-- wxWidgets version numbers: --> - <!-- ================================================================== --> + <include file="config.bkl"/> - <set var="WXVER_MAJOR">$(wxwin.getVersionMajor())</set> - <set var="WXVER_MINOR">$(wxwin.getVersionMinor())</set> - <set var="WXVER_RELEASE">$(wxwin.getVersionRelease())</set> - <set var="WX_RELEASE" make_var="1"> - $(WXVER_MAJOR).$(WXVER_MINOR) - </set> - <set var="WX_RELEASE_NODOT" make_var="1"> - $(WXVER_MAJOR)$(WXVER_MINOR) - </set> - <set var="WX_VERSION" make_var="1"> - $(WX_RELEASE).$(WXVER_RELEASE) - </set> - <set var="WX_VERSION_NODOT" make_var="1"> - $(WX_RELEASE_NODOT)$(WXVER_RELEASE) - </set> + <include file="plugins_deps.bkl"/> - <set var="WX_STABLE_BRANCH">$(int(int(WXVER_MINOR) % 2 == 0))</set> - <set var="WXSOVERSION"> - <if cond="WX_STABLE_BRANCH=='1'">0.0.0</if> - <if cond="WX_STABLE_BRANCH=='0'">$(WXVER_RELEASE).0.0</if> - </set> - <set var="WXMACVERSION">$(WX_VERSION)</set> - <set var="WXWIN32DLLVERSION"> - <if cond="WX_STABLE_BRANCH=='1'">$(WX_RELEASE_NODOT)</if> - <if cond="WX_STABLE_BRANCH=='0'">$(WX_VERSION_NODOT)</if> - </set> + <!-- wxWidgets version numbers logic: --> + <include file="version.bkl"/> <!-- ================================================================== --> @@ -145,6 +121,9 @@ <set var="WXLIB_NET"> <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('net')))</if> </set> + <set var="WXLIB_QA"> + <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('qa')))</if> + </set> <set var="WXLIB_CORE"> <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('core')))</if> </set> @@ -152,7 +131,7 @@ <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('adv')))</if> </set> <set var="WXLIB_MEDIA"> - <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('media')))</if> + <if cond="MONOLITHIC=='0' and USE_MEDIA=='1'">$(mk.evalExpr(wxwin.mkLibName('media')))</if> </set> <set var="WXLIB_HTML"> <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('html')))</if> @@ -163,13 +142,17 @@ <set var="WXLIB_XRC"> <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('xrc')))</if> </set> - <set var="WXLIB_ODBC"> - <if cond="MONOLITHIC=='0' and USE_ODBC=='1'"> - $(mk.evalExpr(wxwin.mkLibName('odbc'))) - </if> + <set var="WXLIB_AUI"> + <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('aui')))</if> + </set> + <set var="WXLIB_PROPGRID"> + <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('propgrid')))</if> + </set> + <set var="WXLIB_RICHTEXT"> + <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('richtext')))</if> </set> - <set var="WXLIB_DBGRID"> - <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('dbgrid')))</if> + <set var="WXLIB_STC"> + <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('stc')))</if> </set> <set var="WXLIB_MONO"> @@ -183,6 +166,10 @@ <set var="DIR_SUFFIX_CPU"> <if cond="FORMAT=='msevc4prj'">_$(CPU)</if> + <if cond="TARGET_CPU=='amd64'">_amd64</if> + <if cond="TARGET_CPU=='AMD64'">_amd64</if> + <if cond="TARGET_CPU=='ia64'">_ia64</if> + <if cond="TARGET_CPU=='IA64'">_ia64</if> </set> <if cond="FORMAT!='autoconf'"> @@ -192,27 +179,29 @@ <set var="CFG_NAME_PART"> $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) </set> + + <!-- NB: this is make_var so that it can be overriden on command line + like this: nmake -f makefile.vc COMPILER_PREFIX=vc6 --> + <set var="COMPILER_PREFIX" make_var="1">$(COMPILER)</set> + <set var="OBJS" make_var="1"> - <if cond="FORMAT!='cbuilderx'"> - $(COMPILER)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU) - </if> - <!-- FIXME: waiting for removal after CBX has better ../ dirs - support --> - <if cond="FORMAT=='cbuilderx'">build_cbx_$(CFG_NAME_PART)</if> + $(COMPILER_PREFIX)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU) </set> <set var="BUILDDIR">$(OBJS)</set> </if> <set var="LIBTYPE_SUFFIX" make_var="1"> - <if cond="FORMAT!='autoconf' and SHARED=='0'">lib</if> - <if cond="FORMAT!='autoconf' and SHARED=='1'">dll</if> + <if cond="FORMAT!='autoconf' and SHARED=='0' and PLATFORM_WIN32=='1'">lib</if> + <if cond="FORMAT!='autoconf' and SHARED=='1' and PLATFORM_WIN32=='1'">dll</if> + <if cond="FORMAT=='watcom' and SHARED=='0' and PLATFORM_WIN32=='0'">$(TOOLKIT_LOWERCASE)_lib</if> + <if cond="FORMAT=='watcom' and SHARED=='1' and PLATFORM_WIN32=='0'">$(TOOLKIT_LOWERCASE)_dll</if> </set> <set var="LIBDIRNAME" make_var="1"> - <if cond="FORMAT=='autoconf'">$(top_builddir)lib</if> + <if cond="FORMAT=='autoconf'">$(wx_top_builddir)/lib</if> <if cond="FORMAT!='autoconf'"> - $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) + $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) </if> </set> @@ -235,7 +224,8 @@ <if cond="DEBUG_INFO=='0'">off</if> </set> <set var="DEBUGRUNTIME"> - <if cond="DEBUG_RUNTIME_LIBS=='default'">$(DEBUGINFO)</if> + <if cond="DEBUG_RUNTIME_LIBS=='default' and BUILD=='debug'">on</if> + <if cond="DEBUG_RUNTIME_LIBS=='default' and BUILD=='release'">off</if> <if cond="DEBUG_RUNTIME_LIBS=='0'">off</if> <if cond="DEBUG_RUNTIME_LIBS=='1'">on</if> </set> @@ -247,6 +237,24 @@ <if cond="USE_EXCEPTIONS=='1'">on</if> <if cond="USE_EXCEPTIONS=='0'">off</if> </set> + <set var="RTTIFLAG"> + <if cond="USE_RTTI=='1'">on</if> + <if cond="USE_RTTI=='0'">off</if> + </set> + <set var="THREADSFLAG"> + <if cond="USE_THREADS=='1'">multi</if> + <if cond="USE_THREADS=='0'">single</if> + </set> + + <set var="RTTI_DEFINE"> + <if cond="USE_RTTI=='0'">wxNO_RTTI</if> + </set> + <set var="EXCEPTIONS_DEFINE"> + <if cond="USE_EXCEPTIONS=='0'">wxNO_EXCEPTIONS</if> + </set> + <set var="THREAD_DEFINE"> + <if cond="USE_THREADS=='0'">wxNO_THREADS</if> + </set> <set var="DEBUG_DEFINE"> <if cond="FORMAT!='autoconf' and BUILD=='debug' and DEBUG_FLAG=='default'">__WXDEBUG__</if> @@ -259,6 +267,10 @@ </set> <set var="UNICODE_DEFINE"> <if cond="FORMAT!='autoconf' and UNICODE=='1'">_UNICODE</if> + <if cond="FORMAT!='autoconf' and UNICODE=='0'">wxUSE_UNICODE=0</if> + </set> + <set var="MSLU_DEFINE"> + <if cond="FORMAT!='autoconf' and MSLU=='1'">wxUSE_UNICODE_MSLU=1</if> </set> <!-- fill for the specific case of the format/compiler --> @@ -270,19 +282,39 @@ <if cond="MSLU=='1'">unicows</if> </set> + <if cond="FORMAT!='autoconf'"> + <set var="GDIPLUS_LIB"> + <if cond="USE_GDIPLUS=='1'">gdiplus</if> + </set> + <set var="GFXCTX_DEFINE"> + <if cond="USE_GDIPLUS=='1'">wxUSE_GRAPHICS_CONTEXT=1</if> + </set> + </if> + + <set var="LINK_TARGET_CPU"> + <if cond="TARGET_CPU=='amd64'">/MACHINE:AMD64</if> + <if cond="TARGET_CPU=='AMD64'">/MACHINE:AMD64</if> + <if cond="TARGET_CPU=='ia64'">/MACHINE:IA64</if> + <if cond="TARGET_CPU=='IA64'">/MACHINE:IA64</if> + </set> + <template id="common_settings"> <debug-info>$(DEBUGINFO)</debug-info> <debug-runtime-libs>$(DEBUGRUNTIME)</debug-runtime-libs> <optimize>$(OPTIMIZEFLAG)</optimize> - <threading>multi</threading> + <threading>$(THREADSFLAG)</threading> <runtime-libs>$(RUNTIME_LIBS)</runtime-libs> - <cxx-rtti>$(EXCEPTIONSFLAG)</cxx-rtti> + <cxx-rtti>$(RTTIFLAG)</cxx-rtti> <cxx-exceptions>$(EXCEPTIONSFLAG)</cxx-exceptions> <if cond="FORMAT!='autoconf'"> <cppflags>$(EXTRACFLAGS)</cppflags> </if> <define>$(NO_VC_CRTDBG)</define> <define>$(WIN32_WINNT)</define> + <if cond="FORMAT=='msvc'"> + <ldflags>$(LINK_TARGET_CPU)</ldflags> + </if> + <include cond="FORMAT=='msevc4prj'">$(TOP_SRCDIR)build/wince/missing</include> </template> <template id="anylib"> @@ -308,43 +340,114 @@ <!-- deal with the need to copy setup.h here: --> - <set var="IS_MSVC_PRJ">$(FORMAT in ['msvc6prj','msevc4prj'])</set> - <define-tag name="msvc-headers" rules="dll,lib"> <if cond="IS_MSVC_PRJ"> <msvc-project-files> - $(addPrefixToList('include\', wxwin.headersOnly(value))) + $(addPrefixToList('include\\', wxwin.headersOnly(value))) </msvc-project-files> </if> </define-tag> - <define-tag name="msvc-copy-setup-h" rules="dll,lib"> - <if cond="FORMAT=='msevc4prj'"> - <msvc-headers>wx/msw/wince/setup.h</msvc-headers> - <set var="vc_setup_h">wince\setup.h</set> - <set var="vc_setup_h_rule">wince_setup_h</set> + <set var="msvc_copy_setup_h_script"> + <if cond="IS_MSVC_PRJ"> +Creating $(SETUPHDIR)\wx\setup.h +InputPath=..\..\include\wx\%s + +"$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)" +$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h </if> - <if cond="FORMAT!='msevc4prj'"> - <msvc-headers>wx/msw/setup.h</msvc-headers> - <set var="vc_setup_h">setup.h</set> - <set var="vc_setup_h_rule">setup_h</set> + </set> + <!-- this should be removed after new bakefile release --> + <if cond="FORMAT in ['msvs2005prj','msvs2003prj']"> + <if cond="BAKEFILE_VERSION!='0.2.3'"> + <warning>FIXME: THIS OBSOLETE CODE ISN'T NEEDED ANYMORE</warning> </if> + <set var="msvc_copy_setup_h_script"> +Creating $(SETUPHDIR)\wx\setup.h +InputPath=..\..\include\wx\%s + +"$(SETUPHDIR)\wx\setup.h" : "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)" +$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h + </set> + </if> + <!-- end of what should be removed after new bakefile release --> + + <define-tag name="msvc-headers-setup-h" rules="dll,lib"> <if cond="IS_MSVC_PRJ"> + <msvc-headers> + $(addPrefixToList('wx/', value)) + </msvc-headers> <set var="_custom_build_files" append="1"> - include\wx\msw\$(vc_setup_h) + $(nativePaths(addPrefixToList('include/wx/', value))) </set> - <set var="_custom_build_include_wx_msw_$(vc_setup_h_rule)"> -Creating $(SETUPHDIR)\wx\setup.h -InputPath=..\include\wx\msw\$(vc_setup_h) + </if> + </define-tag> -"$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)" -$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h + <define-tag name="msvc-copy-setup-h" rules="dll,lib"> + <if cond="IS_MSVC_PRJ"> + <if cond="FORMAT=='msevc4prj'"> + <msvc-headers-setup-h> + msw/wince/setup.h + </msvc-headers-setup-h> + <set var="_custom_build_include_wx_msw_wince_setup_h"> + $(msvc_copy_setup_h_script % 'msw\wince\setup.h') + </set> + </if> + <if cond="FORMAT!='msevc4prj'"> + <msvc-headers-setup-h> + msw/setup.h + univ/setup.h + </msvc-headers-setup-h> + <set var="_custom_build_include_wx_msw_setup_h"> + <if cond="WXUNIV=='0'"> + $(msvc_copy_setup_h_script % 'msw\setup.h') + </if> + </set> + <set var="_custom_build_include_wx_univ_setup_h"> + <if cond="WXUNIV=='1'"> + $(msvc_copy_setup_h_script % 'univ\setup.h') + </if> + </set> + </if> + </if> + </define-tag> + + <define-tag name="msvc-create-rcdefs-h" rules="dll,lib"> + <if cond="IS_MSVC_PRJ"> + <msvc-headers-setup-h> + msw/genrcdefs.h + </msvc-headers-setup-h> + <!-- FIXME: we need another way to get the compiler name --> + <set var="VC_COMPILER"> + <if cond="FORMAT=='msevc4prj'">$(_COMPILER)</if> + <if cond="FORMAT!='msevc4prj'">cl</if> </set> + <set var="_custom_build_include_wx_msw_genrcdefs_h"> +Creating $(SETUPHDIR)\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h + +"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(SETUPHDIR)\wx\msw" +$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h" + </set> + <!-- this should be removed after new bakefile release --> + <if cond="FORMAT in ['msvs2005prj','msvs2003prj']"> + <if cond="BAKEFILE_VERSION!='0.2.3'"> + <warning>FIXME: THIS OBSOLETE CODE ISN'T NEEDED ANYMORE</warning> + </if> + <set var="_custom_build_include_wx_msw_genrcdefs_h"> +Creating $(SETUPHDIR)\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h + +"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(SETUPHDIR)\wx\msw" +$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h" + </set> + </if> </if> </define-tag> <template id="msvc_setup_h"> <msvc-copy-setup-h/> + <msvc-create-rcdefs-h/> </template> <!-- =============================================================== --> @@ -357,8 +460,8 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h <include file="png.bkl"/> <include file="jpeg.bkl"/> <include file="tiff.bkl"/> - <include file="odbc.bkl"/> <include file="expat.bkl"/> + <include file="scintilla.bkl"/> <!-- =============================================================== --> @@ -378,18 +481,34 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h <if cond="MONOLITHIC=='0'">$(EXTRALIBS_GUI)</if> </set> + <if cond="TOOLKIT=='MGL' and FORMAT=='watcom'"> + <set var="MGLLIBPATH">$(DOLLAR)(%SCITECH)/lib/$(BUILD)/dos32/ow10</set> + <set var="MGLPMLIBPATH"> + <if cond="DOS32=='DOS4GW'">dos4gw</if> + </set> + </if> + <template id="wx" template="common_settings"> <set var="wxid">$(wxwin.mk_wxid(id))</set> <define>__WX$(TOOLKIT)__</define> <define>$(WXUNIV_DEFINE)</define> <define>$(DEBUG_DEFINE)</define> + <define>$(EXCEPTIONS_DEFINE)</define> + <define>$(RTTI_DEFINE)</define> + <define>$(THREAD_DEFINE)</define> <define>$(UNICODE_DEFINE)</define> - <!-- this include is added by configure, we need to put other - includes before it: --> + <define>$(MSLU_DEFINE)</define> + <if cond="FORMAT!='autoconf'"><define>$(GFXCTX_DEFINE)</define></if> + <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include> <include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include> <lib-path>$(LIBDIRNAME)</lib-path> - <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include> + <if cond="TOOLKIT=='MGL' and FORMAT=='watcom'"> + <lib-path>$(MGLLIBPATH)</lib-path> + <lib-path>$(MGLLIBPATH)/$(MGLPMLIBPATH)</lib-path> + </if> + <warnings>max</warnings> + <cxxflags cond="FORMAT=='autoconf'">$(CXXWARNINGS)</cxxflags> <cppflags-watcom> -wcd=549 <!-- 'sizeof' operand contains compiler generated information --> -wcd=656 <!-- define this function inside its class definition (may improve code quality) --> @@ -404,19 +523,30 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h <!-- for both GUI and wxBase libs/samples: --> <template id="wx_append_base_nomono"> <!-- link against builtin 3rd party libs, if needed: --> - <sys-lib>$(LIB_TIFF)</sys-lib> - <sys-lib>$(LIB_JPEG)</sys-lib> - <sys-lib>$(LIB_PNG)</sys-lib> <sys-lib>$(LIB_ZLIB)</sys-lib> - <sys-lib>$(LIB_ODBC)</sys-lib> <sys-lib>$(LIB_REGEX)</sys-lib> <sys-lib>$(LIB_EXPAT)</sys-lib> <ldlibs>$(EXTRALIBS_FOR_BASE)</ldlibs> + <!-- system libraries on os2: --> + <if cond="FORMAT!='autoconf' and PLATFORM_OS2=='1'"> + <if cond="FORMAT=='watcom'"> + <sys-lib>upm32</sys-lib> + </if> + </if> + + <!-- system libraries on mgl: --> + <if cond="FORMAT=='watcom' and TOOLKIT=='MGL'"> + <sys-lib>mgl</sys-lib> + <sys-lib>mglcpp</sys-lib> + <sys-lib>pm</sys-lib> + </if> + <!-- system libraries on windows: --> - <if cond="FORMAT!='autoconf'"> + <if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'"> <sys-lib>$(UNICOWS_LIB)</sys-lib> + <sys-lib>$(GDIPLUS_LIB)</sys-lib> <if cond="FORMAT=='borland'"> <sys-lib>ole2w32</sys-lib> </if> @@ -444,18 +574,18 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h <sys-lib>advapi32</sys-lib> <sys-lib>wsock32</sys-lib> </if> - <if cond="FORMAT=='msvc' or FORMAT=='msvc6prj' or FORMAT=='borland'"> + <if cond="FORMAT=='borland'"> <sys-lib>oleacc</sys-lib> </if> - <if cond="FORMAT!='msevc4prj'"> - <sys-lib>odbc32</sys-lib> - </if> </if> </template> <!-- for GUI libs/samples: --> - <template id="wx_append_nomono" template="wx_append_base_nomono"> + <template id="wx_append_nomono" template_append="wx_append_base_nomono"> + <sys-lib>$(LIB_TIFF)</sys-lib> + <sys-lib>$(LIB_JPEG)</sys-lib> + <sys-lib>$(LIB_PNG)</sys-lib> <ldlibs>$(EXTRALIBS_FOR_GUI)</ldlibs> </template> @@ -476,11 +606,13 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h <set var="WXLIBNAME">$(wxwin.mkLibName(wxid))</set> <libname>$(WXLIBNAME)</libname> + <define>WXBUILDING</define> + <if cond="WX_DISABLE_PRECOMP_HEADERS=='0'"> - <if cond="FORMAT!='autoconf' and TOOLKIT=='MSW'"> - <sources>$(WXTOPDIR)src/msw/dummy.cpp</sources> + <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL','PM','WINCE']"> + <sources>$(WXTOPDIR)src/common/dummy.cpp</sources> <precomp-headers-gen> - $(WXTOPDIR)src/msw/dummy.cpp + $(WXTOPDIR)src/common/dummy.cpp </precomp-headers-gen> </if> <precomp-headers-location>$(WXTOPDIR)include</precomp-headers-location> @@ -489,8 +621,6 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h <precomp-headers-file>wxprec_$(id)</precomp-headers-file> <precomp-headers-exclude> src/common/extended.c - src/msw/gsocket.cpp - src/msw/gsockmsw.cpp </precomp-headers-exclude> </if> @@ -509,29 +639,51 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h </if> </template> + <if cond="FORMAT=='autoconf'"> + <set var="RCDEFDIR"> + <if cond="TOOLKIT=='MSW'"> + $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) + </if> + </set> + </if> + <template id="wx_dll_b" template="wx_lib_b"> <set var="WXDLLNAME">$(wxwin.mkDllName(wxid))</set> <dllname>$(WXDLLNAME)</dllname> <version>$(WX_VERSION)</version> <so_version>$(WXSOVERSION)</so_version> - <mac_version>$(WXMACVERSION)</mac_version> + + <!-- FIXME: until libtool scheme is implemented in bakefile --> + <ldflags cond="FORMAT=='autoconf'">$(WXMACVERSION_CMD)</ldflags> + + <!-- version info resources: --> + <res-define>WXDLLNAME=$(WXDLLNAME)</res-define> + <if cond="FORMAT=='autoconf'"> + <res-include>$(RCDEFDIR)</res-include> + <res-include>$(TOP_SRCDIR)include</res-include> + </if> + <win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res> </template> <template id="wx_3rdparty_dependencies_gui" cond="USE_GUI=='1'"> <depends>wxtiff</depends> <depends>wxjpeg</depends> <depends>wxpng</depends> + <depends>wxscintilla</depends> </template> <template id="wx_3rdparty_dependencies" template="wx_3rdparty_dependencies_gui"> <depends>wxexpat</depends> <depends>wxzlib</depends> - <depends cond="FORMAT=='autoconf'">wxodbc</depends> <depends>wxregex</depends> </template> <template id="wx_3rdparty_includes_gui" cond="USE_GUI=='1'"> + <if cond="FORMAT=='watcom' and TOOLKIT=='MGL'"> + <include>$(DOLLAR)(%SCITECH)/include</include> + </if> + <include>$(INC_TIFF_BUILD)</include> <include>$(INC_TIFF)</include> <include>$(INC_JPEG)</include> <include>$(INC_PNG)</include> @@ -540,7 +692,6 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h <template id="wx_3rdparty_includes" template="wx_3rdparty_includes_gui"> <include>$(INC_ZLIB)</include> - <include>$(INC_ODBC)</include> <include>$(INC_REGEX)</include> <include>$(INC_EXPAT)</include> </template> @@ -616,14 +767,15 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h </define-rule> <!-- =============================================================== --> - <!-- Support for wxWidgets samples and contrib: --> + <!-- Support for wxWidgets samples: --> <!-- =============================================================== --> <!-- Link against one wxWin library. Value must be literal! --> <define-tag name="wx-lib" rules="exe,dll,module"> <sys-lib>$(wxwin.libToLink(value))</sys-lib> <ldlibs>$(wxwin.extraLdflags(value))</ldlibs> - <if cond="IS_MSVC_PRJ=='1' and MONOLITHIC=='0'"> + <!-- msvs200?prj formats don't support external dependencies yet: --> + <if cond="FORMAT in ['msvc6prj','msevc4prj'] and MONOLITHIC=='0'"> <depends-on-dsp>$(wxwin.makeDspDependency(value))</depends-on-dsp> </if> </define-tag>