<if cond="FORMAT=='watcom'">%</if>
<if cond="FORMAT!='watcom'"></if>
</set>
-
-
+
+
<!-- The directory where wxWidgets is installed: -->
<if cond="not isdefined('WX_DIR')">
<set var="WX_DIR_DEFAULT" overwrite="0">$(DOLLAR)($(ENV_VAR)WXWIN)</set>
<option name="WX_UNICODE">
<values>0,1</values>
<values-description>,Unicode</values-description>
- <default-value>$(WX_UNICODE_DEFAULT)</default-value>
+ <default-value>$(WX_UNICODE_DEFAULT)</default-value>
<description>
Compile Unicode build of wxWidgets?
</description>
<!-- HELPER VARIABLES -->
<!-- -->
-
-
+
+
<!-- The unicode define we want. By default bakefile -->
<!-- makes variables an empty string, so if unicode -->
<!-- is not defined $(UNICODE_DEFINE) would expand -->
<!-- to nothing (literally). -->
<set var="WXUNICODE_DEFINE">
<if cond="WX_UNICODE=='1'">_UNICODE</if>
- </set>
-
- <!-- The debug define we need with win32 compilers -->
- <!-- (on Linux, the wx-config program is used). -->
- <set var="WXDEBUG_DEFINE">
- <if cond="WX_DEBUG=='1'">__WXDEBUG__</if>
+ </set>
+
+ <!-- The debug define we need with win32 compilers -->
+ <!-- (on Linux, the wx-config program is used). -->
+ <set var="WXDEBUG_DEFINE">
+ <if cond="WX_DEBUG=='1'">__WXDEBUG__</if>
</set>
<!-- These are handy ways of dealing with the -->
- <!-- extensions in the library names of the -->
+ <!-- extensions in the library names of the -->
<!-- wxWindows library. -->
<set var="WXLIBPOSTFIX">
<if cond="WX_DEBUG=='1' and WX_UNICODE=='1'">ud</if>
<if cond="WX_DEBUG=='1' and WX_UNICODE=='0'">d</if>
<if cond="WX_DEBUG=='0' and WX_UNICODE=='1'">u</if>
</set>
- <set var="WX3RDPARTLIBPOSTFIX">
+ <set var="WX3RDPARTYLIBPOSTFIX">
<if cond="WX_DEBUG=='1'">d</if>
</set>
+ <set var="WXCPU">
+ <if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
+ </set>
+
<set var="WXLIBPATH">
- <if cond="WX_SHARED=='0'">$(DIRSEP)lib$(DIRSEP)$(COMPILER)_lib</if>
- <if cond="WX_SHARED=='1'">$(DIRSEP)lib$(DIRSEP)$(COMPILER)_dll</if>
+ <if cond="WX_SHARED=='0'">$(DIRSEP)lib$(DIRSEP)$(COMPILER)$(WXCPU)_lib</if>
+ <if cond="WX_SHARED=='1'">$(DIRSEP)lib$(DIRSEP)$(COMPILER)$(WXCPU)_dll</if>
</set>
- <set var="WXLIBINCLUDE">$(WXLIBPATH)$(DIRSEP)msw$(WXLIBPOSTFIX)</set>
-
-
+ <set var="WXPORT">
+ <if cond="FORMAT=='msevc4prj'">wince</if>
+ <if cond="FORMAT!='msevc4prj'">msw</if>
+ </set>
+ <set var="WXLIBINCLUDE">$(WXLIBPATH)$(DIRSEP)$(WXPORT)$(WXLIBPOSTFIX)</set>
+
+
<!-- WX TEMPLATE -->
<!-- -->
<!-- -->
<!-- we want for our stuff, and the wxWindows libs. -->
-
+
<!-- this tag is used to include wx libraries: -->
<define-tag name="wx-lib" rules="exe,dll,module">
<if cond="value=='base'">
<sys-lib>wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib>
</if>
<if cond="value not in ['base','net','xml']">
- <sys-lib>wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib>
+ <sys-lib>wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib>
</if>
</define-tag>
position="before:__wx-libs-point"/>
<tag-info name="__wx-syslibs"
position="after:__wx-libs-point"/>
-
+
<!-- template for static wx libraries: -->
<template id="wx-lib">
<!-- MISCELLANEOUS -->
- <if cond="FORMAT=='mingw'">
+ <if cond="FORMAT=='mingw'">
<define>HAVE_W32API_H</define>
<ldflags>-mthreads</ldflags>
</if>
<define>$(WXUNICODE_DEFINE)</define>
- <define>$(WXDEBUG_DEFINE)</define>
+ <define>$(WXDEBUG_DEFINE)</define>
<define>__WXMSW__</define>
<include>$(WX_DIR)$(WXLIBINCLUDE)</include>
<include>$(WX_DIR)/include</include>
</template>
-
-
+
+
<!-- this ugly tag contains all sys-lib tags used by "wx" template,
in order to make sure they are not reorder when wx-lib is moved
after __wx-libs-point: -->
<define-tag name="__wx-syslibs" rules="exe,dll,module">
<!-- wx 3rd party libs, always use them: -->
- <sys-lib>wxtiff$(WX3RDPARTLIBPOSTFIX)</sys-lib>
- <sys-lib>wxjpeg$(WX3RDPARTLIBPOSTFIX)</sys-lib>
- <sys-lib>wxpng$(WX3RDPARTLIBPOSTFIX)</sys-lib>
- <sys-lib>wxzlib$(WX3RDPARTLIBPOSTFIX)</sys-lib>
- <!-- For regex we won't use the WX3RDPARTLIBPOSTIX postfix:
+ <sys-lib cond="FORMAT!='msevc4prj'">wxtiff$(WX3RDPARTYLIBPOSTFIX)</sys-lib>
+ <sys-lib>wxjpeg$(WX3RDPARTYLIBPOSTFIX)</sys-lib>
+ <sys-lib>wxpng$(WX3RDPARTYLIBPOSTFIX)</sys-lib>
+ <sys-lib>wxzlib$(WX3RDPARTYLIBPOSTFIX)</sys-lib>
+ <!-- For regex we won't use the WX3RDPARTYLIBPOSTIX postfix:
unliked tiff, jpeg, png, zlib, expat, when building
in Unicode mode, the "u" suffix is appended to regex -->
- <sys-lib>wxregex$(WXLIBPOSTFIX)</sys-lib>
- <sys-lib>wxexpat$(WX3RDPARTLIBPOSTFIX)</sys-lib>
-
+ <sys-lib cond="FORMAT!='msevc4prj'">wxregex$(WXLIBPOSTFIX)</sys-lib>
+ <sys-lib>wxexpat$(WX3RDPARTYLIBPOSTFIX)</sys-lib>
+
<!-- link-in system libs that wx depends on: -->
<!-- If on borland, we don't need to do much -->
<if cond="FORMAT=='borland'">
</if>
<!-- Non-borland, on the other hand... -->
- <if cond="FORMAT!='borland'">
+ <if cond="FORMAT not in ['borland','msevc4prj']">
<sys-lib>kernel32</sys-lib>
<sys-lib>user32</sys-lib>
<sys-lib>gdi32</sys-lib>
<sys-lib>oleacc</sys-lib>
</if>
</define-tag>
-
+
<!-- template for wx executables/dlls: -->
<template id="wx" template="wx-lib">
<lib-path>$(WX_DIR)$(WXLIBPATH)</lib-path>