<set var="CFG_NAME_PART">
$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
</set>
- <set var="OBJS" make_var="1">$(COMPILER)_$(CFG_NAME_PART)</set>
+ <set var="OBJS" make_var="1">
+ <if cond="FORMAT!='cbuilderx'">$(COMPILER)_$(CFG_NAME_PART)</if>
+ <!-- FIXME: waiting for removal after CBX has better ../ dirs
+ support -->
+ <if cond="FORMAT=='cbuilderx'">build_cbx_$(CFG_NAME_PART)</if>
+ </set>
+
<set var="BUILDDIR">$(OBJS)</set>
</if>
<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>
+
<!-- =============================================================== -->
<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' 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">
<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">
<define>$(WXUNIV_DEFINE)</define>
<define>$(DEBUG_DEFINE)</define>
<define>$(UNICODE_DEFINE)</define>
- <include>$(TOP_SRCDIR)include</include>
+ <!-- this include is added by configure, we need to put other
+ includes before it: -->
+ <include cond="FORMAT!='autoconf'">$(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: -->
<!-- system libraries on windows: -->
<if cond="FORMAT!='autoconf'">
<sys-lib>$(UNICOWS_LIB)</sys-lib>
- <if cond="COMPILER=='bcc'">
- <sys-lib>import32</sys-lib>
+ <if cond="FORMAT=='borland'">
<sys-lib>ole2w32</sys-lib>
</if>
- <if cond="COMPILER!='bcc'">
+ <if cond="FORMAT!='borland'">
<sys-lib>kernel32</sys-lib>
<sys-lib>user32</sys-lib>
<sys-lib>gdi32</sys-lib>
<sys-lib>advapi32</sys-lib>
<sys-lib>wsock32</sys-lib>
</if>
- </if>
+ <if cond="FORMAT=='msvc' or FORMAT=='msvc6prj' or FORMAT=='borland'">
+ <sys-lib>oleacc</sys-lib>
+ </if>
+ </if>
</template>
<define-tag name="msvc-headers" rules="dll,lib">
include\wx\msw\setup.h
</set>
<set var="__custom_build_include_wx_msw_setup_h">
-Creating $(LIBDIRNAME)\wx\setup.h
+Creating $(SETUPHDIR)\wx\setup.h
InputPath=..\include\wx\msw\setup.h
-"$(LIBDIRNAME)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
-$(TAB)copy "$(DOLLAR)(InputPath)" $(LIBDIRNAME)\wx\setup.h
+"$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
+$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
</set>
</if>
</define-tag>
<depends cond="FORMAT=='autoconf'">wxodbc</depends>
<depends>wxregex</depends>
</template>
+
+ <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"/>
- <template id="wx_base_lib" template="wx_lib_b">
+ <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"
- template_append="wx_append_nomono"/>
- <template id="wx_base_dll" template="wx_dll_b,wx_3rdparty_dependencies"
- template_append="wx_append_base_nomono">
+ <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>
<!-- 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="FORMAT=='msvc6prj' and MONOLITHIC=='0'">
<depends-on-dsp>$(wxwin.makeDspDependency(value))</depends-on-dsp>
</if>
projects / wxWidgets.git / blobdiff