<makefile>
- <requires version="0.2.1"/>
<!-- OPTIONS -->
<!-- -->
<!-- All the possible mixes for the wx library names -->
<set var="WXLIB_BASE_NAME">
- <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">wxbase$(WX_VERSION)</if>
- <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">wxbase$(WX_VERSION)d</if>
- <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">wxbase$(WX_VERSION)u</if>
- <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">wxbase$(WX_VERSION)ud</if>
+ <if cond="WX_MONOLITHIC=='0'">wxbase$(WX_VERSION)$(WXLIBPOSTFIX)</if>
<!--
the trick used to support monolithic builds is here: when the
WX_MONOLITHIC=1, then the base library is translated to the
monolithic library
-->
- <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='0' and WX_DEBUG=='0'">wx$(WX_PORT)$(WX_VERSION)</if>
- <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='0' and WX_DEBUG=='1'">wx$(WX_PORT)$(WX_VERSION)d</if>
- <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='1' and WX_DEBUG=='0'">wx$(WX_PORT)$(WX_VERSION)u</if>
- <if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='1' and WX_DEBUG=='1'">wx$(WX_PORT)$(WX_VERSION)ud</if>
+ <if cond="WX_MONOLITHIC=='1'">wx$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)</if>
</set>
<!-- Libraries whose name is prefixed with 'wxbase' -->
<define-global-tag name="define-wxbase-lib-name">
<set var="WXLIB_$(value.upper())_NAME">
- <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">
- wxbase$(WX_VERSION)_$(value)
- </if>
- <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">
- wxbase$(WX_VERSION)d_$(value)
- </if>
- <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">
- wxbase$(WX_VERSION)u_$(value)
- </if>
- <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">
- wxbase$(WX_VERSION)ud_$(value)
+ <if cond="WX_MONOLITHIC=='0'">
+ wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)
</if>
</set>
</define-global-tag>
<define-wxbase-lib-name>net</define-wxbase-lib-name>
<define-wxbase-lib-name>xml</define-wxbase-lib-name>
- <define-wxbase-lib-name>odbc</define-wxbase-lib-name>
<!-- Libraries whose name is prefixed with 'wx' only -->
<define-global-tag name="define-wxlib-name">
<set var="WXLIB_$(value.upper())_NAME">
- <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">
- wx$(WX_PORT)$(WX_VERSION)_$(value)
- </if>
- <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">
- wx$(WX_PORT)$(WX_VERSION)d_$(value)
- </if>
- <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">
- wx$(WX_PORT)$(WX_VERSION)u_$(value)
- </if>
- <if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">
- wx$(WX_PORT)$(WX_VERSION)ud_$(value)
+ <if cond="WX_MONOLITHIC=='0'">
+ wx$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)
</if>
</set>
</define-global-tag>
<define-wxlib-name>html</define-wxlib-name>
<define-wxlib-name>adv</define-wxlib-name>
<define-wxlib-name>qa</define-wxlib-name>
- <define-wxlib-name>dbgrid</define-wxlib-name>
- <define-wxlib-name>gl</define-wxlib-name>
<define-wxlib-name>aui</define-wxlib-name>
+ <define-wxlib-name>propgrid</define-wxlib-name>
+ <define-wxlib-name>stc</define-wxlib-name>
<define-wxlib-name>richtext</define-wxlib-name>
-
+ <!-- NOTE: The GL lib is not part of the monolithic build; treat it as a contrib! -->
<if cond="value=='net'"><sys-lib>$(WXLIB_NET_NAME)</sys-lib></if>
<if cond="value=='xml'"><sys-lib>$(WXLIB_XML_NAME)</sys-lib></if>
- <if cond="value=='odbc'"><sys-lib>$(WXLIB_ODBC_NAME)</sys-lib></if>
<if cond="value=='media'"><sys-lib>$(WXLIB_MEDIA_NAME)</sys-lib></if>
<if cond="value=='xrc'"><sys-lib>$(WXLIB_XRC_NAME)</sys-lib></if>
<if cond="value=='html'"><sys-lib>$(WXLIB_HTML_NAME)</sys-lib></if>
<if cond="value=='adv'"><sys-lib>$(WXLIB_ADV_NAME)</sys-lib></if>
- <if cond="value=='gl'"><sys-lib>$(WXLIB_GL_NAME)</sys-lib></if>
- <if cond="value=='dbgrid'"><sys-lib>$(WXLIB_DBGRID_NAME)</sys-lib></if>
<if cond="value=='qa'"><sys-lib>$(WXLIB_QA_NAME)</sys-lib></if>
<if cond="value=='aui'"><sys-lib>$(WXLIB_AUI_NAME)</sys-lib></if>
+ <if cond="value=='propgrid'"><sys-lib>$(WXLIB_PROPGRID_NAME)</sys-lib></if>
<if cond="value=='richtext'"><sys-lib>$(WXLIB_RICHTEXT_NAME)</sys-lib></if>
- <!-- wx-lib can be used also to link against contrib libraries
- (which always have the same name, regardless of WX_MONOLITHIC value) -->
- <if cond="value in CONTRIBLIB_LIST.split()">
+ <!-- The GL lib isn't part of the monolithic build, treat it as a contrib: -->
+ <if cond="value=='gl'">
<sys-lib>wx$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib>
</if>
- <if cond="value not in ALLLIB_LIST.split()">
+ <if cond="value=='stc'">
+ <!-- wxSTC requires also the basic scintilla library
+ which is built as a separate 3rd party library -->
+ <sys-lib>$(WXLIB_STC_NAME)</sys-lib>
+ <sys-lib>wxscintilla$(WX3RDPARTYLIBPOSTFIX)</sys-lib>
+ </if>
+
+ <if cond="value not in WX_LIB_LIST.split()">
<error>Unknown wxWidgets library given in the wx-lib tag</error>
</if>
</define-tag>
<define>$(WXDEBUG_DEFINE)</define>
<define>__WXMSW__</define>
- <include>$(WX_DIR)$(WXLIBINCLUDE)</include>
- <include>$(WX_DIR)/include</include>
+ <if cond="FORMAT!='xcode2'">
+ <include>$(WX_DIR)$(WXLIBINCLUDE)</include>
+ <include>$(WX_DIR)/include</include>
+ </if>
</template>
<!-- If on borland, we don't need to do much -->
<if cond="FORMAT=='borland'">
<sys-lib>ole2w32</sys-lib>
- <sys-lib>odbc32</sys-lib>
</if>
<!-- Non-borland, on the other hand... -->
<sys-lib>rpcrt4</sys-lib>
<sys-lib>advapi32</sys-lib>
<sys-lib>wsock32</sys-lib>
- <sys-lib>odbc32</sys-lib>
</if>
<!-- Libs common to both borland and MSVC -->
<!-- template for wx executables/dlls: -->
<template id="wx" template="wx-lib">
- <lib-path>$(WX_DIR)$(WXLIBPATH)</lib-path>
+ <if cond="FORMAT!='xcode2'">
+ <lib-path>$(WX_DIR)$(WXLIBPATH)</lib-path>
+ </if>
<!-- wx libs must come before 3rd party and sys libs, this is
the place where the hack explained above is carried on: -->
<__wx-syslibs/>
</template>
- <if cond="FORMAT_SUPPORTS_ACTIONS=='1'">
+ <if cond="FORMAT_SUPPORTS_ACTIONS=='1' and WX_TEST_FOR_SELECTED_WXBUILD=='1'">
<!--
VERY IMPORTANT: before starting to build all targets of the generated makefile,
@if not exist $(WX_DIR)$(WXLIBINCLUDE)$(DIRSEP)wx$(DIRSEP)setup.h \
echo ----------------------------------------------------------------------------
@if not exist $(WX_DIR)$(WXLIBINCLUDE)$(DIRSEP)wx$(DIRSEP)setup.h \
- echo Selected wxWidgets build is not available!
+ echo The selected wxWidgets build is not available!
@if not exist $(WX_DIR)$(WXLIBINCLUDE)$(DIRSEP)wx$(DIRSEP)setup.h \
echo Please use the options prefixed with WX_ to select another wxWidgets build.
@if not exist $(WX_DIR)$(WXLIBINCLUDE)$(DIRSEP)wx$(DIRSEP)setup.h \
projects / wxWidgets.git / blobdiff