X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/390c0cfb06c9576bebef2473a3e3d76bfd2f67a4..bed0b9a68871026165fa2d3a4324b0199ed7718a:/build/bakefiles/common.bkl diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index c846c7a3ad..bd4ac24a21 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -19,7 +19,9 @@ <set var="WXVER_MAJOR">$(wxwin.getVersionMajor())</set> <set var="WXVER_MINOR">$(wxwin.getVersionMinor())</set> <set var="WXVER_RELEASE">$(wxwin.getVersionRelease())</set> - <set var="WX_VERSION">$(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE)</set> + <set var="WX_VERSION" make_var="1"> + $(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE) + </set> <set var="WX_STABLE_BRANCH">$(int(int(WXVER_MINOR) % 2 == 0))</set> @@ -61,7 +63,8 @@ </set> <set var="WXDEBUGFLAG"> - <if cond="BUILD=='debug'">d</if> + <if cond="BUILD=='debug' and DEBUG_FLAG=='default'">d</if> + <if cond="DEBUG_FLAG=='1'">d</if> </set> <set var="WXUNICODEFLAG"> <if cond="UNICODE=='1'">u</if> @@ -115,15 +118,27 @@ <set var="WXLIB_BASE"> <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('base')))</if> </set> + <set var="WXLIB_NET"> + <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('net')))</if> + </set> <set var="WXLIB_CORE"> <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('core')))</if> </set> + <set var="WXLIB_ADV"> + <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('adv')))</if> + </set> <set var="WXLIB_HTML"> <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('html')))</if> </set> <set var="WXLIB_XML"> <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('xml')))</if> </set> + <set var="WXLIB_ODBC"> + <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('odbc')))</if> + </set> + <set var="WXLIB_DBGRID"> + <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('dbgrid')))</if> + </set> <set var="WXLIB_MONO"> <if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if> @@ -148,40 +163,75 @@ <set var="LIBDIRNAME" make_var="1"> <if cond="FORMAT=='autoconf'">$(top_builddir)lib</if> - <if cond="FORMAT!='autoconf'"> - $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)_$(CFG_NAME_PART) + <if cond="FORMAT!='autoconf' and SHARED=='0'"> + $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)_lib$(CFG) + </if> + <if cond="FORMAT!='autoconf' and SHARED=='1'"> + $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)_dll$(CFG) </if> </set> + + <if cond="FORMAT!='autoconf'"> + <set var="SETUPHDIR" make_var="1"> + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) + </set> + </if> + <!-- =============================================================== --> <!-- Templates for libs: --> <!-- =============================================================== --> - <set var="DEBUGFLAG"> - <if cond="BUILD=='debug'">on</if> - <if cond="BUILD=='release'">off</if> + <set var="DEBUGINFO"> + <if cond="BUILD=='debug' and DEBUG_INFO=='default'">on</if> + <if cond="DEBUG_INFO=='1'">on</if> + <if cond="BUILD=='release' and DEBUG_INFO=='default'">off</if> + <if cond="DEBUG_INFO=='0'">off</if> + </set> + <set var="DEBUGRUNTIME"> + <if cond="DEBUG_RUNTIME_LIBS=='default'">$(DEBUGINFO)</if> + <if cond="DEBUG_RUNTIME_LIBS=='0'">off</if> + <if cond="DEBUG_RUNTIME_LIBS=='1'">on</if> </set> <set var="OPTIMIZEFLAG"> <if cond="BUILD=='debug'">off</if> <if cond="BUILD=='release'">speed</if> </set> + <set var="EXCEPTIONSFLAG"> + <if cond="USE_EXCEPTIONS=='1'">on</if> + <if cond="USE_EXCEPTIONS=='0'">off</if> + </set> <set var="DEBUG_DEFINE"> - <if cond="FORMAT!='autoconf' and BUILD=='debug'">__WXDEBUG__</if> + <if cond="FORMAT!='autoconf' and BUILD=='debug' and DEBUG_FLAG=='default'">__WXDEBUG__</if> + <if cond="FORMAT!='autoconf' and DEBUG_FLAG=='1'">__WXDEBUG__</if> + </set> + <!-- does not cover all cases, but better than nothing --> + <set var="NO_VC_CRTDBG"> + <if cond="FORMAT=='msvc' and BUILD=='debug' and DEBUG_RUNTIME_LIBS=='0'">__NO_VC_CRTDBG__</if> + <if cond="FORMAT=='msvc' and BUILD=='release' and DEBUG_FLAG=='1'">__NO_VC_CRTDBG__</if> </set> <set var="UNICODE_DEFINE"> - <if cond="FORMAT!='autoconf' and UNICODE=='1'">wxUSE_UNICODE=1</if> + <if cond="FORMAT!='autoconf' and UNICODE=='1'">_UNICODE</if> + </set> + + <set var="UNICOWS_LIB"> + <if cond="MSLU=='1'">unicows</if> </set> <template id="common_settings"> - <debug-info>$(DEBUGFLAG)</debug-info> + <debug-info>$(DEBUGINFO)</debug-info> + <debug-runtime-libs>$(DEBUGRUNTIME)</debug-runtime-libs> <optimize>$(OPTIMIZEFLAG)</optimize> <threading>multi</threading> <runtime-libs>$(RUNTIME_LIBS)</runtime-libs> + <cxx-rtti>$(EXCEPTIONSFLAG)</cxx-rtti> + <cxx-exceptions>$(EXCEPTIONSFLAG)</cxx-exceptions> <if cond="FORMAT!='autoconf'"> <cppflags>$(EXTRACFLAGS)</cppflags> </if> + <define>$(NO_VC_CRTDBG)</define> </template> <template id="anylib"> @@ -191,6 +241,11 @@ <template id="3rdparty_lib" template="common_settings,anylib"> <libname>$(id)$(WXDEBUGFLAG)$(HOST_SUFFIX)</libname> + <!-- + we want to install 3rd party libs system-wide only with static + version of wxWindows; otherwise they are embedded in shared libs: + --> + <install-if>SHARED=='0'</install-if> </template> @@ -220,14 +275,8 @@ <define>$(UNICODE_DEFINE)</define> <include>$(TOP_SRCDIR)include</include> <lib-path>$(LIBDIRNAME)</lib-path> - <include cond="FORMAT!='autoconf'">$(LIBDIRNAME)</include> - <include>$(INC_TIFF)</include> - <include>$(INC_JPEG)</include> - <include>$(INC_PNG)</include> - <include>$(INC_ZLIB)</include> - <include>$(INC_ODBC)</include> - <include>$(INC_REGEX)</include> - <include>$(INC_EXPAT)</include> + <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include> + <warnings>max</warnings> </template> <!-- for both GUI and wxBase libs/samples: --> @@ -245,8 +294,8 @@ <!-- system libraries on windows: --> <if cond="FORMAT!='autoconf'"> + <sys-lib>$(UNICOWS_LIB)</sys-lib> <if cond="COMPILER=='bcc'"> - <sys-lib>import32</sys-lib> <sys-lib>ole2w32</sys-lib> </if> <if cond="COMPILER!='bcc'"> @@ -266,6 +315,9 @@ <sys-lib>advapi32</sys-lib> <sys-lib>wsock32</sys-lib> </if> + <if cond="COMPILER=='vc' or COMPILER=='bcc'"> + <sys-lib>oleacc</sys-lib> + </if> </if> </template> @@ -276,6 +328,23 @@ </msvc-project-files> </if> </define-tag> + + <define-tag name="msvc-copy-setup-h" rules="dll,lib"> + <if cond="FORMAT=='msvc6prj'"> + <msvc-headers>wx/msw/setup.h</msvc-headers> + <set var="__custom_build_files" append="1"> + include\wx\msw\setup.h + </set> + <set var="__custom_build_include_wx_msw_setup_h"> +Creating $(SETUPHDIR)\wx\setup.h +InputPath=..\include\wx\msw\setup.h + +"$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)" +$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h + </set> + </if> + </define-tag> + <!-- for GUI libs/samples: --> <template id="wx_append_nomono" template="wx_append_base_nomono"> @@ -309,6 +378,26 @@ <precomp-headers-header>wx/wxprec.h</precomp-headers-header> <precomp-headers>on</precomp-headers> <precomp-headers-file>wxprec_$(id)</precomp-headers-file> + <precomp-headers-exclude> + src/common/unzip.c + src/common/extended.c + src/msw/gsocket.c + src/msw/gsockmsw.c + </precomp-headers-exclude> + </if> + + <if cond="FORMAT=='msvc6prj' and BUILDING_LIB=='1'"> + <msvc-file-group>Common Sources:src/common/*</msvc-file-group> + <msvc-file-group>MSW Sources:src/msw/*</msvc-file-group> + <msvc-file-group>Generic Sources:src/generic/*</msvc-file-group> + <msvc-file-group>wxUniv Sources:src/univ/*</msvc-file-group> + <msvc-file-group>wxHTML Sources:src/html/*</msvc-file-group> + <msvc-file-group>Setup Headers:*/setup.h</msvc-file-group> + <msvc-file-group>MSW Headers:*wx/msw/*.h</msvc-file-group> + <msvc-file-group>Generic Headers:*wx/generic/*.h</msvc-file-group> + <msvc-file-group>wxUniv Headers:*wx/univ/*.h</msvc-file-group> + <msvc-file-group>wxHTML Headers:*wx/html/*.h</msvc-file-group> + <msvc-file-group>Common Headers:*wx/*.h</msvc-file-group> </if> </template> @@ -320,10 +409,7 @@ <mac_version>$(WXMACVERSION)</mac_version> </template> - <template id="wx_lib" template="wx_lib_b"/> - <template id="wx_base_lib" template="wx_lib_b"/> - <template id="wx_dll" template="wx_dll_b" - template_append="wx_append_nomono"> + <template id="wx_3rdparty_dependencies"> <depends>wxtiff</depends> <depends>wxjpeg</depends> <depends>wxpng</depends> @@ -332,20 +418,92 @@ <depends cond="FORMAT=='autoconf'">wxodbc</depends> <depends>wxregex</depends> </template> - <template id="wx_base_dll" template="wx_dll_b" - template_append="wx_append_base_nomono"> - <depends>wxexpat</depends> - <depends>wxzlib</depends> - <depends>wxregex</depends> + + <template id="wx_3rdparty_includes"> + <include>$(INC_TIFF)</include> + <include>$(INC_JPEG)</include> + <include>$(INC_PNG)</include> + <include>$(INC_ZLIB)</include> + <include>$(INC_ODBC)</include> + <include>$(INC_REGEX)</include> + <include>$(INC_EXPAT)</include> + </template> + + <template id="msvc_setup_h"> + <msvc-copy-setup-h/> </template> + <template id="wx_lib" + template="wx_lib_b,wx_3rdparty_includes,msvc_setup_h"/> + <template id="wx_base_lib" + template="wx_lib_b,wx_3rdparty_includes,msvc_setup_h"> + <define>wxUSE_GUI=0</define> + </template> + + <template id="wx_dll" + template="wx_dll_b,wx_3rdparty_dependencies,wx_3rdparty_includes" + template_append="msvc_setup_h,wx_append_nomono"/> + <template id="wx_base_dll" + template="wx_dll_b,wx_3rdparty_dependencies,wx_3rdparty_includes" + template_append="msvc_setup_h,wx_append_base_nomono"> + <define>wxUSE_GUI=0</define> + </template> + + <!-- =============================================================== --> + <!-- Templates for building wxWindows plugins: --> + <!-- =============================================================== --> + + <if cond="WX_STABLE_BRANCH=='1'"> + <set var="PLUGIN_VERSION"> + <if cond="PLATFORM_UNIX=='1'"> + -$(WXVER_MAJOR).$(WXVER_MINOR) + </if> + <if cond="PLATFORM_UNIX=='0'"> + $(WXVER_MAJOR)$(WXVER_MINOR) + </if> + </set> + </if> + <if cond="WX_STABLE_BRANCH=='0'"> + <set var="PLUGIN_VERSION"> + <if cond="PLATFORM_UNIX=='1'"> + -$(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE) + </if> + <if cond="PLATFORM_UNIX=='0'"> + $(WXVER_MAJOR)$(WXVER_MINOR)$(WXVER_RELEASE) + </if> + </set> + </if> + + <define-rule name="wx-base-plugin" extends="module"> + <template> + <dllname> + $(id)$(addPrefixIfNotEmpty('_',WXNAMESUFFIX))$(PLUGIN_VERSION)$(WXCOMPILER) + </dllname> + <define>WXUSINGDLL</define> + <define>wxUSE_GUI=0</define> + </template> + </define-rule> + + <define-rule name="wx-gui-plugin" extends="module"> + <template template="wx"> + <dllname> + $(id)_$(PORTNAME)$(WXUNIVNAME)$(WXNAMESUFFIX)$(PLUGIN_VERSION)$(WXCOMPILER) + </dllname> + <define>WXUSINGDLL</define> + </template> + </define-rule> + <!-- =============================================================== --> <!-- Support for wxWindows samples and contrib: --> <!-- =============================================================== --> <!-- Link against one wxWin library. Value must be literal! --> - <define-tag name="wx-lib" rules="exe,dll"> + <define-tag name="wx-lib" rules="exe,dll,module"> <sys-lib>$(wxwin.libToLink(value))</sys-lib> + <ldlibs>$(wxwin.extraLdflags(value))</ldlibs> + <if cond="FORMAT=='msvc6prj' and MONOLITHIC=='0'"> + <depends-on-dsp>$(wxwin.makeDspDependency(value))</depends-on-dsp> + </if> </define-tag> </makefile>