Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use univ/setup.h when building wxUniv

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-08-14 11:07:23 +00:00
parent eb2693818c
commit 399a88248a
5 changed files with 95 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
build/bakefiles/wx.bkl
View File

@@ -124,14 +124,19 @@
<dir>$(LIBDIRNAME)/wx</dir> <dir>$(LIBDIRNAME)/wx</dir>
</mkdir> </mkdir>
<copy-file-to-file-if-not-exist id="msw/setup.h"> <set var="SETUP_H_DIR">
<src>$(SRCDIR)/include/wx/msw/setup0.h</src> <if cond="WXUNIV=='1'">univ</if>
<dst>$(SRCDIR)/include/wx/msw/setup.h</dst> <if cond="WXUNIV=='0'">msw</if>
</set>
<copy-file-to-file-if-not-exist id="master_setup.h">
<src>$(SRCDIR)/include/wx/$(SETUP_H_DIR)/setup0.h</src>
<dst>$(SRCDIR)/include/wx/$(SETUP_H_DIR)/setup.h</dst>
<dependency-of>setup_h</dependency-of> <dependency-of>setup_h</dependency-of>
</copy-file-to-file-if-not-exist> </copy-file-to-file-if-not-exist>
<copy-file-to-file-if-not-exist id="setup.h"> <copy-file-to-file-if-not-exist id="setup.h">
<dependency-of>setup_h</dependency-of> <dependency-of>setup_h</dependency-of>
<src>$(SRCDIR)/include/wx/msw/setup.h</src> <src>$(SRCDIR)/include/wx/$(SETUP_H_DIR)/setup.h</src>
<dst>$(LIBDIRNAME)/wx/setup.h</dst> <dst>$(LIBDIRNAME)/wx/setup.h</dst>
</copy-file-to-file-if-not-exist> </copy-file-to-file-if-not-exist>
</if> </if>

36
build/msw/makefile.bcc
View File

@@ -861,6 +861,12 @@ __RUNTIME_LIBS_9 = i
!if "$(RUNTIME_LIBS)" == "static" !if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS_9 = __RUNTIME_LIBS_9 =
!endif !endif
!if "$(WXUNIV)" == "0"
__SETUP_H_DIR_FILENAMES = msw
!endif
!if "$(WXUNIV)" == "1"
__SETUP_H_DIR_FILENAMES = univ
!endif
!if "$(UNICODE)" == "1" !if "$(UNICODE)" == "1"
__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
!endif !endif
@@ -8832,7 +8838,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bc
!endif !endif
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib: $(OBJS)\advlib_dummy.obj $(ADVLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib: $(OBJS)\advlib_dummy.obj $(ADVLIB_OBJECTS)
if exist $@ del $@ if exist $@ del $@
tlib /a /p2048 $@ @&&| tlib /a /p2048 $@ @&&|
$(ADVLIB_OBJECTS) $(ADVLIB_OBJECTS)
@@ -8848,7 +8854,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: $(OBJ
!endif !endif
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(OBJS)\baselib_dummy.obj $(BASELIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(OBJS)\baselib_dummy.obj $(BASELIB_OBJECTS)
if exist $@ del $@ if exist $@ del $@
tlib /a /p2048 $@ @&&| tlib /a /p2048 $@ @&&|
$(BASELIB_OBJECTS) $(BASELIB_OBJECTS)
@@ -8904,7 +8910,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_b
!endif !endif
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib: $(OBJS)\corelib_dummy.obj $(CORELIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib: $(OBJS)\corelib_dummy.obj $(CORELIB_OBJECTS)
if exist $@ del $@ if exist $@ del $@
tlib /a /p2048 $@ @&&| tlib /a /p2048 $@ @&&|
$(CORELIB_OBJECTS) $(CORELIB_OBJECTS)
@@ -8920,7 +8926,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid
!endif !endif
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib: $(OBJS)\dbgridlib_dummy.obj $(DBGRIDLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib: $(OBJS)\dbgridlib_dummy.obj $(DBGRIDLIB_OBJECTS)
if exist $@ del $@ if exist $@ del $@
tlib /a /p2048 $@ @&&| tlib /a /p2048 $@ @&&|
$(DBGRIDLIB_OBJECTS) $(DBGRIDLIB_OBJECTS)
@@ -8936,7 +8942,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc
!endif !endif
!if "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" !if "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib: $(OBJS)\gllib_dummy.obj $(GLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib: $(OBJS)\gllib_dummy.obj $(GLLIB_OBJECTS)
if exist $@ del $@ if exist $@ del $@
tlib /a /p2048 $@ @&&| tlib /a /p2048 $@ @&&|
$(GLLIB_OBJECTS) $(GLLIB_OBJECTS)
@@ -8952,7 +8958,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_b
!endif !endif
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_HTML)" == "1" !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_HTML)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib: $(OBJS)\htmllib_dummy.obj $(HTMLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib: $(OBJS)\htmllib_dummy.obj $(HTMLLIB_OBJECTS)
if exist $@ del $@ if exist $@ del $@
tlib /a /p2048 $@ @&&| tlib /a /p2048 $@ @&&|
$(HTMLLIB_OBJECTS) $(HTMLLIB_OBJECTS)
@@ -8965,6 +8971,9 @@ $(LIBDIRNAME):
$(LIBDIRNAME)\wx: $(LIBDIRNAME) $(LIBDIRNAME)\wx: $(LIBDIRNAME)
if not exist $(LIBDIRNAME)\wx mkdir $(LIBDIRNAME)\wx if not exist $(LIBDIRNAME)\wx mkdir $(LIBDIRNAME)\wx
..\..\include\wx\$(__SETUP_H_DIR_FILENAMES)\setup.h:
if not exist ..\..\include\wx\$(__SETUP_H_DIR_FILENAMES)\setup.h copy ..\..\include\wx\$(__SETUP_H_DIR_FILENAMES)\setup0.h ..\..\include\wx\$(__SETUP_H_DIR_FILENAMES)\setup.h
!if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1" !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
@@ -8974,16 +8983,13 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(V
!endif !endif
!if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0" !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(OBJS)\monolib_dummy.obj $(MONOLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(OBJS)\monolib_dummy.obj $(MONOLIB_OBJECTS)
if exist $@ del $@ if exist $@ del $@
tlib /a /p2048 $@ @&&| tlib /a /p2048 $@ @&&|
$(MONOLIB_OBJECTS) $(MONOLIB_OBJECTS)
| |
!endif !endif
..\..\include\wx\msw\setup.h:
if not exist ..\..\include\wx\msw\setup.h copy ..\..\include\wx\msw\setup0.h ..\..\include\wx\msw\setup.h
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
@@ -8993,7 +8999,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).dll: $
!endif !endif
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib: $(OBJS)\netlib_dummy.obj $(NETLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib: $(OBJS)\netlib_dummy.obj $(NETLIB_OBJECTS)
if exist $@ del $@ if exist $@ del $@
tlib /a /p2048 $@ @&&| tlib /a /p2048 $@ @&&|
$(NETLIB_OBJECTS) $(NETLIB_OBJECTS)
@@ -9009,7 +9015,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).dll:
!endif !endif
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(OBJS)\odbclib_dummy.obj $(ODBCLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(OBJS)\odbclib_dummy.obj $(ODBCLIB_OBJECTS)
if exist $@ del $@ if exist $@ del $@
tlib /a /p2048 $@ @&&| tlib /a /p2048 $@ @&&|
$(ODBCLIB_OBJECTS) $(ODBCLIB_OBJECTS)
@@ -9022,9 +9028,9 @@ samples:
cd ..\..\.. cd ..\..\..
$(LIBDIRNAME)\wx\setup.h: $(LIBDIRNAME)\wx\setup.h:
if not exist $(LIBDIRNAME)\wx\setup.h copy ..\..\include\wx\msw\setup.h $(LIBDIRNAME)\wx\setup.h if not exist $(LIBDIRNAME)\wx\setup.h copy ..\..\include\wx\$(__SETUP_H_DIR_FILENAMES)\setup.h $(LIBDIRNAME)\wx\setup.h
setup_h: $(LIBDIRNAME)\wx ..\..\include\wx\msw\setup.h $(LIBDIRNAME)\wx\setup.h setup_h: $(LIBDIRNAME)\wx ..\..\include\wx\$(__SETUP_H_DIR_FILENAMES)\setup.h $(LIBDIRNAME)\wx\setup.h
$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib: $(WXEXPAT_OBJECTS) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib: $(WXEXPAT_OBJECTS)
if exist $@ del $@ if exist $@ del $@
@@ -9077,7 +9083,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).dll: $
!endif !endif
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib: $(OBJS)\xmllib_dummy.obj $(XMLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib: $(OBJS)\xmllib_dummy.obj $(XMLLIB_OBJECTS)
if exist $@ del $@ if exist $@ del $@
tlib /a /p2048 $@ @&&| tlib /a /p2048 $@ @&&|
$(XMLLIB_OBJECTS) $(XMLLIB_OBJECTS)

36
build/msw/makefile.gcc
View File

@@ -839,6 +839,12 @@ endif
ifeq ($(BUILD),release) ifeq ($(BUILD),release)
__OPTIMIZEFLAG = -O2 __OPTIMIZEFLAG = -O2
endif endif
ifeq ($(WXUNIV),0)
__SETUP_H_DIR_FILENAMES = msw
endif
ifeq ($(WXUNIV),1)
__SETUP_H_DIR_FILENAMES = univ
endif
ifeq ($(UNICODE),1) ifeq ($(UNICODE),1)
__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
endif endif
@@ -9301,7 +9307,7 @@ endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),0) ifeq ($(SHARED),0)
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.a: $(ADVLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.a: $(ADVLIB_OBJECTS)
if exist $@ del $@ if exist $@ del $@
ar rcu $@ $(ADVLIB_OBJECTS) ar rcu $@ $(ADVLIB_OBJECTS)
ranlib $@ ranlib $@
@@ -9318,7 +9324,7 @@ endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),0) ifeq ($(SHARED),0)
$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a: $(BASELIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a: $(BASELIB_OBJECTS)
if exist $@ del $@ if exist $@ del $@
ar rcu $@ $(BASELIB_OBJECTS) ar rcu $@ $(BASELIB_OBJECTS)
ranlib $@ ranlib $@
@@ -9376,7 +9382,7 @@ endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),0) ifeq ($(SHARED),0)
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a: $(CORELIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a: $(CORELIB_OBJECTS)
if exist $@ del $@ if exist $@ del $@
ar rcu $@ $(CORELIB_OBJECTS) ar rcu $@ $(CORELIB_OBJECTS)
ranlib $@ ranlib $@
@@ -9399,7 +9405,7 @@ ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),0) ifeq ($(SHARED),0)
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
ifeq ($(USE_ODBC),1) ifeq ($(USE_ODBC),1)
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.a: $(DBGRIDLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.a: $(DBGRIDLIB_OBJECTS)
if exist $@ del $@ if exist $@ del $@
ar rcu $@ $(DBGRIDLIB_OBJECTS) ar rcu $@ $(DBGRIDLIB_OBJECTS)
ranlib $@ ranlib $@
@@ -9420,7 +9426,7 @@ endif
ifeq ($(SHARED),0) ifeq ($(SHARED),0)
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
ifeq ($(USE_OPENGL),1) ifeq ($(USE_OPENGL),1)
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.a: $(GLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.a: $(GLLIB_OBJECTS)
if exist $@ del $@ if exist $@ del $@
ar rcu $@ $(GLLIB_OBJECTS) ar rcu $@ $(GLLIB_OBJECTS)
ranlib $@ ranlib $@
@@ -9440,7 +9446,7 @@ endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),0) ifeq ($(SHARED),0)
ifeq ($(USE_HTML),1) ifeq ($(USE_HTML),1)
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.a: $(HTMLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.a: $(HTMLLIB_OBJECTS)
if exist $@ del $@ if exist $@ del $@
ar rcu $@ $(HTMLLIB_OBJECTS) ar rcu $@ $(HTMLLIB_OBJECTS)
ranlib $@ ranlib $@
@@ -9454,6 +9460,9 @@ $(LIBDIRNAME):
$(LIBDIRNAME)\wx: $(LIBDIRNAME) $(LIBDIRNAME)\wx: $(LIBDIRNAME)
if not exist $(LIBDIRNAME)\wx mkdir $(LIBDIRNAME)\wx if not exist $(LIBDIRNAME)\wx mkdir $(LIBDIRNAME)\wx
..\..\include\wx\$(__SETUP_H_DIR_FILENAMES)\setup.h:
if not exist ..\..\include\wx\$(__SETUP_H_DIR_FILENAMES)\setup.h copy ..\..\include\wx\$(__SETUP_H_DIR_FILENAMES)\setup0.h ..\..\include\wx\$(__SETUP_H_DIR_FILENAMES)\setup.h
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
ifeq ($(SHARED),1) ifeq ($(SHARED),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gcc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gcc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a
@@ -9463,16 +9472,13 @@ endif
ifeq ($(MONOLITHIC),1) ifeq ($(MONOLITHIC),1)
ifeq ($(SHARED),0) ifeq ($(SHARED),0)
$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a: $(MONOLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a: $(MONOLIB_OBJECTS)
if exist $@ del $@ if exist $@ del $@
ar rcu $@ $(MONOLIB_OBJECTS) ar rcu $@ $(MONOLIB_OBJECTS)
ranlib $@ ranlib $@
endif endif
endif endif
..\..\include\wx\msw\setup.h:
if not exist ..\..\include\wx\msw\setup.h copy ..\..\include\wx\msw\setup0.h ..\..\include\wx\msw\setup.h
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),1) ifeq ($(SHARED),1)
$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_gcc$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__basedll___depname) $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_gcc$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__basedll___depname)
@@ -9482,7 +9488,7 @@ endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),0) ifeq ($(SHARED),0)
$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.a: $(NETLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.a: $(NETLIB_OBJECTS)
if exist $@ del $@ if exist $@ del $@
ar rcu $@ $(NETLIB_OBJECTS) ar rcu $@ $(NETLIB_OBJECTS)
ranlib $@ ranlib $@
@@ -9504,7 +9510,7 @@ ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),0) ifeq ($(SHARED),0)
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
ifeq ($(USE_ODBC),1) ifeq ($(USE_ODBC),1)
$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a: $(ODBCLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a: $(ODBCLIB_OBJECTS)
if exist $@ del $@ if exist $@ del $@
ar rcu $@ $(ODBCLIB_OBJECTS) ar rcu $@ $(ODBCLIB_OBJECTS)
ranlib $@ ranlib $@
@@ -9517,9 +9523,9 @@ samples:
$(MAKE) -C ..\..\samples -f makefile.gcc $(MAKEARGS) all $(MAKE) -C ..\..\samples -f makefile.gcc $(MAKEARGS) all
$(LIBDIRNAME)\wx\setup.h: $(LIBDIRNAME)\wx\setup.h:
if not exist $(LIBDIRNAME)\wx\setup.h copy ..\..\include\wx\msw\setup.h $(LIBDIRNAME)\wx\setup.h if not exist $(LIBDIRNAME)\wx\setup.h copy ..\..\include\wx\$(__SETUP_H_DIR_FILENAMES)\setup.h $(LIBDIRNAME)\wx\setup.h
setup_h: $(LIBDIRNAME)\wx ..\..\include\wx\msw\setup.h $(LIBDIRNAME)\wx\setup.h setup_h: $(LIBDIRNAME)\wx ..\..\include\wx\$(__SETUP_H_DIR_FILENAMES)\setup.h $(LIBDIRNAME)\wx\setup.h
$(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a: $(WXEXPAT_OBJECTS) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a: $(WXEXPAT_OBJECTS)
if exist $@ del $@ if exist $@ del $@
@@ -9566,7 +9572,7 @@ endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),0) ifeq ($(SHARED),0)
$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.a: $(XMLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.a: $(XMLLIB_OBJECTS)
if exist $@ del $@ if exist $@ del $@
ar rcu $@ $(XMLLIB_OBJECTS) ar rcu $@ $(XMLLIB_OBJECTS)
ranlib $@ ranlib $@

36
build/msw/makefile.vc
View File

@@ -1175,6 +1175,12 @@ __RUNTIME_LIBS = D
!if "$(RUNTIME_LIBS)" == "static" !if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS = T __RUNTIME_LIBS = T
!endif !endif
!if "$(WXUNIV)" == "0"
__SETUP_H_DIR_FILENAMES = msw
!endif
!if "$(WXUNIV)" == "1"
__SETUP_H_DIR_FILENAMES = univ
!endif
!if "$(UNICODE)" == "1" !if "$(UNICODE)" == "1"
__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
!endif !endif
@@ -9391,7 +9397,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc
!endif !endif
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib: $(OBJS)\advlib_dummy.obj $(ADVLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib: $(OBJS)\advlib_dummy.obj $(ADVLIB_OBJECTS)
if exist $@ del $@ if exist $@ del $@
lib /NOLOGO /OUT:$@ @<< lib /NOLOGO /OUT:$@ @<<
$(ADVLIB_OBJECTS) $(ADVLIB_OBJECTS)
@@ -9406,7 +9412,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll: $(OBJS
!endif !endif
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(OBJS)\baselib_dummy.obj $(BASELIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(OBJS)\baselib_dummy.obj $(BASELIB_OBJECTS)
if exist $@ del $@ if exist $@ del $@
lib /NOLOGO /OUT:$@ @<< lib /NOLOGO /OUT:$@ @<<
$(BASELIB_OBJECTS) $(BASELIB_OBJECTS)
@@ -9461,7 +9467,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_v
!endif !endif
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib: $(OBJS)\corelib_dummy.obj $(CORELIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib: $(OBJS)\corelib_dummy.obj $(CORELIB_OBJECTS)
if exist $@ del $@ if exist $@ del $@
lib /NOLOGO /OUT:$@ @<< lib /NOLOGO /OUT:$@ @<<
$(CORELIB_OBJECTS) $(CORELIB_OBJECTS)
@@ -9476,7 +9482,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid
!endif !endif
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib: $(OBJS)\dbgridlib_dummy.obj $(DBGRIDLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib: $(OBJS)\dbgridlib_dummy.obj $(DBGRIDLIB_OBJECTS)
if exist $@ del $@ if exist $@ del $@
lib /NOLOGO /OUT:$@ @<< lib /NOLOGO /OUT:$@ @<<
$(DBGRIDLIB_OBJECTS) $(DBGRIDLIB_OBJECTS)
@@ -9491,7 +9497,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$
!endif !endif
!if "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" !if "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib: $(OBJS)\gllib_dummy.obj $(GLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib: $(OBJS)\gllib_dummy.obj $(GLLIB_OBJECTS)
if exist $@ del $@ if exist $@ del $@
lib /NOLOGO /OUT:$@ @<< lib /NOLOGO /OUT:$@ @<<
$(GLLIB_OBJECTS) $(GLLIB_OBJECTS)
@@ -9506,7 +9512,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_v
!endif !endif
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_HTML)" == "1" !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_HTML)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib: $(OBJS)\htmllib_dummy.obj $(HTMLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib: $(OBJS)\htmllib_dummy.obj $(HTMLLIB_OBJECTS)
if exist $@ del $@ if exist $@ del $@
lib /NOLOGO /OUT:$@ @<< lib /NOLOGO /OUT:$@ @<<
$(HTMLLIB_OBJECTS) $(HTMLLIB_OBJECTS)
@@ -9519,6 +9525,9 @@ $(LIBDIRNAME):
$(LIBDIRNAME)\wx: $(LIBDIRNAME) $(LIBDIRNAME)\wx: $(LIBDIRNAME)
if not exist $(LIBDIRNAME)\wx mkdir $(LIBDIRNAME)\wx if not exist $(LIBDIRNAME)\wx mkdir $(LIBDIRNAME)\wx
..\..\include\wx\$(__SETUP_H_DIR_FILENAMES)\setup.h:
if not exist ..\..\include\wx\$(__SETUP_H_DIR_FILENAMES)\setup.h copy ..\..\include\wx\$(__SETUP_H_DIR_FILENAMES)\setup0.h ..\..\include\wx\$(__SETUP_H_DIR_FILENAMES)\setup.h
!if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1" !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33) /LIBPATH:$(LIBDIRNAME) @<< link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33) /LIBPATH:$(LIBDIRNAME) @<<
@@ -9527,16 +9536,13 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VE
!endif !endif
!if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0" !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(OBJS)\monolib_dummy.obj $(MONOLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(OBJS)\monolib_dummy.obj $(MONOLIB_OBJECTS)
if exist $@ del $@ if exist $@ del $@
lib /NOLOGO /OUT:$@ @<< lib /NOLOGO /OUT:$@ @<<
$(MONOLIB_OBJECTS) $(MONOLIB_OBJECTS)
<< <<
!endif !endif
..\..\include\wx\msw\setup.h:
if not exist ..\..\include\wx\msw\setup.h copy ..\..\include\wx\msw\setup0.h ..\..\include\wx\msw\setup.h
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33) /LIBPATH:$(LIBDIRNAME) @<< link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33) /LIBPATH:$(LIBDIRNAME) @<<
@@ -9545,7 +9551,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).dll: $(
!endif !endif
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib: $(OBJS)\netlib_dummy.obj $(NETLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib: $(OBJS)\netlib_dummy.obj $(NETLIB_OBJECTS)
if exist $@ del $@ if exist $@ del $@
lib /NOLOGO /OUT:$@ @<< lib /NOLOGO /OUT:$@ @<<
$(NETLIB_OBJECTS) $(NETLIB_OBJECTS)
@@ -9560,7 +9566,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).dll: $
!endif !endif
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(OBJS)\odbclib_dummy.obj $(ODBCLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(OBJS)\odbclib_dummy.obj $(ODBCLIB_OBJECTS)
if exist $@ del $@ if exist $@ del $@
lib /NOLOGO /OUT:$@ @<< lib /NOLOGO /OUT:$@ @<<
$(ODBCLIB_OBJECTS) $(ODBCLIB_OBJECTS)
@@ -9573,9 +9579,9 @@ sub_samples:
cd $(MAKEDIR) cd $(MAKEDIR)
$(LIBDIRNAME)\wx\setup.h: $(LIBDIRNAME)\wx\setup.h:
if not exist $(LIBDIRNAME)\wx\setup.h copy ..\..\include\wx\msw\setup.h $(LIBDIRNAME)\wx\setup.h if not exist $(LIBDIRNAME)\wx\setup.h copy ..\..\include\wx\$(__SETUP_H_DIR_FILENAMES)\setup.h $(LIBDIRNAME)\wx\setup.h
setup_h: $(LIBDIRNAME)\wx ..\..\include\wx\msw\setup.h $(LIBDIRNAME)\wx\setup.h setup_h: $(LIBDIRNAME)\wx ..\..\include\wx\$(__SETUP_H_DIR_FILENAMES)\setup.h $(LIBDIRNAME)\wx\setup.h
$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib: $(WXEXPAT_OBJECTS) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib: $(WXEXPAT_OBJECTS)
if exist $@ del $@ if exist $@ del $@
@@ -9627,7 +9633,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).dll: $(
!endif !endif
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib: $(OBJS)\xmllib_dummy.obj $(XMLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib: $(OBJS)\xmllib_dummy.obj $(XMLLIB_OBJECTS)
if exist $@ del $@ if exist $@ del $@
lib /NOLOGO /OUT:$@ @<< lib /NOLOGO /OUT:$@ @<<
$(XMLLIB_OBJECTS) $(XMLLIB_OBJECTS)

37
build/msw/makefile.wat
View File

@@ -131,6 +131,13 @@ __RUNTIME_LIBS = -br
!ifeq RUNTIME_LIBS static !ifeq RUNTIME_LIBS static
__RUNTIME_LIBS = __RUNTIME_LIBS =
!endif !endif
__SETUP_H_DIR_FILENAMES =
!ifeq WXUNIV 0
__SETUP_H_DIR_FILENAMES = msw
!endif
!ifeq WXUNIV 1
__SETUP_H_DIR_FILENAMES = univ
!endif
__UNICODE_DEFINE_p = __UNICODE_DEFINE_p =
!ifeq UNICODE 1 !ifeq UNICODE 1
__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 __UNICODE_DEFINE_p = -dwxUSE_UNICODE=1
@@ -9402,7 +9409,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_wa
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
!ifeq SHARED 0 !ifeq SHARED 0
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib : $(ADVLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib : $(ADVLIB_OBJECTS)
@%create $(OBJS)\advlib.lbc @%create $(OBJS)\advlib.lbc
@for %i in ($(ADVLIB_OBJECTS)) do @%append $(OBJS)\advlib.lbc +%i @for %i in ($(ADVLIB_OBJECTS)) do @%append $(OBJS)\advlib.lbc +%i
wlib -q -p2048 -n -b $^@ @$(OBJS)\advlib.lbc wlib -q -p2048 -n -b $^@ @$(OBJS)\advlib.lbc
@@ -9429,7 +9436,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll : $(B
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
!ifeq SHARED 0 !ifeq SHARED 0
$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib : $(BASELIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib : $(BASELIB_OBJECTS)
@%create $(OBJS)\baselib.lbc @%create $(OBJS)\baselib.lbc
@for %i in ($(BASELIB_OBJECTS)) do @%append $(OBJS)\baselib.lbc +%i @for %i in ($(BASELIB_OBJECTS)) do @%append $(OBJS)\baselib.lbc +%i
wlib -q -p2048 -n -b $^@ @$(OBJS)\baselib.lbc wlib -q -p2048 -n -b $^@ @$(OBJS)\baselib.lbc
@@ -9500,7 +9507,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_w
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
!ifeq SHARED 0 !ifeq SHARED 0
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib : $(CORELIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib : $(CORELIB_OBJECTS)
@%create $(OBJS)\corelib.lbc @%create $(OBJS)\corelib.lbc
@for %i in ($(CORELIB_OBJECTS)) do @%append $(OBJS)\corelib.lbc +%i @for %i in ($(CORELIB_OBJECTS)) do @%append $(OBJS)\corelib.lbc +%i
wlib -q -p2048 -n -b $^@ @$(OBJS)\corelib.lbc wlib -q -p2048 -n -b $^@ @$(OBJS)\corelib.lbc
@@ -9533,7 +9540,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid
!ifeq SHARED 0 !ifeq SHARED 0
!ifeq USE_GUI 1 !ifeq USE_GUI 1
!ifeq USE_ODBC 1 !ifeq USE_ODBC 1
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib : $(DBGRIDLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib : $(DBGRIDLIB_OBJECTS)
@%create $(OBJS)\dbgridlib.lbc @%create $(OBJS)\dbgridlib.lbc
@for %i in ($(DBGRIDLIB_OBJECTS)) do @%append $(OBJS)\dbgridlib.lbc +%i @for %i in ($(DBGRIDLIB_OBJECTS)) do @%append $(OBJS)\dbgridlib.lbc +%i
wlib -q -p2048 -n -b $^@ @$(OBJS)\dbgridlib.lbc wlib -q -p2048 -n -b $^@ @$(OBJS)\dbgridlib.lbc
@@ -9564,7 +9571,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_wat
!ifeq SHARED 0 !ifeq SHARED 0
!ifeq USE_GUI 1 !ifeq USE_GUI 1
!ifeq USE_OPENGL 1 !ifeq USE_OPENGL 1
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib : $(GLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib : $(GLLIB_OBJECTS)
@%create $(OBJS)\gllib.lbc @%create $(OBJS)\gllib.lbc
@for %i in ($(GLLIB_OBJECTS)) do @%append $(OBJS)\gllib.lbc +%i @for %i in ($(GLLIB_OBJECTS)) do @%append $(OBJS)\gllib.lbc +%i
wlib -q -p2048 -n -b $^@ @$(OBJS)\gllib.lbc wlib -q -p2048 -n -b $^@ @$(OBJS)\gllib.lbc
@@ -9594,7 +9601,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_w
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
!ifeq SHARED 0 !ifeq SHARED 0
!ifeq USE_HTML 1 !ifeq USE_HTML 1
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib : $(HTMLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib : $(HTMLLIB_OBJECTS)
@%create $(OBJS)\htmllib.lbc @%create $(OBJS)\htmllib.lbc
@for %i in ($(HTMLLIB_OBJECTS)) do @%append $(OBJS)\htmllib.lbc +%i @for %i in ($(HTMLLIB_OBJECTS)) do @%append $(OBJS)\htmllib.lbc +%i
wlib -q -p2048 -n -b $^@ @$(OBJS)\htmllib.lbc wlib -q -p2048 -n -b $^@ @$(OBJS)\htmllib.lbc
@@ -9608,6 +9615,9 @@ $(LIBDIRNAME) :
$(LIBDIRNAME)\wx : $(LIBDIRNAME) $(LIBDIRNAME)\wx : $(LIBDIRNAME)
if not exist $(LIBDIRNAME)\wx mkdir $(LIBDIRNAME)\wx if not exist $(LIBDIRNAME)\wx mkdir $(LIBDIRNAME)\wx
..\..\include\wx\$(__SETUP_H_DIR_FILENAMES)\setup.h :
if not exist ..\..\include\wx\$(__SETUP_H_DIR_FILENAMES)\setup.h copy ..\..\include\wx\$(__SETUP_H_DIR_FILENAMES)\setup0.h ..\..\include\wx\$(__SETUP_H_DIR_FILENAMES)\setup.h
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
!ifeq SHARED 1 !ifeq SHARED 1
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll : $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll : $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
@@ -9627,16 +9637,13 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(V
!ifeq MONOLITHIC 1 !ifeq MONOLITHIC 1
!ifeq SHARED 0 !ifeq SHARED 0
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib : $(MONOLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib : $(MONOLIB_OBJECTS)
@%create $(OBJS)\monolib.lbc @%create $(OBJS)\monolib.lbc
@for %i in ($(MONOLIB_OBJECTS)) do @%append $(OBJS)\monolib.lbc +%i @for %i in ($(MONOLIB_OBJECTS)) do @%append $(OBJS)\monolib.lbc +%i
wlib -q -p2048 -n -b $^@ @$(OBJS)\monolib.lbc wlib -q -p2048 -n -b $^@ @$(OBJS)\monolib.lbc
!endif !endif
!endif !endif
..\..\include\wx\msw\setup.h :
if not exist ..\..\include\wx\msw\setup.h copy ..\..\include\wx\msw\setup0.h ..\..\include\wx\msw\setup.h
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
!ifeq SHARED 1 !ifeq SHARED 1
$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll : $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname) $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll : $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
@@ -9656,7 +9663,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll :
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
!ifeq SHARED 0 !ifeq SHARED 0
$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib : $(NETLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib : $(NETLIB_OBJECTS)
@%create $(OBJS)\netlib.lbc @%create $(OBJS)\netlib.lbc
@for %i in ($(NETLIB_OBJECTS)) do @%append $(OBJS)\netlib.lbc +%i @for %i in ($(NETLIB_OBJECTS)) do @%append $(OBJS)\netlib.lbc +%i
wlib -q -p2048 -n -b $^@ @$(OBJS)\netlib.lbc wlib -q -p2048 -n -b $^@ @$(OBJS)\netlib.lbc
@@ -9688,7 +9695,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll :
!ifeq SHARED 0 !ifeq SHARED 0
!ifeq USE_GUI 1 !ifeq USE_GUI 1
!ifeq USE_ODBC 1 !ifeq USE_ODBC 1
$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib : $(ODBCLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib : $(ODBCLIB_OBJECTS)
@%create $(OBJS)\odbclib.lbc @%create $(OBJS)\odbclib.lbc
@for %i in ($(ODBCLIB_OBJECTS)) do @%append $(OBJS)\odbclib.lbc +%i @for %i in ($(ODBCLIB_OBJECTS)) do @%append $(OBJS)\odbclib.lbc +%i
wlib -q -p2048 -n -b $^@ @$(OBJS)\odbclib.lbc wlib -q -p2048 -n -b $^@ @$(OBJS)\odbclib.lbc
@@ -9703,9 +9710,9 @@ samples : .SYMBOLIC
cd $(WATCOM_CWD) cd $(WATCOM_CWD)
$(LIBDIRNAME)\wx\setup.h : $(LIBDIRNAME)\wx\setup.h :
if not exist $(LIBDIRNAME)\wx\setup.h copy ..\..\include\wx\msw\setup.h $(LIBDIRNAME)\wx\setup.h if not exist $(LIBDIRNAME)\wx\setup.h copy ..\..\include\wx\$(__SETUP_H_DIR_FILENAMES)\setup.h $(LIBDIRNAME)\wx\setup.h
setup_h : .SYMBOLIC $(LIBDIRNAME)\wx ..\..\include\wx\msw\setup.h $(LIBDIRNAME)\wx\setup.h setup_h : .SYMBOLIC $(LIBDIRNAME)\wx ..\..\include\wx\$(__SETUP_H_DIR_FILENAMES)\setup.h $(LIBDIRNAME)\wx\setup.h
$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib : $(WXEXPAT_OBJECTS) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib : $(WXEXPAT_OBJECTS)
@%create $(OBJS)\wxexpat.lbc @%create $(OBJS)\wxexpat.lbc
@@ -9762,7 +9769,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_wat$(VENDORTAG).dll :
!ifeq MONOLITHIC 0 !ifeq MONOLITHIC 0
!ifeq SHARED 0 !ifeq SHARED 0
$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib : $(XMLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib : $(XMLLIB_OBJECTS)
@%create $(OBJS)\xmllib.lbc @%create $(OBJS)\xmllib.lbc
@for %i in ($(XMLLIB_OBJECTS)) do @%append $(OBJS)\xmllib.lbc +%i @for %i in ($(XMLLIB_OBJECTS)) do @%append $(OBJS)\xmllib.lbc +%i
wlib -q -p2048 -n -b $^@ @$(OBJS)\xmllib.lbc wlib -q -p2048 -n -b $^@ @$(OBJS)\xmllib.lbc