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

Various dummy.cpp centralized in common/dummy.cpp. Build rebaked.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-05-31 11:48:45 +00:00
parent e267406e11
commit 66b9f7f7e4
94 changed files with 511 additions and 613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
autoconf_inc.m4
View File

@@ -206,7 +206,7 @@ dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_XRC_1[wx.bkl] ###
COND_MONOLITHIC_0_SHARED_1_USE_XRC_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_XRC_1)
dnl ### begin block 20_COND_MONOLITHIC_0_USE_MEDIA_1[../../samples/dialup/dialup.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/power/power.bkl,../../samples/splash/splash.bkl,../../samples/widgets/widgets.bkl,../../tests/test.bkl,wx.bkl] ###
dnl ### begin block 20_COND_MONOLITHIC_0_USE_MEDIA_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../samples/dialup/dialup.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/power/power.bkl,../../samples/splash/splash.bkl,../../samples/widgets/widgets.bkl,../../tests/test.bkl,wx.bkl] ###
COND_MONOLITHIC_0_USE_MEDIA_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$USE_MEDIA" = "x1" ; then
COND_MONOLITHIC_0_USE_MEDIA_1=""

4
build/bakefiles/common.bkl
View File

@@ -582,9 +582,9 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
<if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
<if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','WINCE']">
<sources>$(WXTOPDIR)src/msw/dummy.cpp</sources>
<sources>$(WXTOPDIR)src/common/dummy.cpp</sources>
<precomp-headers-gen>
$(WXTOPDIR)src/msw/dummy.cpp
$(WXTOPDIR)src/common/dummy.cpp
</precomp-headers-gen>
</if>
<precomp-headers-location>$(WXTOPDIR)include</precomp-headers-location>

2
build/bakefiles/formats/wx24dsp.bkl
View File

@@ -8,7 +8,7 @@
<include file="presets/fake.bkl"/>
<set var="ALL_SOURCES" eval="0">
$(MONOLIB_SRC) src/msw/dummy.cpp $(OPENGL_SRC)
$(MONOLIB_SRC) src/common/dummy.cpp $(OPENGL_SRC)
</set>
<output file="$(OUTPUT_FILE)" writer="wx24dsp.empy"/>

2
build/bakefiles/formats/wx24dsp.empy
View File

@@ -330,7 +330,7 @@ SOURCE="This project is deprecated, please see install.txt"
# Begin Source File
SOURCE=.\@src[4:].replace('/','\\')
@[if src=='src/msw/dummy.cpp']@
@[if src=='src/common/dummy.cpp']@
# ADD CPP /Yc"wx/wxprec.h"
@[end if]@
@[if src.endswith('.c')]@

52
build/msw/makefile.bcc
View File

@@ -4115,7 +4115,7 @@ $(OBJS)\wxexpat_xmlrole.obj: ..\..\src\expat\lib\xmlrole.c
$(OBJS)\wxexpat_xmltok.obj: ..\..\src\expat\lib\xmltok.c
$(CC) -q -c -P- -o$@ $(WXEXPAT_CFLAGS) $**
$(OBJS)\monodll_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\monodll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) -H $**
$(OBJS)\monodll_version.res: ..\..\src\msw\version.rc
@@ -5928,7 +5928,7 @@ $(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
$(OBJS)\monolib_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\monolib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) -H $**
$(OBJS)\monolib_appbase.obj: ..\..\src\common\appbase.cpp
@@ -7738,7 +7738,7 @@ $(OBJS)\monolib_joystick.obj: ..\..\src\msw\joystick.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
$(OBJS)\basedll_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) -H $**
$(OBJS)\basedll_version.res: ..\..\src\msw\version.rc
@@ -7984,7 +7984,7 @@ $(OBJS)\basedll_mslu.obj: ..\..\src\msw\mslu.cpp
$(OBJS)\basedll_volume.obj: ..\..\src\msw\volume.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
$(OBJS)\baselib_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\baselib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) -H $**
$(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp
@@ -8227,7 +8227,7 @@ $(OBJS)\baselib_mslu.obj: ..\..\src\msw\mslu.cpp
$(OBJS)\baselib_volume.obj: ..\..\src\msw\volume.cpp
$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
$(OBJS)\netdll_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\netdll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) -H $**
$(OBJS)\netdll_version.res: ..\..\src\msw\version.rc
@@ -8269,7 +8269,7 @@ $(OBJS)\netdll_gsocket.obj: ..\..\src\msw\gsocket.cpp
$(OBJS)\netdll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
$(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $**
$(OBJS)\netlib_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\netlib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) -H $**
$(OBJS)\netlib_fs_inet.obj: ..\..\src\common\fs_inet.cpp
@@ -8308,7 +8308,7 @@ $(OBJS)\netlib_gsocket.obj: ..\..\src\msw\gsocket.cpp
$(OBJS)\netlib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
$(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) $**
$(OBJS)\coredll_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\coredll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) -H $**
$(OBJS)\coredll_version.res: ..\..\src\msw\version.rc
@@ -9495,7 +9495,7 @@ $(OBJS)\coredll_vscroll.obj: ..\..\src\generic\vscroll.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
$(OBJS)\corelib_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\corelib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) -H $**
$(OBJS)\corelib_event.obj: ..\..\src\common\event.cpp
@@ -10679,7 +10679,7 @@ $(OBJS)\corelib_vscroll.obj: ..\..\src\generic\vscroll.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
$(OBJS)\advdll_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) -H $**
$(OBJS)\advdll_version.res: ..\..\src\msw\version.rc
@@ -10763,7 +10763,7 @@ $(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp
$(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
$(OBJS)\advlib_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\advlib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) -H $**
$(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp
@@ -10844,7 +10844,7 @@ $(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp
$(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
$(OBJS)\mediadll_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\mediadll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) -H $**
$(OBJS)\mediadll_version.res: ..\..\src\msw\version.rc
@@ -10862,7 +10862,7 @@ $(OBJS)\mediadll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
$(OBJS)\mediadll_activex.obj: ..\..\src\msw\ole\activex.cpp
$(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) $**
$(OBJS)\medialib_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\medialib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) -H $**
$(OBJS)\medialib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
@@ -10877,7 +10877,7 @@ $(OBJS)\medialib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
$(OBJS)\medialib_activex.obj: ..\..\src\msw\ole\activex.cpp
$(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) $**
$(OBJS)\odbcdll_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\odbcdll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(ODBCDLL_CXXFLAGS) -H $**
$(OBJS)\odbcdll_version.res: ..\..\src\msw\version.rc
@@ -10889,7 +10889,7 @@ $(OBJS)\odbcdll_db.obj: ..\..\src\common\db.cpp
$(OBJS)\odbcdll_dbtable.obj: ..\..\src\common\dbtable.cpp
$(CXX) -q -c -P -o$@ $(ODBCDLL_CXXFLAGS) $**
$(OBJS)\odbclib_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\odbclib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(ODBCLIB_CXXFLAGS) -H $**
$(OBJS)\odbclib_db.obj: ..\..\src\common\db.cpp
@@ -10898,7 +10898,7 @@ $(OBJS)\odbclib_db.obj: ..\..\src\common\db.cpp
$(OBJS)\odbclib_dbtable.obj: ..\..\src\common\dbtable.cpp
$(CXX) -q -c -P -o$@ $(ODBCLIB_CXXFLAGS) $**
$(OBJS)\dbgriddll_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\dbgriddll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(DBGRIDDLL_CXXFLAGS) -H $**
$(OBJS)\dbgriddll_version.res: ..\..\src\msw\version.rc
@@ -10907,13 +10907,13 @@ $(OBJS)\dbgriddll_version.res: ..\..\src\msw\version.rc
$(OBJS)\dbgriddll_dbgrid.obj: ..\..\src\common\dbgrid.cpp
$(CXX) -q -c -P -o$@ $(DBGRIDDLL_CXXFLAGS) $**
$(OBJS)\dbgridlib_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\dbgridlib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(DBGRIDLIB_CXXFLAGS) -H $**
$(OBJS)\dbgridlib_dbgrid.obj: ..\..\src\common\dbgrid.cpp
$(CXX) -q -c -P -o$@ $(DBGRIDLIB_CXXFLAGS) $**
$(OBJS)\htmldll_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\htmldll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) -H $**
$(OBJS)\htmldll_version.res: ..\..\src\msw\version.rc
@@ -10991,7 +10991,7 @@ $(OBJS)\htmldll_winpars.obj: ..\..\src\html\winpars.cpp
$(OBJS)\htmldll_htmllbox.obj: ..\..\src\generic\htmllbox.cpp
$(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) $**
$(OBJS)\htmllib_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\htmllib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) -H $**
$(OBJS)\htmllib_helpbest.obj: ..\..\src\msw\helpbest.cpp
@@ -11066,7 +11066,7 @@ $(OBJS)\htmllib_winpars.obj: ..\..\src\html\winpars.cpp
$(OBJS)\htmllib_htmllbox.obj: ..\..\src\generic\htmllbox.cpp
$(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) $**
$(OBJS)\qadll_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\qadll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(QADLL_CXXFLAGS) -H $**
$(OBJS)\qadll_version.res: ..\..\src\msw\version.rc
@@ -11078,7 +11078,7 @@ $(OBJS)\qadll_debugrpt.obj: ..\..\src\common\debugrpt.cpp
$(OBJS)\qadll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
$(CXX) -q -c -P -o$@ $(QADLL_CXXFLAGS) $**
$(OBJS)\qalib_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\qalib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(QALIB_CXXFLAGS) -H $**
$(OBJS)\qalib_debugrpt.obj: ..\..\src\common\debugrpt.cpp
@@ -11087,7 +11087,7 @@ $(OBJS)\qalib_debugrpt.obj: ..\..\src\common\debugrpt.cpp
$(OBJS)\qalib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
$(CXX) -q -c -P -o$@ $(QALIB_CXXFLAGS) $**
$(OBJS)\xmldll_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\xmldll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(XMLDLL_CXXFLAGS) -H $**
$(OBJS)\xmldll_version.res: ..\..\src\msw\version.rc
@@ -11099,7 +11099,7 @@ $(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp
$(OBJS)\xmldll_xtixml.obj: ..\..\src\common\xtixml.cpp
$(CXX) -q -c -P -o$@ $(XMLDLL_CXXFLAGS) $**
$(OBJS)\xmllib_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\xmllib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(XMLLIB_CXXFLAGS) -H $**
$(OBJS)\xmllib_xml.obj: ..\..\src\xml\xml.cpp
@@ -11108,7 +11108,7 @@ $(OBJS)\xmllib_xml.obj: ..\..\src\xml\xml.cpp
$(OBJS)\xmllib_xtixml.obj: ..\..\src\common\xtixml.cpp
$(CXX) -q -c -P -o$@ $(XMLLIB_CXXFLAGS) $**
$(OBJS)\xrcdll_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\xrcdll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) -H $**
$(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc
@@ -11252,7 +11252,7 @@ $(OBJS)\xrcdll_xmlres.obj: ..\..\src\xrc\xmlres.cpp
$(OBJS)\xrcdll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $**
$(OBJS)\xrclib_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\xrclib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) -H $**
$(OBJS)\xrclib_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp
@@ -11393,7 +11393,7 @@ $(OBJS)\xrclib_xmlres.obj: ..\..\src\xrc\xmlres.cpp
$(OBJS)\xrclib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $**
$(OBJS)\gldll_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\gldll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(GLDLL_CXXFLAGS) -H $**
$(OBJS)\gldll_version.res: ..\..\src\msw\version.rc
@@ -11402,7 +11402,7 @@ $(OBJS)\gldll_version.res: ..\..\src\msw\version.rc
$(OBJS)\gldll_glcanvas.obj: ..\..\src\msw\glcanvas.cpp
$(CXX) -q -c -P -o$@ $(GLDLL_CXXFLAGS) $**
$(OBJS)\gllib_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\gllib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(GLLIB_CXXFLAGS) -H $**
$(OBJS)\gllib_glcanvas.obj: ..\..\src\msw\glcanvas.cpp

52
build/msw/makefile.gcc
View File

@@ -4219,7 +4219,7 @@ $(OBJS)\wxexpat_xmlrole.o: ../../src/expat/lib/xmlrole.c
$(OBJS)\wxexpat_xmltok.o: ../../src/expat/lib/xmltok.c
$(CC) -c -o $@ $(WXEXPAT_CFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_dummy.o: ../../src/msw/dummy.cpp
$(OBJS)\monodll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_version_rc.o: ../../src/msw/version.rc
@@ -6136,7 +6136,7 @@ $(OBJS)\monodll_joystick.o: ../../src/msw/joystick.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
$(OBJS)\monolib_dummy.o: ../../src/msw/dummy.cpp
$(OBJS)\monolib_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_appbase.o: ../../src/common/appbase.cpp
@@ -8050,7 +8050,7 @@ $(OBJS)\monolib_joystick.o: ../../src/msw/joystick.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
$(OBJS)\basedll_dummy.o: ../../src/msw/dummy.cpp
$(OBJS)\basedll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\basedll_version_rc.o: ../../src/msw/version.rc
@@ -8296,7 +8296,7 @@ $(OBJS)\basedll_mslu.o: ../../src/msw/mslu.cpp
$(OBJS)\basedll_volume.o: ../../src/msw/volume.cpp
$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\baselib_dummy.o: ../../src/msw/dummy.cpp
$(OBJS)\baselib_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\baselib_appbase.o: ../../src/common/appbase.cpp
@@ -8539,7 +8539,7 @@ $(OBJS)\baselib_mslu.o: ../../src/msw/mslu.cpp
$(OBJS)\baselib_volume.o: ../../src/msw/volume.cpp
$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\netdll_dummy.o: ../../src/msw/dummy.cpp
$(OBJS)\netdll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\netdll_version_rc.o: ../../src/msw/version.rc
@@ -8581,7 +8581,7 @@ $(OBJS)\netdll_gsocket.o: ../../src/msw/gsocket.cpp
$(OBJS)\netdll_urlmsw.o: ../../src/msw/urlmsw.cpp
$(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\netlib_dummy.o: ../../src/msw/dummy.cpp
$(OBJS)\netlib_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\netlib_fs_inet.o: ../../src/common/fs_inet.cpp
@@ -8620,7 +8620,7 @@ $(OBJS)\netlib_gsocket.o: ../../src/msw/gsocket.cpp
$(OBJS)\netlib_urlmsw.o: ../../src/msw/urlmsw.cpp
$(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\coredll_dummy.o: ../../src/msw/dummy.cpp
$(OBJS)\coredll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\coredll_version_rc.o: ../../src/msw/version.rc
@@ -9911,7 +9911,7 @@ $(OBJS)\coredll_vscroll.o: ../../src/generic/vscroll.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
$(OBJS)\corelib_dummy.o: ../../src/msw/dummy.cpp
$(OBJS)\corelib_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\corelib_event.o: ../../src/common/event.cpp
@@ -11199,7 +11199,7 @@ $(OBJS)\corelib_vscroll.o: ../../src/generic/vscroll.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
$(OBJS)\advdll_dummy.o: ../../src/msw/dummy.cpp
$(OBJS)\advdll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\advdll_version_rc.o: ../../src/msw/version.rc
@@ -11283,7 +11283,7 @@ $(OBJS)\advdll_taskbar.o: ../../src/msw/taskbar.cpp
$(OBJS)\advdll_joystick.o: ../../src/msw/joystick.cpp
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\advlib_dummy.o: ../../src/msw/dummy.cpp
$(OBJS)\advlib_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\advlib_datectrl.o: ../../src/msw/datectrl.cpp
@@ -11364,7 +11364,7 @@ $(OBJS)\advlib_taskbar.o: ../../src/msw/taskbar.cpp
$(OBJS)\advlib_joystick.o: ../../src/msw/joystick.cpp
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\mediadll_dummy.o: ../../src/msw/dummy.cpp
$(OBJS)\mediadll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(MEDIADLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\mediadll_version_rc.o: ../../src/msw/version.rc
@@ -11382,7 +11382,7 @@ $(OBJS)\mediadll_mediactrl_wmp10.o: ../../src/msw/mediactrl_wmp10.cpp
$(OBJS)\mediadll_activex.o: ../../src/msw/ole/activex.cpp
$(CXX) -c -o $@ $(MEDIADLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\medialib_dummy.o: ../../src/msw/dummy.cpp
$(OBJS)\medialib_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(MEDIALIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\medialib_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp
@@ -11397,7 +11397,7 @@ $(OBJS)\medialib_mediactrl_wmp10.o: ../../src/msw/mediactrl_wmp10.cpp
$(OBJS)\medialib_activex.o: ../../src/msw/ole/activex.cpp
$(CXX) -c -o $@ $(MEDIALIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\odbcdll_dummy.o: ../../src/msw/dummy.cpp
$(OBJS)\odbcdll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(ODBCDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\odbcdll_version_rc.o: ../../src/msw/version.rc
@@ -11409,7 +11409,7 @@ $(OBJS)\odbcdll_db.o: ../../src/common/db.cpp
$(OBJS)\odbcdll_dbtable.o: ../../src/common/dbtable.cpp
$(CXX) -c -o $@ $(ODBCDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\odbclib_dummy.o: ../../src/msw/dummy.cpp
$(OBJS)\odbclib_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(ODBCLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\odbclib_db.o: ../../src/common/db.cpp
@@ -11418,7 +11418,7 @@ $(OBJS)\odbclib_db.o: ../../src/common/db.cpp
$(OBJS)\odbclib_dbtable.o: ../../src/common/dbtable.cpp
$(CXX) -c -o $@ $(ODBCLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\dbgriddll_dummy.o: ../../src/msw/dummy.cpp
$(OBJS)\dbgriddll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(DBGRIDDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\dbgriddll_version_rc.o: ../../src/msw/version.rc
@@ -11427,13 +11427,13 @@ $(OBJS)\dbgriddll_version_rc.o: ../../src/msw/version.rc
$(OBJS)\dbgriddll_dbgrid.o: ../../src/common/dbgrid.cpp
$(CXX) -c -o $@ $(DBGRIDDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\dbgridlib_dummy.o: ../../src/msw/dummy.cpp
$(OBJS)\dbgridlib_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(DBGRIDLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\dbgridlib_dbgrid.o: ../../src/common/dbgrid.cpp
$(CXX) -c -o $@ $(DBGRIDLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\htmldll_dummy.o: ../../src/msw/dummy.cpp
$(OBJS)\htmldll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\htmldll_version_rc.o: ../../src/msw/version.rc
@@ -11511,7 +11511,7 @@ $(OBJS)\htmldll_winpars.o: ../../src/html/winpars.cpp
$(OBJS)\htmldll_htmllbox.o: ../../src/generic/htmllbox.cpp
$(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\htmllib_dummy.o: ../../src/msw/dummy.cpp
$(OBJS)\htmllib_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\htmllib_helpbest.o: ../../src/msw/helpbest.cpp
@@ -11586,7 +11586,7 @@ $(OBJS)\htmllib_winpars.o: ../../src/html/winpars.cpp
$(OBJS)\htmllib_htmllbox.o: ../../src/generic/htmllbox.cpp
$(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\qadll_dummy.o: ../../src/msw/dummy.cpp
$(OBJS)\qadll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(QADLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\qadll_version_rc.o: ../../src/msw/version.rc
@@ -11598,7 +11598,7 @@ $(OBJS)\qadll_debugrpt.o: ../../src/common/debugrpt.cpp
$(OBJS)\qadll_dbgrptg.o: ../../src/generic/dbgrptg.cpp
$(CXX) -c -o $@ $(QADLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\qalib_dummy.o: ../../src/msw/dummy.cpp
$(OBJS)\qalib_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(QALIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\qalib_debugrpt.o: ../../src/common/debugrpt.cpp
@@ -11607,7 +11607,7 @@ $(OBJS)\qalib_debugrpt.o: ../../src/common/debugrpt.cpp
$(OBJS)\qalib_dbgrptg.o: ../../src/generic/dbgrptg.cpp
$(CXX) -c -o $@ $(QALIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xmldll_dummy.o: ../../src/msw/dummy.cpp
$(OBJS)\xmldll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(XMLDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xmldll_version_rc.o: ../../src/msw/version.rc
@@ -11619,7 +11619,7 @@ $(OBJS)\xmldll_xml.o: ../../src/xml/xml.cpp
$(OBJS)\xmldll_xtixml.o: ../../src/common/xtixml.cpp
$(CXX) -c -o $@ $(XMLDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xmllib_dummy.o: ../../src/msw/dummy.cpp
$(OBJS)\xmllib_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(XMLLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xmllib_xml.o: ../../src/xml/xml.cpp
@@ -11628,7 +11628,7 @@ $(OBJS)\xmllib_xml.o: ../../src/xml/xml.cpp
$(OBJS)\xmllib_xtixml.o: ../../src/common/xtixml.cpp
$(CXX) -c -o $@ $(XMLLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrcdll_dummy.o: ../../src/msw/dummy.cpp
$(OBJS)\xrcdll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrcdll_version_rc.o: ../../src/msw/version.rc
@@ -11772,7 +11772,7 @@ $(OBJS)\xrcdll_xmlres.o: ../../src/xrc/xmlres.cpp
$(OBJS)\xrcdll_xmlrsall.o: ../../src/xrc/xmlrsall.cpp
$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrclib_dummy.o: ../../src/msw/dummy.cpp
$(OBJS)\xrclib_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrclib_xh_bmpbt.o: ../../src/xrc/xh_bmpbt.cpp
@@ -11913,7 +11913,7 @@ $(OBJS)\xrclib_xmlres.o: ../../src/xrc/xmlres.cpp
$(OBJS)\xrclib_xmlrsall.o: ../../src/xrc/xmlrsall.cpp
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\gldll_dummy.o: ../../src/msw/dummy.cpp
$(OBJS)\gldll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(GLDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\gldll_version_rc.o: ../../src/msw/version.rc
@@ -11922,7 +11922,7 @@ $(OBJS)\gldll_version_rc.o: ../../src/msw/version.rc
$(OBJS)\gldll_glcanvas.o: ../../src/msw/glcanvas.cpp
$(CXX) -c -o $@ $(GLDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\gllib_dummy.o: ../../src/msw/dummy.cpp
$(OBJS)\gllib_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(GLLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\gllib_glcanvas.o: ../../src/msw/glcanvas.cpp

52
build/msw/makefile.vc
View File

@@ -4424,7 +4424,7 @@ $(OBJS)\wxexpat_xmlrole.obj: ..\..\src\expat\lib\xmlrole.c
$(OBJS)\wxexpat_xmltok.obj: ..\..\src\expat\lib\xmltok.c
$(CC) /c /nologo /TC /Fo$@ $(WXEXPAT_CFLAGS) $**
$(OBJS)\monodll_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\monodll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\monodll_version.res: ..\..\src\msw\version.rc
@@ -6237,7 +6237,7 @@ $(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
$(OBJS)\monolib_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\monolib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\monolib_appbase.obj: ..\..\src\common\appbase.cpp
@@ -8047,7 +8047,7 @@ $(OBJS)\monolib_joystick.obj: ..\..\src\msw\joystick.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
$(OBJS)\basedll_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\basedll_version.res: ..\..\src\msw\version.rc
@@ -8293,7 +8293,7 @@ $(OBJS)\basedll_mslu.obj: ..\..\src\msw\mslu.cpp
$(OBJS)\basedll_volume.obj: ..\..\src\msw\volume.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
$(OBJS)\baselib_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\baselib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp
@@ -8536,7 +8536,7 @@ $(OBJS)\baselib_mslu.obj: ..\..\src\msw\mslu.cpp
$(OBJS)\baselib_volume.obj: ..\..\src\msw\volume.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
$(OBJS)\netdll_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\netdll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\netdll_version.res: ..\..\src\msw\version.rc
@@ -8578,7 +8578,7 @@ $(OBJS)\netdll_gsocket.obj: ..\..\src\msw\gsocket.cpp
$(OBJS)\netdll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
$(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
$(OBJS)\netlib_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\netlib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\netlib_fs_inet.obj: ..\..\src\common\fs_inet.cpp
@@ -8617,7 +8617,7 @@ $(OBJS)\netlib_gsocket.obj: ..\..\src\msw\gsocket.cpp
$(OBJS)\netlib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
$(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) $**
$(OBJS)\coredll_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\coredll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\coredll_version.res: ..\..\src\msw\version.rc
@@ -9804,7 +9804,7 @@ $(OBJS)\coredll_vscroll.obj: ..\..\src\generic\vscroll.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
!endif
$(OBJS)\corelib_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\corelib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\corelib_event.obj: ..\..\src\common\event.cpp
@@ -10988,7 +10988,7 @@ $(OBJS)\corelib_vscroll.obj: ..\..\src\generic\vscroll.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
!endif
$(OBJS)\advdll_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\advdll_version.res: ..\..\src\msw\version.rc
@@ -11072,7 +11072,7 @@ $(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp
$(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
$(OBJS)\advlib_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\advlib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp
@@ -11153,7 +11153,7 @@ $(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp
$(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
$(OBJS)\mediadll_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\mediadll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\mediadll_version.res: ..\..\src\msw\version.rc
@@ -11171,7 +11171,7 @@ $(OBJS)\mediadll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
$(OBJS)\mediadll_activex.obj: ..\..\src\msw\ole\activex.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) $**
$(OBJS)\medialib_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\medialib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\medialib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
@@ -11186,7 +11186,7 @@ $(OBJS)\medialib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
$(OBJS)\medialib_activex.obj: ..\..\src\msw\ole\activex.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) $**
$(OBJS)\odbcdll_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\odbcdll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ODBCDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\odbcdll_version.res: ..\..\src\msw\version.rc
@@ -11198,7 +11198,7 @@ $(OBJS)\odbcdll_db.obj: ..\..\src\common\db.cpp
$(OBJS)\odbcdll_dbtable.obj: ..\..\src\common\dbtable.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ODBCDLL_CXXFLAGS) $**
$(OBJS)\odbclib_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\odbclib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ODBCLIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\odbclib_db.obj: ..\..\src\common\db.cpp
@@ -11207,7 +11207,7 @@ $(OBJS)\odbclib_db.obj: ..\..\src\common\db.cpp
$(OBJS)\odbclib_dbtable.obj: ..\..\src\common\dbtable.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ODBCLIB_CXXFLAGS) $**
$(OBJS)\dbgriddll_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\dbgriddll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DBGRIDDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\dbgriddll_version.res: ..\..\src\msw\version.rc
@@ -11216,13 +11216,13 @@ $(OBJS)\dbgriddll_version.res: ..\..\src\msw\version.rc
$(OBJS)\dbgriddll_dbgrid.obj: ..\..\src\common\dbgrid.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DBGRIDDLL_CXXFLAGS) $**
$(OBJS)\dbgridlib_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\dbgridlib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DBGRIDLIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\dbgridlib_dbgrid.obj: ..\..\src\common\dbgrid.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DBGRIDLIB_CXXFLAGS) $**
$(OBJS)\htmldll_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\htmldll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\htmldll_version.res: ..\..\src\msw\version.rc
@@ -11300,7 +11300,7 @@ $(OBJS)\htmldll_winpars.obj: ..\..\src\html\winpars.cpp
$(OBJS)\htmldll_htmllbox.obj: ..\..\src\generic\htmllbox.cpp
$(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
$(OBJS)\htmllib_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\htmllib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\htmllib_helpbest.obj: ..\..\src\msw\helpbest.cpp
@@ -11375,7 +11375,7 @@ $(OBJS)\htmllib_winpars.obj: ..\..\src\html\winpars.cpp
$(OBJS)\htmllib_htmllbox.obj: ..\..\src\generic\htmllbox.cpp
$(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
$(OBJS)\qadll_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\qadll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\qadll_version.res: ..\..\src\msw\version.rc
@@ -11387,7 +11387,7 @@ $(OBJS)\qadll_debugrpt.obj: ..\..\src\common\debugrpt.cpp
$(OBJS)\qadll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) $**
$(OBJS)\qalib_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\qalib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(QALIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\qalib_debugrpt.obj: ..\..\src\common\debugrpt.cpp
@@ -11396,7 +11396,7 @@ $(OBJS)\qalib_debugrpt.obj: ..\..\src\common\debugrpt.cpp
$(OBJS)\qalib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(QALIB_CXXFLAGS) $**
$(OBJS)\xmldll_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\xmldll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\xmldll_version.res: ..\..\src\msw\version.rc
@@ -11408,7 +11408,7 @@ $(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp
$(OBJS)\xmldll_xtixml.obj: ..\..\src\common\xtixml.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) $**
$(OBJS)\xmllib_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\xmllib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XMLLIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\xmllib_xml.obj: ..\..\src\xml\xml.cpp
@@ -11417,7 +11417,7 @@ $(OBJS)\xmllib_xml.obj: ..\..\src\xml\xml.cpp
$(OBJS)\xmllib_xtixml.obj: ..\..\src\common\xtixml.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XMLLIB_CXXFLAGS) $**
$(OBJS)\xrcdll_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\xrcdll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc
@@ -11561,7 +11561,7 @@ $(OBJS)\xrcdll_xmlres.obj: ..\..\src\xrc\xmlres.cpp
$(OBJS)\xrcdll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
$(OBJS)\xrclib_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\xrclib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\xrclib_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp
@@ -11702,7 +11702,7 @@ $(OBJS)\xrclib_xmlres.obj: ..\..\src\xrc\xmlres.cpp
$(OBJS)\xrclib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
$(OBJS)\gldll_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\gldll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\gldll_version.res: ..\..\src\msw\version.rc
@@ -11711,7 +11711,7 @@ $(OBJS)\gldll_version.res: ..\..\src\msw\version.rc
$(OBJS)\gldll_glcanvas.obj: ..\..\src\msw\glcanvas.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) $**
$(OBJS)\gllib_dummy.obj: ..\..\src\msw\dummy.cpp
$(OBJS)\gllib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GLLIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\gllib_glcanvas.obj: ..\..\src\msw\glcanvas.cpp

52
build/msw/makefile.wat
View File

@@ -4419,7 +4419,7 @@ $(OBJS)\wxexpat_xmlrole.obj : .AUTODEPEND ..\..\src\expat\lib\xmlrole.c
$(OBJS)\wxexpat_xmltok.obj : .AUTODEPEND ..\..\src\expat\lib\xmltok.c
$(CC) -bt=nt -zq -fo=$^@ $(WXEXPAT_CFLAGS) $<
$(OBJS)\monodll_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp
$(OBJS)\monodll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_version.res : .AUTODEPEND ..\..\src\msw\version.rc
@@ -6336,7 +6336,7 @@ $(OBJS)\monodll_joystick.obj : .AUTODEPEND ..\..\src\msw\joystick.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
$(OBJS)\monolib_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp
$(OBJS)\monolib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_appbase.obj : .AUTODEPEND ..\..\src\common\appbase.cpp
@@ -8250,7 +8250,7 @@ $(OBJS)\monolib_joystick.obj : .AUTODEPEND ..\..\src\msw\joystick.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
$(OBJS)\basedll_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp
$(OBJS)\basedll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
$(OBJS)\basedll_version.res : .AUTODEPEND ..\..\src\msw\version.rc
@@ -8496,7 +8496,7 @@ $(OBJS)\basedll_mslu.obj : .AUTODEPEND ..\..\src\msw\mslu.cpp
$(OBJS)\basedll_volume.obj : .AUTODEPEND ..\..\src\msw\volume.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
$(OBJS)\baselib_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp
$(OBJS)\baselib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
$(OBJS)\baselib_appbase.obj : .AUTODEPEND ..\..\src\common\appbase.cpp
@@ -8739,7 +8739,7 @@ $(OBJS)\baselib_mslu.obj : .AUTODEPEND ..\..\src\msw\mslu.cpp
$(OBJS)\baselib_volume.obj : .AUTODEPEND ..\..\src\msw\volume.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
$(OBJS)\netdll_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp
$(OBJS)\netdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(NETDLL_CXXFLAGS) $<
$(OBJS)\netdll_version.res : .AUTODEPEND ..\..\src\msw\version.rc
@@ -8781,7 +8781,7 @@ $(OBJS)\netdll_gsocket.obj : .AUTODEPEND ..\..\src\msw\gsocket.cpp
$(OBJS)\netdll_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(NETDLL_CXXFLAGS) $<
$(OBJS)\netlib_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp
$(OBJS)\netlib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(NETLIB_CXXFLAGS) $<
$(OBJS)\netlib_fs_inet.obj : .AUTODEPEND ..\..\src\common\fs_inet.cpp
@@ -8820,7 +8820,7 @@ $(OBJS)\netlib_gsocket.obj : .AUTODEPEND ..\..\src\msw\gsocket.cpp
$(OBJS)\netlib_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(NETLIB_CXXFLAGS) $<
$(OBJS)\coredll_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp
$(OBJS)\coredll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
$(OBJS)\coredll_version.res : .AUTODEPEND ..\..\src\msw\version.rc
@@ -10111,7 +10111,7 @@ $(OBJS)\coredll_vscroll.obj : .AUTODEPEND ..\..\src\generic\vscroll.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
$(OBJS)\corelib_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp
$(OBJS)\corelib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
$(OBJS)\corelib_event.obj : .AUTODEPEND ..\..\src\common\event.cpp
@@ -11399,7 +11399,7 @@ $(OBJS)\corelib_vscroll.obj : .AUTODEPEND ..\..\src\generic\vscroll.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
$(OBJS)\advdll_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp
$(OBJS)\advdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
$(OBJS)\advdll_version.res : .AUTODEPEND ..\..\src\msw\version.rc
@@ -11483,7 +11483,7 @@ $(OBJS)\advdll_taskbar.obj : .AUTODEPEND ..\..\src\msw\taskbar.cpp
$(OBJS)\advdll_joystick.obj : .AUTODEPEND ..\..\src\msw\joystick.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
$(OBJS)\advlib_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp
$(OBJS)\advlib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
$(OBJS)\advlib_datectrl.obj : .AUTODEPEND ..\..\src\msw\datectrl.cpp
@@ -11564,7 +11564,7 @@ $(OBJS)\advlib_taskbar.obj : .AUTODEPEND ..\..\src\msw\taskbar.cpp
$(OBJS)\advlib_joystick.obj : .AUTODEPEND ..\..\src\msw\joystick.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
$(OBJS)\mediadll_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp
$(OBJS)\mediadll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MEDIADLL_CXXFLAGS) $<
$(OBJS)\mediadll_version.res : .AUTODEPEND ..\..\src\msw\version.rc
@@ -11582,7 +11582,7 @@ $(OBJS)\mediadll_mediactrl_wmp10.obj : .AUTODEPEND ..\..\src\msw\mediactrl_wmp1
$(OBJS)\mediadll_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MEDIADLL_CXXFLAGS) $<
$(OBJS)\medialib_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp
$(OBJS)\medialib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MEDIALIB_CXXFLAGS) $<
$(OBJS)\medialib_mediactrlcmn.obj : .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp
@@ -11597,7 +11597,7 @@ $(OBJS)\medialib_mediactrl_wmp10.obj : .AUTODEPEND ..\..\src\msw\mediactrl_wmp1
$(OBJS)\medialib_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MEDIALIB_CXXFLAGS) $<
$(OBJS)\odbcdll_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp
$(OBJS)\odbcdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ODBCDLL_CXXFLAGS) $<
$(OBJS)\odbcdll_version.res : .AUTODEPEND ..\..\src\msw\version.rc
@@ -11609,7 +11609,7 @@ $(OBJS)\odbcdll_db.obj : .AUTODEPEND ..\..\src\common\db.cpp
$(OBJS)\odbcdll_dbtable.obj : .AUTODEPEND ..\..\src\common\dbtable.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ODBCDLL_CXXFLAGS) $<
$(OBJS)\odbclib_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp
$(OBJS)\odbclib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ODBCLIB_CXXFLAGS) $<
$(OBJS)\odbclib_db.obj : .AUTODEPEND ..\..\src\common\db.cpp
@@ -11618,7 +11618,7 @@ $(OBJS)\odbclib_db.obj : .AUTODEPEND ..\..\src\common\db.cpp
$(OBJS)\odbclib_dbtable.obj : .AUTODEPEND ..\..\src\common\dbtable.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ODBCLIB_CXXFLAGS) $<
$(OBJS)\dbgriddll_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp
$(OBJS)\dbgriddll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(DBGRIDDLL_CXXFLAGS) $<
$(OBJS)\dbgriddll_version.res : .AUTODEPEND ..\..\src\msw\version.rc
@@ -11627,13 +11627,13 @@ $(OBJS)\dbgriddll_version.res : .AUTODEPEND ..\..\src\msw\version.rc
$(OBJS)\dbgriddll_dbgrid.obj : .AUTODEPEND ..\..\src\common\dbgrid.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(DBGRIDDLL_CXXFLAGS) $<
$(OBJS)\dbgridlib_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp
$(OBJS)\dbgridlib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(DBGRIDLIB_CXXFLAGS) $<
$(OBJS)\dbgridlib_dbgrid.obj : .AUTODEPEND ..\..\src\common\dbgrid.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(DBGRIDLIB_CXXFLAGS) $<
$(OBJS)\htmldll_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp
$(OBJS)\htmldll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
$(OBJS)\htmldll_version.res : .AUTODEPEND ..\..\src\msw\version.rc
@@ -11711,7 +11711,7 @@ $(OBJS)\htmldll_winpars.obj : .AUTODEPEND ..\..\src\html\winpars.cpp
$(OBJS)\htmldll_htmllbox.obj : .AUTODEPEND ..\..\src\generic\htmllbox.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
$(OBJS)\htmllib_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp
$(OBJS)\htmllib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<
$(OBJS)\htmllib_helpbest.obj : .AUTODEPEND ..\..\src\msw\helpbest.cpp
@@ -11786,7 +11786,7 @@ $(OBJS)\htmllib_winpars.obj : .AUTODEPEND ..\..\src\html\winpars.cpp
$(OBJS)\htmllib_htmllbox.obj : .AUTODEPEND ..\..\src\generic\htmllbox.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<
$(OBJS)\qadll_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp
$(OBJS)\qadll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(QADLL_CXXFLAGS) $<
$(OBJS)\qadll_version.res : .AUTODEPEND ..\..\src\msw\version.rc
@@ -11798,7 +11798,7 @@ $(OBJS)\qadll_debugrpt.obj : .AUTODEPEND ..\..\src\common\debugrpt.cpp
$(OBJS)\qadll_dbgrptg.obj : .AUTODEPEND ..\..\src\generic\dbgrptg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(QADLL_CXXFLAGS) $<
$(OBJS)\qalib_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp
$(OBJS)\qalib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(QALIB_CXXFLAGS) $<
$(OBJS)\qalib_debugrpt.obj : .AUTODEPEND ..\..\src\common\debugrpt.cpp
@@ -11807,7 +11807,7 @@ $(OBJS)\qalib_debugrpt.obj : .AUTODEPEND ..\..\src\common\debugrpt.cpp
$(OBJS)\qalib_dbgrptg.obj : .AUTODEPEND ..\..\src\generic\dbgrptg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(QALIB_CXXFLAGS) $<
$(OBJS)\xmldll_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp
$(OBJS)\xmldll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(XMLDLL_CXXFLAGS) $<
$(OBJS)\xmldll_version.res : .AUTODEPEND ..\..\src\msw\version.rc
@@ -11819,7 +11819,7 @@ $(OBJS)\xmldll_xml.obj : .AUTODEPEND ..\..\src\xml\xml.cpp
$(OBJS)\xmldll_xtixml.obj : .AUTODEPEND ..\..\src\common\xtixml.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(XMLDLL_CXXFLAGS) $<
$(OBJS)\xmllib_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp
$(OBJS)\xmllib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(XMLLIB_CXXFLAGS) $<
$(OBJS)\xmllib_xml.obj : .AUTODEPEND ..\..\src\xml\xml.cpp
@@ -11828,7 +11828,7 @@ $(OBJS)\xmllib_xml.obj : .AUTODEPEND ..\..\src\xml\xml.cpp
$(OBJS)\xmllib_xtixml.obj : .AUTODEPEND ..\..\src\common\xtixml.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(XMLLIB_CXXFLAGS) $<
$(OBJS)\xrcdll_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp
$(OBJS)\xrcdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
$(OBJS)\xrcdll_version.res : .AUTODEPEND ..\..\src\msw\version.rc
@@ -11972,7 +11972,7 @@ $(OBJS)\xrcdll_xmlres.obj : .AUTODEPEND ..\..\src\xrc\xmlres.cpp
$(OBJS)\xrcdll_xmlrsall.obj : .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
$(OBJS)\xrclib_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp
$(OBJS)\xrclib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
$(OBJS)\xrclib_xh_bmpbt.obj : .AUTODEPEND ..\..\src\xrc\xh_bmpbt.cpp
@@ -12113,7 +12113,7 @@ $(OBJS)\xrclib_xmlres.obj : .AUTODEPEND ..\..\src\xrc\xmlres.cpp
$(OBJS)\xrclib_xmlrsall.obj : .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
$(OBJS)\gldll_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp
$(OBJS)\gldll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GLDLL_CXXFLAGS) $<
$(OBJS)\gldll_version.res : .AUTODEPEND ..\..\src\msw\version.rc
@@ -12122,7 +12122,7 @@ $(OBJS)\gldll_version.res : .AUTODEPEND ..\..\src\msw\version.rc
$(OBJS)\gldll_glcanvas.obj : .AUTODEPEND ..\..\src\msw\glcanvas.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GLDLL_CXXFLAGS) $<
$(OBJS)\gllib_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp
$(OBJS)\gllib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GLLIB_CXXFLAGS) $<
$(OBJS)\gllib_glcanvas.obj : .AUTODEPEND ..\..\src\msw\glcanvas.cpp

12
build/msw/wx_adv.dsp
View File

@@ -456,6 +456,12 @@ SOURCE=..\..\src\common\datavcmn.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# Begin Source File
SOURCE=..\..\src\common\taskbarcmn.cpp
# End Source File
# End Group
@@ -527,12 +533,6 @@ SOURCE=..\..\src\msw\datectrl.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\joystick.cpp
# End Source File
# Begin Source File

12
build/msw/wx_base.dsp
View File

@@ -488,6 +488,12 @@ SOURCE=..\..\src\common\dircmn.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# Begin Source File
SOURCE=..\..\src\common\dynarray.cpp
# End Source File
# Begin Source File
@@ -725,12 +731,6 @@ SOURCE=..\..\src\msw\dlmsw.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\main.cpp
# End Source File
# Begin Source File

12
build/msw/wx_core.dsp
View File

@@ -552,6 +552,12 @@ SOURCE=..\..\src\common\dseldlg.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# Begin Source File
SOURCE=..\..\src\common\effects.cpp
# End Source File
# Begin Source File
@@ -1746,12 +1752,6 @@ SOURCE=..\..\src\msw\ole\droptgt.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\enhmeta.cpp
# End Source File
# Begin Source File

12
build/msw/wx_dbgrid.dsp
View File

@@ -454,18 +454,18 @@ LIB32=link.exe -lib
SOURCE=..\..\src\common\dbgrid.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# End Group
# Begin Group "MSW Sources"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\msw\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\version.rc
!IF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release"

278
build/msw/wx_gl.dsp
View File

@@ -447,15 +447,19 @@ LIB32=link.exe -lib
# Name "gl - Win32 Unicode Debug"
# Name "gl - Win32 Release"
# Name "gl - Win32 Debug"
# Begin Group "MSW Sources"
# Begin Group "Common Sources"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\msw\dummy.cpp
SOURCE=..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# End Group
# Begin Group "MSW Sources"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\msw\glcanvas.cpp
@@ -529,141 +533,6 @@ SOURCE=..\..\src\msw\version.rc
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "gl - Win32 DLL Universal Unicode Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Debug"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 DLL Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Debug"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 Universal Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 Universal Debug"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\univ\setup.h
!IF "$(CFG)" == "gl - Win32 DLL Universal Unicode Release"
@@ -796,6 +665,141 @@ InputPath=..\include\wx\univ\setup.h
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "gl - Win32 DLL Universal Unicode Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Debug"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 DLL Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Debug"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 Universal Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 Universal Debug"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 Unicode Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 Unicode Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
InputPath=..\include\wx\msw\setup.h
"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Group "MSW Headers"

8
build/msw/wx_html.dsp
View File

@@ -447,15 +447,19 @@ LIB32=link.exe -lib
# Name "html - Win32 Unicode Debug"
# Name "html - Win32 Release"
# Name "html - Win32 Debug"
# Begin Group "MSW Sources"
# Begin Group "Common Sources"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\msw\dummy.cpp
SOURCE=..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# End Group
# Begin Group "MSW Sources"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\msw\helpbest.cpp

12
build/msw/wx_media.dsp
View File

@@ -452,6 +452,12 @@ LIB32=link.exe -lib
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# Begin Source File
SOURCE=..\..\src\common\mediactrlcmn.cpp
# End Source File
# End Group
@@ -464,12 +470,6 @@ SOURCE=..\..\src\msw\ole\activex.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\mediactrl_am.cpp
# End Source File
# Begin Source File

12
build/msw/wx_net.dsp
View File

@@ -452,6 +452,12 @@ LIB32=link.exe -lib
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# Begin Source File
SOURCE=..\..\src\common\fs_inet.cpp
# End Source File
# Begin Source File
@@ -496,12 +502,6 @@ SOURCE=..\..\src\common\url.cpp
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\msw\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\gsocket.cpp
# End Source File
# Begin Source File

12
build/msw/wx_odbc.dsp
View File

@@ -458,18 +458,18 @@ SOURCE=..\..\src\common\db.cpp
SOURCE=..\..\src\common\dbtable.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# End Group
# Begin Group "MSW Sources"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\msw\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\version.rc
!IF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release"

12
build/msw/wx_qa.dsp
View File

@@ -454,18 +454,18 @@ LIB32=link.exe -lib
SOURCE=..\..\src\common\debugrpt.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# End Group
# Begin Group "MSW Sources"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\msw\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\version.rc
!IF "$(CFG)" == "qa - Win32 DLL Universal Unicode Release"

12
build/msw/wx_xml.dsp
View File

@@ -452,6 +452,12 @@ LIB32=link.exe -lib
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# Begin Source File
SOURCE=..\..\src\common\xtixml.cpp
# End Source File
# End Group
@@ -460,12 +466,6 @@ SOURCE=..\..\src\common\xtixml.cpp
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\msw\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\version.rc
!IF "$(CFG)" == "xml - Win32 DLL Universal Unicode Release"

8
build/msw/wx_xrc.dsp
View File

@@ -447,15 +447,19 @@ LIB32=link.exe -lib
# Name "xrc - Win32 Unicode Debug"
# Name "xrc - Win32 Release"
# Name "xrc - Win32 Debug"
# Begin Group "MSW Sources"
# Begin Group "Common Sources"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\msw\dummy.cpp
SOURCE=..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# End Group
# Begin Group "MSW Sources"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\msw\version.rc

2
contrib/build/animate/animate.dsp
View File

@@ -456,7 +456,7 @@ SOURCE=../../src/animate\animate.cpp
# End Source File
# Begin Source File
SOURCE=../../src/animate\..\..\..\src\msw\dummy.cpp
SOURCE=../../src/animate\..\..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File

6
contrib/build/animate/makefile.bcc
View File

@@ -238,7 +238,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate_bcc$(VENDORTAG).dll: $(OBJS)\animatedll_dummy.obj $(ANIMATEDLL_OBJECTS) $(OBJS)\animatedll_version.res
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(ANIMATEDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\animatedll_version.res
c0d32.obj $(ANIMATEDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\animatedll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate $@
!endif
@@ -251,7 +251,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
|
!endif
$(OBJS)\animatedll_dummy.obj: ../../src/animate\..\..\..\src\msw\dummy.cpp
$(OBJS)\animatedll_dummy.obj: ../../src/animate\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(ANIMATEDLL_CXXFLAGS) -H $**
$(OBJS)\animatedll_version.res: ../../src/animate\..\..\..\src\msw\version.rc
@@ -260,7 +260,7 @@ $(OBJS)\animatedll_version.res: ../../src/animate\..\..\..\src\msw\version.rc
$(OBJS)\animatedll_animate.obj: ../../src/animate\animate.cpp
$(CXX) -q -c -P -o$@ $(ANIMATEDLL_CXXFLAGS) $**
$(OBJS)\animatelib_dummy.obj: ../../src/animate\..\..\..\src\msw\dummy.cpp
$(OBJS)\animatelib_dummy.obj: ../../src/animate\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(ANIMATELIB_CXXFLAGS) -H $**
$(OBJS)\animatelib_animate.obj: ../../src/animate\animate.cpp

6
contrib/build/animate/makefile.gcc
View File

@@ -232,7 +232,7 @@ clean:
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate_gcc$(VENDORTAG).dll: $(ANIMATEDLL_OBJECTS) $(OBJS)\animatedll_version_rc.o
$(CXX) -shared -fPIC -o $@ $(ANIMATEDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
$(CXX) -shared -fPIC -o $@ $(ANIMATEDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
endif
ifeq ($(SHARED),0)
@@ -242,7 +242,7 @@ $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(
ranlib $@
endif
$(OBJS)\animatedll_dummy.o: ../../src/animate/../../../src/msw/dummy.cpp
$(OBJS)\animatedll_dummy.o: ../../src/animate/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(ANIMATEDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\animatedll_version_rc.o: ../../src/animate/../../../src/msw/version.rc
@@ -251,7 +251,7 @@ $(OBJS)\animatedll_version_rc.o: ../../src/animate/../../../src/msw/version.rc
$(OBJS)\animatedll_animate.o: ../../src/animate/animate.cpp
$(CXX) -c -o $@ $(ANIMATEDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\animatelib_dummy.o: ../../src/animate/../../../src/msw/dummy.cpp
$(OBJS)\animatelib_dummy.o: ../../src/animate/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(ANIMATELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\animatelib_animate.o: ../../src/animate/animate.cpp

6
contrib/build/animate/makefile.vc
View File

@@ -323,7 +323,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate_vc$(VENDORTAG).dll: $(OBJS)\animatedll_dummy.obj $(ANIMATEDLL_OBJECTS) $(OBJS)\animatedll_version.res
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
$(ANIMATEDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate.lib
$(ANIMATEDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate.lib
<<
!endif
@@ -335,7 +335,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
<<
!endif
$(OBJS)\animatedll_dummy.obj: ../../src/animate\..\..\..\src\msw\dummy.cpp
$(OBJS)\animatedll_dummy.obj: ../../src/animate\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ANIMATEDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\animatedll_version.res: ../../src/animate\..\..\..\src\msw\version.rc
@@ -344,7 +344,7 @@ $(OBJS)\animatedll_version.res: ../../src/animate\..\..\..\src\msw\version.rc
$(OBJS)\animatedll_animate.obj: ../../src/animate\animate.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ANIMATEDLL_CXXFLAGS) $**
$(OBJS)\animatelib_dummy.obj: ../../src/animate\..\..\..\src\msw\dummy.cpp
$(OBJS)\animatelib_dummy.obj: ../../src/animate\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ANIMATELIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\animatelib_animate.obj: ../../src/animate\animate.cpp

6
contrib/build/animate/makefile.wat
View File

@@ -270,7 +270,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\animatedll.lbc option caseexact
@%append $(OBJS)\animatedll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME)
@for %i in ($(ANIMATEDLL_OBJECTS)) do @%append $(OBJS)\animatedll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\animatedll.lbc library %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\animatedll.lbc library %i
@%append $(OBJS)\animatedll.lbc option resource=$(OBJS)\animatedll_version.res
@%append $(OBJS)\animatedll.lbc system nt_dll
wlink @$(OBJS)\animatedll.lbc
@@ -284,7 +284,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
wlib -q -p4096 -n -b $^@ @$(OBJS)\animatelib.lbc
!endif
$(OBJS)\animatedll_dummy.obj : .AUTODEPEND ../../src/animate\..\..\..\src\msw\dummy.cpp
$(OBJS)\animatedll_dummy.obj : .AUTODEPEND ../../src/animate\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ANIMATEDLL_CXXFLAGS) $<
$(OBJS)\animatedll_version.res : .AUTODEPEND ../../src/animate\..\..\..\src\msw\version.rc
@@ -293,7 +293,7 @@ $(OBJS)\animatedll_version.res : .AUTODEPEND ../../src/animate\..\..\..\src\msw
$(OBJS)\animatedll_animate.obj : .AUTODEPEND ../../src/animate\animate.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ANIMATEDLL_CXXFLAGS) $<
$(OBJS)\animatelib_dummy.obj : .AUTODEPEND ../../src/animate\..\..\..\src\msw\dummy.cpp
$(OBJS)\animatelib_dummy.obj : .AUTODEPEND ../../src/animate\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ANIMATELIB_CXXFLAGS) $<
$(OBJS)\animatelib_animate.obj : .AUTODEPEND ../../src/animate\animate.cpp

2
contrib/build/deprecated/deprecated.dsp
View File

@@ -457,7 +457,7 @@ SOURCE=../../src/deprecated\dosyacc.c
# End Source File
# Begin Source File
SOURCE=../../src/deprecated\..\..\..\src\msw\dummy.cpp
SOURCE=../../src/deprecated\..\..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File

6
contrib/build/deprecated/makefile.bcc
View File

@@ -267,7 +267,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_bcc$(VENDORTAG).dll: $(OBJS)\deprecateddll_dummy.obj $(DEPRECATEDDLL_OBJECTS) $(OBJS)\deprecateddll_version.res
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(DEPRECATEDDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\deprecateddll_version.res
c0d32.obj $(DEPRECATEDDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\deprecateddll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated $@
!endif
@@ -280,7 +280,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
|
!endif
$(OBJS)\deprecateddll_dummy.obj: ../../src/deprecated\..\..\..\src\msw\dummy.cpp
$(OBJS)\deprecateddll_dummy.obj: ../../src/deprecated\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) -H $**
$(OBJS)\deprecateddll_version.res: ../../src/deprecated\..\..\..\src\msw\version.rc
@@ -310,7 +310,7 @@ $(OBJS)\deprecateddll_wxexpr.obj: ../../src/deprecated\wxexpr.cpp
$(OBJS)\deprecateddll_dosyacc.obj: ../../src/deprecated\dosyacc.c
$(CC) -q -c -P- -o$@ $(DEPRECATEDDLL_CFLAGS) $**
$(OBJS)\deprecatedlib_dummy.obj: ../../src/deprecated\..\..\..\src\msw\dummy.cpp
$(OBJS)\deprecatedlib_dummy.obj: ../../src/deprecated\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) -H $**
$(OBJS)\deprecatedlib_prop.obj: ../../src/deprecated\prop.cpp

6
contrib/build/deprecated/makefile.gcc
View File

@@ -260,7 +260,7 @@ clean:
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_gcc$(VENDORTAG).dll: $(DEPRECATEDDLL_OBJECTS) $(OBJS)\deprecateddll_version_rc.o
$(CXX) -shared -fPIC -o $@ $(DEPRECATEDDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
$(CXX) -shared -fPIC -o $@ $(DEPRECATEDDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
endif
ifeq ($(SHARED),0)
@@ -270,7 +270,7 @@ $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(
ranlib $@
endif
$(OBJS)\deprecateddll_dummy.o: ../../src/deprecated/../../../src/msw/dummy.cpp
$(OBJS)\deprecateddll_dummy.o: ../../src/deprecated/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\deprecateddll_version_rc.o: ../../src/deprecated/../../../src/msw/version.rc
@@ -300,7 +300,7 @@ $(OBJS)\deprecateddll_wxexpr.o: ../../src/deprecated/wxexpr.cpp
$(OBJS)\deprecateddll_dosyacc.o: ../../src/deprecated/dosyacc.c
$(CC) -c -o $@ $(DEPRECATEDDLL_CFLAGS) $(CPPDEPS) $<
$(OBJS)\deprecatedlib_dummy.o: ../../src/deprecated/../../../src/msw/dummy.cpp
$(OBJS)\deprecatedlib_dummy.o: ../../src/deprecated/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\deprecatedlib_prop.o: ../../src/deprecated/prop.cpp

6
contrib/build/deprecated/makefile.vc
View File

@@ -357,7 +357,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated_vc$(VENDORTAG).dll: $(OBJS)\deprecateddll_dummy.obj $(DEPRECATEDDLL_OBJECTS) $(OBJS)\deprecateddll_version.res
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
$(DEPRECATEDDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib
$(DEPRECATEDDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib
<<
!endif
@@ -369,7 +369,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
<<
!endif
$(OBJS)\deprecateddll_dummy.obj: ../../src/deprecated\..\..\..\src\msw\dummy.cpp
$(OBJS)\deprecateddll_dummy.obj: ../../src/deprecated\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\deprecateddll_version.res: ../../src/deprecated\..\..\..\src\msw\version.rc
@@ -399,7 +399,7 @@ $(OBJS)\deprecateddll_wxexpr.obj: ../../src/deprecated\wxexpr.cpp
$(OBJS)\deprecateddll_dosyacc.obj: ../../src/deprecated\dosyacc.c
$(CC) /c /nologo /TC /Fo$@ $(DEPRECATEDDLL_CFLAGS) $**
$(OBJS)\deprecatedlib_dummy.obj: ../../src/deprecated\..\..\..\src\msw\dummy.cpp
$(OBJS)\deprecatedlib_dummy.obj: ../../src/deprecated\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\deprecatedlib_prop.obj: ../../src/deprecated\prop.cpp

6
contrib/build/deprecated/makefile.wat
View File

@@ -300,7 +300,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\deprecateddll.lbc option caseexact
@%append $(OBJS)\deprecateddll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME)
@for %i in ($(DEPRECATEDDLL_OBJECTS)) do @%append $(OBJS)\deprecateddll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\deprecateddll.lbc library %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\deprecateddll.lbc library %i
@%append $(OBJS)\deprecateddll.lbc option resource=$(OBJS)\deprecateddll_version.res
@%append $(OBJS)\deprecateddll.lbc system nt_dll
wlink @$(OBJS)\deprecateddll.lbc
@@ -314,7 +314,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
wlib -q -p4096 -n -b $^@ @$(OBJS)\deprecatedlib.lbc
!endif
$(OBJS)\deprecateddll_dummy.obj : .AUTODEPEND ../../src/deprecated\..\..\..\src\msw\dummy.cpp
$(OBJS)\deprecateddll_dummy.obj : .AUTODEPEND ../../src/deprecated\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(OBJS)\deprecateddll_version.res : .AUTODEPEND ../../src/deprecated\..\..\..\src\msw\version.rc
@@ -344,7 +344,7 @@ $(OBJS)\deprecateddll_wxexpr.obj : .AUTODEPEND ../../src/deprecated\wxexpr.cpp
$(OBJS)\deprecateddll_dosyacc.obj : .AUTODEPEND ../../src/deprecated\dosyacc.c
$(CC) -bt=nt -zq -fo=$^@ $(DEPRECATEDDLL_CFLAGS) $<
$(OBJS)\deprecatedlib_dummy.obj : .AUTODEPEND ../../src/deprecated\..\..\..\src\msw\dummy.cpp
$(OBJS)\deprecatedlib_dummy.obj : .AUTODEPEND ../../src/deprecated\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(OBJS)\deprecatedlib_prop.obj : .AUTODEPEND ../../src/deprecated\prop.cpp

2
contrib/build/fl/fl.dsp
View File

@@ -472,7 +472,7 @@ SOURCE=../../src/fl\controlbar.cpp
# End Source File
# Begin Source File
SOURCE=../../src/fl\..\..\..\src\msw\dummy.cpp
SOURCE=../../src/fl\..\..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File

6
contrib/build/fl/makefile.bcc
View File

@@ -270,7 +270,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_bcc$(VENDORTAG).dll: $(OBJS)\fldll_dummy.obj $(FLDLL_OBJECTS) $(OBJS)\fldll_version.res
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(FLDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\fldll_version.res
c0d32.obj $(FLDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\fldll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl $@
!endif
@@ -283,7 +283,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
|
!endif
$(OBJS)\fldll_dummy.obj: ../../src/fl\..\..\..\src\msw\dummy.cpp
$(OBJS)\fldll_dummy.obj: ../../src/fl\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) -H $**
$(OBJS)\fldll_version.res: ../../src/fl\..\..\..\src\msw\version.rc
@@ -340,7 +340,7 @@ $(OBJS)\fldll_toolwnd.obj: ../../src/fl\toolwnd.cpp
$(OBJS)\fldll_updatesmgr.obj: ../../src/fl\updatesmgr.cpp
$(CXX) -q -c -P -o$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fllib_dummy.obj: ../../src/fl\..\..\..\src\msw\dummy.cpp
$(OBJS)\fllib_dummy.obj: ../../src/fl\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(FLLIB_CXXFLAGS) -H $**
$(OBJS)\fllib_antiflickpl.obj: ../../src/fl\antiflickpl.cpp

6
contrib/build/fl/makefile.gcc
View File

@@ -263,7 +263,7 @@ clean:
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_gcc$(VENDORTAG).dll: $(FLDLL_OBJECTS) $(OBJS)\fldll_version_rc.o
$(CXX) -shared -fPIC -o $@ $(FLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
$(CXX) -shared -fPIC -o $@ $(FLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
endif
ifeq ($(SHARED),0)
@@ -273,7 +273,7 @@ $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(
ranlib $@
endif
$(OBJS)\fldll_dummy.o: ../../src/fl/../../../src/msw/dummy.cpp
$(OBJS)\fldll_dummy.o: ../../src/fl/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\fldll_version_rc.o: ../../src/fl/../../../src/msw/version.rc
@@ -330,7 +330,7 @@ $(OBJS)\fldll_toolwnd.o: ../../src/fl/toolwnd.cpp
$(OBJS)\fldll_updatesmgr.o: ../../src/fl/updatesmgr.cpp
$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\fllib_dummy.o: ../../src/fl/../../../src/msw/dummy.cpp
$(OBJS)\fllib_dummy.o: ../../src/fl/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\fllib_antiflickpl.o: ../../src/fl/antiflickpl.cpp

6
contrib/build/fl/makefile.vc
View File

@@ -355,7 +355,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_vc$(VENDORTAG).dll: $(OBJS)\fldll_dummy.obj $(FLDLL_OBJECTS) $(OBJS)\fldll_version.res
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
$(FLDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib
$(FLDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib
<<
!endif
@@ -367,7 +367,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
<<
!endif
$(OBJS)\fldll_dummy.obj: ../../src/fl\..\..\..\src\msw\dummy.cpp
$(OBJS)\fldll_dummy.obj: ../../src/fl\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\fldll_version.res: ../../src/fl\..\..\..\src\msw\version.rc
@@ -424,7 +424,7 @@ $(OBJS)\fldll_toolwnd.obj: ../../src/fl\toolwnd.cpp
$(OBJS)\fldll_updatesmgr.obj: ../../src/fl\updatesmgr.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLDLL_CXXFLAGS) $**
$(OBJS)\fllib_dummy.obj: ../../src/fl\..\..\..\src\msw\dummy.cpp
$(OBJS)\fllib_dummy.obj: ../../src/fl\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FLLIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\fllib_antiflickpl.obj: ../../src/fl\antiflickpl.cpp

6
contrib/build/fl/makefile.wat
View File

@@ -301,7 +301,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\fldll.lbc option caseexact
@%append $(OBJS)\fldll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME)
@for %i in ($(FLDLL_OBJECTS)) do @%append $(OBJS)\fldll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\fldll.lbc library %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\fldll.lbc library %i
@%append $(OBJS)\fldll.lbc option resource=$(OBJS)\fldll_version.res
@%append $(OBJS)\fldll.lbc system nt_dll
wlink @$(OBJS)\fldll.lbc
@@ -315,7 +315,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
wlib -q -p4096 -n -b $^@ @$(OBJS)\fllib.lbc
!endif
$(OBJS)\fldll_dummy.obj : .AUTODEPEND ../../src/fl\..\..\..\src\msw\dummy.cpp
$(OBJS)\fldll_dummy.obj : .AUTODEPEND ../../src/fl\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fldll_version.res : .AUTODEPEND ../../src/fl\..\..\..\src\msw\version.rc
@@ -372,7 +372,7 @@ $(OBJS)\fldll_toolwnd.obj : .AUTODEPEND ../../src/fl\toolwnd.cpp
$(OBJS)\fldll_updatesmgr.obj : .AUTODEPEND ../../src/fl\updatesmgr.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
$(OBJS)\fllib_dummy.obj : .AUTODEPEND ../../src/fl\..\..\..\src\msw\dummy.cpp
$(OBJS)\fllib_dummy.obj : .AUTODEPEND ../../src/fl\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
$(OBJS)\fllib_antiflickpl.obj : .AUTODEPEND ../../src/fl\antiflickpl.cpp

2
contrib/build/foldbar/foldbar.dsp
View File

@@ -456,7 +456,7 @@ SOURCE=../../src/foldbar\captionbar.cpp
# End Source File
# Begin Source File
SOURCE=../../src/foldbar\..\..\..\src\msw\dummy.cpp
SOURCE=../../src/foldbar\..\..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File

6
contrib/build/foldbar/makefile.bcc
View File

@@ -242,7 +242,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_bcc$(VENDORTAG).dll: $(OBJS)\foldbardll_dummy.obj $(FOLDBARDLL_OBJECTS) $(OBJS)\foldbardll_version.res
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(FOLDBARDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\foldbardll_version.res
c0d32.obj $(FOLDBARDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\foldbardll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar $@
!endif
@@ -255,7 +255,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
|
!endif
$(OBJS)\foldbardll_dummy.obj: ../../src/foldbar\..\..\..\src\msw\dummy.cpp
$(OBJS)\foldbardll_dummy.obj: ../../src/foldbar\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(FOLDBARDLL_CXXFLAGS) -H $**
$(OBJS)\foldbardll_version.res: ../../src/foldbar\..\..\..\src\msw\version.rc
@@ -270,7 +270,7 @@ $(OBJS)\foldbardll_foldpanelbar.obj: ../../src/foldbar\foldpanelbar.cpp
$(OBJS)\foldbardll_foldpanelitem.obj: ../../src/foldbar\foldpanelitem.cpp
$(CXX) -q -c -P -o$@ $(FOLDBARDLL_CXXFLAGS) $**
$(OBJS)\foldbarlib_dummy.obj: ../../src/foldbar\..\..\..\src\msw\dummy.cpp
$(OBJS)\foldbarlib_dummy.obj: ../../src/foldbar\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(FOLDBARLIB_CXXFLAGS) -H $**
$(OBJS)\foldbarlib_captionbar.obj: ../../src/foldbar\captionbar.cpp

6
contrib/build/foldbar/makefile.gcc
View File

@@ -236,7 +236,7 @@ clean:
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_gcc$(VENDORTAG).dll: $(FOLDBARDLL_OBJECTS) $(OBJS)\foldbardll_version_rc.o
$(CXX) -shared -fPIC -o $@ $(FOLDBARDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
$(CXX) -shared -fPIC -o $@ $(FOLDBARDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
endif
ifeq ($(SHARED),0)
@@ -246,7 +246,7 @@ $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(
ranlib $@
endif
$(OBJS)\foldbardll_dummy.o: ../../src/foldbar/../../../src/msw/dummy.cpp
$(OBJS)\foldbardll_dummy.o: ../../src/foldbar/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(FOLDBARDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\foldbardll_version_rc.o: ../../src/foldbar/../../../src/msw/version.rc
@@ -261,7 +261,7 @@ $(OBJS)\foldbardll_foldpanelbar.o: ../../src/foldbar/foldpanelbar.cpp
$(OBJS)\foldbardll_foldpanelitem.o: ../../src/foldbar/foldpanelitem.cpp
$(CXX) -c -o $@ $(FOLDBARDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\foldbarlib_dummy.o: ../../src/foldbar/../../../src/msw/dummy.cpp
$(OBJS)\foldbarlib_dummy.o: ../../src/foldbar/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(FOLDBARLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\foldbarlib_captionbar.o: ../../src/foldbar/captionbar.cpp

6
contrib/build/foldbar/makefile.vc
View File

@@ -327,7 +327,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_vc$(VENDORTAG).dll: $(OBJS)\foldbardll_dummy.obj $(FOLDBARDLL_OBJECTS) $(OBJS)\foldbardll_version.res
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
$(FOLDBARDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib
$(FOLDBARDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.lib
<<
!endif
@@ -339,7 +339,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
<<
!endif
$(OBJS)\foldbardll_dummy.obj: ../../src/foldbar\..\..\..\src\msw\dummy.cpp
$(OBJS)\foldbardll_dummy.obj: ../../src/foldbar\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FOLDBARDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\foldbardll_version.res: ../../src/foldbar\..\..\..\src\msw\version.rc
@@ -354,7 +354,7 @@ $(OBJS)\foldbardll_foldpanelbar.obj: ../../src/foldbar\foldpanelbar.cpp
$(OBJS)\foldbardll_foldpanelitem.obj: ../../src/foldbar\foldpanelitem.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FOLDBARDLL_CXXFLAGS) $**
$(OBJS)\foldbarlib_dummy.obj: ../../src/foldbar\..\..\..\src\msw\dummy.cpp
$(OBJS)\foldbarlib_dummy.obj: ../../src/foldbar\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(FOLDBARLIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\foldbarlib_captionbar.obj: ../../src/foldbar\captionbar.cpp

6
contrib/build/foldbar/makefile.wat
View File

@@ -274,7 +274,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\foldbardll.lbc option caseexact
@%append $(OBJS)\foldbardll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME)
@for %i in ($(FOLDBARDLL_OBJECTS)) do @%append $(OBJS)\foldbardll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\foldbardll.lbc library %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\foldbardll.lbc library %i
@%append $(OBJS)\foldbardll.lbc option resource=$(OBJS)\foldbardll_version.res
@%append $(OBJS)\foldbardll.lbc system nt_dll
wlink @$(OBJS)\foldbardll.lbc
@@ -288,7 +288,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
wlib -q -p4096 -n -b $^@ @$(OBJS)\foldbarlib.lbc
!endif
$(OBJS)\foldbardll_dummy.obj : .AUTODEPEND ../../src/foldbar\..\..\..\src\msw\dummy.cpp
$(OBJS)\foldbardll_dummy.obj : .AUTODEPEND ../../src/foldbar\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $<
$(OBJS)\foldbardll_version.res : .AUTODEPEND ../../src/foldbar\..\..\..\src\msw\version.rc
@@ -303,7 +303,7 @@ $(OBJS)\foldbardll_foldpanelbar.obj : .AUTODEPEND ../../src/foldbar\foldpanelba
$(OBJS)\foldbardll_foldpanelitem.obj : .AUTODEPEND ../../src/foldbar\foldpanelitem.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $<
$(OBJS)\foldbarlib_dummy.obj : .AUTODEPEND ../../src/foldbar\..\..\..\src\msw\dummy.cpp
$(OBJS)\foldbarlib_dummy.obj : .AUTODEPEND ../../src/foldbar\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $<
$(OBJS)\foldbarlib_captionbar.obj : .AUTODEPEND ../../src/foldbar\captionbar.cpp

2
contrib/build/gizmos/gizmos_gizmos.dsp
View File

@@ -452,7 +452,7 @@ LIB32=link.exe -lib
# PROP Default_Filter ""
# Begin Source File
SOURCE=../../src/gizmos\..\..\..\src\msw\dummy.cpp
SOURCE=../../src/gizmos\..\..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File

2
contrib/build/gizmos/gizmos_gizmos_xrc.dsp
View File

@@ -452,7 +452,7 @@ LIB32=link.exe -lib
# PROP Default_Filter ""
# Begin Source File
SOURCE=../../src/gizmos\..\..\..\src\msw\dummy.cpp
SOURCE=../../src/gizmos\..\..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File

12
contrib/build/gizmos/makefile.bcc
View File

@@ -292,7 +292,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_bcc$(VENDORTAG).dll: $(OBJS)\gizmosdll_dummy.obj $(GIZMOSDLL_OBJECTS) $(OBJS)\gizmosdll_version.res
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(GIZMOSDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,, $(OBJS)\gizmosdll_version.res
c0d32.obj $(GIZMOSDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,, $(OBJS)\gizmosdll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos $@
!endif
@@ -300,7 +300,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
!if "$(SHARED)" == "1" && "$(USE_XRC)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_bcc$(VENDORTAG).dll: $(OBJS)\gizmos_xrcdll_dummy.obj $(GIZMOS_XRCDLL_OBJECTS) $(OBJS)\gizmos_xrcdll_version.res $(__gizmosdll___depname)
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(GIZMOS_XRCDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,, $(OBJS)\gizmos_xrcdll_version.res
c0d32.obj $(GIZMOS_XRCDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,, $(OBJS)\gizmos_xrcdll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc $@
!endif
@@ -321,7 +321,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
|
!endif
$(OBJS)\gizmosdll_dummy.obj: ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(OBJS)\gizmosdll_dummy.obj: ../../src/gizmos\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(GIZMOSDLL_CXXFLAGS) -H $**
$(OBJS)\gizmosdll_version.res: ../../src/gizmos\..\..\..\src\msw\version.rc
@@ -345,7 +345,7 @@ $(OBJS)\gizmosdll_splittree.obj: ../../src/gizmos\splittree.cpp
$(OBJS)\gizmosdll_statpict.obj: ../../src/gizmos\statpict.cpp
$(CXX) -q -c -P -o$@ $(GIZMOSDLL_CXXFLAGS) $**
$(OBJS)\gizmos_xrcdll_dummy.obj: ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(OBJS)\gizmos_xrcdll_dummy.obj: ../../src/gizmos\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(GIZMOS_XRCDLL_CXXFLAGS) -H $**
$(OBJS)\gizmos_xrcdll_version.res: ../../src/gizmos\..\..\..\src\msw\version.rc
@@ -354,7 +354,7 @@ $(OBJS)\gizmos_xrcdll_version.res: ../../src/gizmos\..\..\..\src\msw\version.rc
$(OBJS)\gizmos_xrcdll_xh_statpict.obj: ../../src/gizmos\xh_statpict.cpp
$(CXX) -q -c -P -o$@ $(GIZMOS_XRCDLL_CXXFLAGS) $**
$(OBJS)\gizmoslib_dummy.obj: ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(OBJS)\gizmoslib_dummy.obj: ../../src/gizmos\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(GIZMOSLIB_CXXFLAGS) -H $**
$(OBJS)\gizmoslib_dynamicsash.obj: ../../src/gizmos\dynamicsash.cpp
@@ -375,7 +375,7 @@ $(OBJS)\gizmoslib_splittree.obj: ../../src/gizmos\splittree.cpp
$(OBJS)\gizmoslib_statpict.obj: ../../src/gizmos\statpict.cpp
$(CXX) -q -c -P -o$@ $(GIZMOSLIB_CXXFLAGS) $**
$(OBJS)\gizmos_xrclib_dummy.obj: ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(OBJS)\gizmos_xrclib_dummy.obj: ../../src/gizmos\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(GIZMOS_XRCLIB_CXXFLAGS) -H $**
$(OBJS)\gizmos_xrclib_xh_statpict.obj: ../../src/gizmos\xh_statpict.cpp

12
contrib/build/gizmos/makefile.gcc
View File

@@ -287,13 +287,13 @@ clean:
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_gcc$(VENDORTAG).dll: $(GIZMOSDLL_OBJECTS) $(OBJS)\gizmosdll_version_rc.o
$(CXX) -shared -fPIC -o $@ $(GIZMOSDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
$(CXX) -shared -fPIC -o $@ $(GIZMOSDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
endif
ifeq ($(SHARED),1)
ifeq ($(USE_XRC),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_gcc$(VENDORTAG).dll: $(GIZMOS_XRCDLL_OBJECTS) $(OBJS)\gizmos_xrcdll_version_rc.o $(__gizmosdll___depname)
$(CXX) -shared -fPIC -o $@ $(GIZMOS_XRCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
$(CXX) -shared -fPIC -o $@ $(GIZMOS_XRCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
endif
endif
@@ -313,7 +313,7 @@ $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(
endif
endif
$(OBJS)\gizmosdll_dummy.o: ../../src/gizmos/../../../src/msw/dummy.cpp
$(OBJS)\gizmosdll_dummy.o: ../../src/gizmos/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\gizmosdll_version_rc.o: ../../src/gizmos/../../../src/msw/version.rc
@@ -337,7 +337,7 @@ $(OBJS)\gizmosdll_splittree.o: ../../src/gizmos/splittree.cpp
$(OBJS)\gizmosdll_statpict.o: ../../src/gizmos/statpict.cpp
$(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\gizmos_xrcdll_dummy.o: ../../src/gizmos/../../../src/msw/dummy.cpp
$(OBJS)\gizmos_xrcdll_dummy.o: ../../src/gizmos/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(GIZMOS_XRCDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\gizmos_xrcdll_version_rc.o: ../../src/gizmos/../../../src/msw/version.rc
@@ -346,7 +346,7 @@ $(OBJS)\gizmos_xrcdll_version_rc.o: ../../src/gizmos/../../../src/msw/version.rc
$(OBJS)\gizmos_xrcdll_xh_statpict.o: ../../src/gizmos/xh_statpict.cpp
$(CXX) -c -o $@ $(GIZMOS_XRCDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\gizmoslib_dummy.o: ../../src/gizmos/../../../src/msw/dummy.cpp
$(OBJS)\gizmoslib_dummy.o: ../../src/gizmos/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\gizmoslib_dynamicsash.o: ../../src/gizmos/dynamicsash.cpp
@@ -367,7 +367,7 @@ $(OBJS)\gizmoslib_splittree.o: ../../src/gizmos/splittree.cpp
$(OBJS)\gizmoslib_statpict.o: ../../src/gizmos/statpict.cpp
$(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\gizmos_xrclib_dummy.o: ../../src/gizmos/../../../src/msw/dummy.cpp
$(OBJS)\gizmos_xrclib_dummy.o: ../../src/gizmos/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(GIZMOS_XRCLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\gizmos_xrclib_xh_statpict.o: ../../src/gizmos/xh_statpict.cpp

12
contrib/build/gizmos/makefile.vc
View File

@@ -393,14 +393,14 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_vc$(VENDORTAG).dll: $(OBJS)\gizmosdll_dummy.obj $(GIZMOSDLL_OBJECTS) $(OBJS)\gizmosdll_version.res
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
$(GIZMOSDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib
$(GIZMOSDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib
<<
!endif
!if "$(SHARED)" == "1" && "$(USE_XRC)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_vc$(VENDORTAG).dll: $(OBJS)\gizmos_xrcdll_dummy.obj $(GIZMOS_XRCDLL_OBJECTS) $(OBJS)\gizmos_xrcdll_version.res $(__gizmosdll___depname)
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
$(GIZMOS_XRCDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib
$(GIZMOS_XRCDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.lib
<<
!endif
@@ -420,7 +420,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
<<
!endif
$(OBJS)\gizmosdll_dummy.obj: ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(OBJS)\gizmosdll_dummy.obj: ../../src/gizmos\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\gizmosdll_version.res: ../../src/gizmos\..\..\..\src\msw\version.rc
@@ -444,7 +444,7 @@ $(OBJS)\gizmosdll_splittree.obj: ../../src/gizmos\splittree.cpp
$(OBJS)\gizmosdll_statpict.obj: ../../src/gizmos\statpict.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSDLL_CXXFLAGS) $**
$(OBJS)\gizmos_xrcdll_dummy.obj: ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(OBJS)\gizmos_xrcdll_dummy.obj: ../../src/gizmos\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOS_XRCDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\gizmos_xrcdll_version.res: ../../src/gizmos\..\..\..\src\msw\version.rc
@@ -453,7 +453,7 @@ $(OBJS)\gizmos_xrcdll_version.res: ../../src/gizmos\..\..\..\src\msw\version.rc
$(OBJS)\gizmos_xrcdll_xh_statpict.obj: ../../src/gizmos\xh_statpict.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOS_XRCDLL_CXXFLAGS) $**
$(OBJS)\gizmoslib_dummy.obj: ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(OBJS)\gizmoslib_dummy.obj: ../../src/gizmos\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSLIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\gizmoslib_dynamicsash.obj: ../../src/gizmos\dynamicsash.cpp
@@ -474,7 +474,7 @@ $(OBJS)\gizmoslib_splittree.obj: ../../src/gizmos\splittree.cpp
$(OBJS)\gizmoslib_statpict.obj: ../../src/gizmos\statpict.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOSLIB_CXXFLAGS) $**
$(OBJS)\gizmos_xrclib_dummy.obj: ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(OBJS)\gizmos_xrclib_dummy.obj: ../../src/gizmos\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GIZMOS_XRCLIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\gizmos_xrclib_xh_statpict.obj: ../../src/gizmos\xh_statpict.cpp

12
contrib/build/gizmos/makefile.wat
View File

@@ -327,7 +327,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\gizmosdll.lbc option caseexact
@%append $(OBJS)\gizmosdll.lbc $(LDFLAGS) $(__DEBUGINFO) libpath $(LIBDIRNAME)
@for %i in ($(GIZMOSDLL_OBJECTS)) do @%append $(OBJS)\gizmosdll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\gizmosdll.lbc library %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\gizmosdll.lbc library %i
@%append $(OBJS)\gizmosdll.lbc option resource=$(OBJS)\gizmosdll_version.res
@%append $(OBJS)\gizmosdll.lbc system nt_dll
wlink @$(OBJS)\gizmosdll.lbc
@@ -343,7 +343,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\gizmos_xrcdll.lbc option caseexact
@%append $(OBJS)\gizmos_xrcdll.lbc $(LDFLAGS) $(__DEBUGINFO) libpath $(LIBDIRNAME)
@for %i in ($(GIZMOS_XRCDLL_OBJECTS)) do @%append $(OBJS)\gizmos_xrcdll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\gizmos_xrcdll.lbc library %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.lib $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\gizmos_xrcdll.lbc library %i
@%append $(OBJS)\gizmos_xrcdll.lbc option resource=$(OBJS)\gizmos_xrcdll_version.res
@%append $(OBJS)\gizmos_xrcdll.lbc system nt_dll
wlink @$(OBJS)\gizmos_xrcdll.lbc
@@ -367,7 +367,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
!endif
!endif
$(OBJS)\gizmosdll_dummy.obj : .AUTODEPEND ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(OBJS)\gizmosdll_dummy.obj : .AUTODEPEND ../../src/gizmos\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
$(OBJS)\gizmosdll_version.res : .AUTODEPEND ../../src/gizmos\..\..\..\src\msw\version.rc
@@ -391,7 +391,7 @@ $(OBJS)\gizmosdll_splittree.obj : .AUTODEPEND ../../src/gizmos\splittree.cpp
$(OBJS)\gizmosdll_statpict.obj : .AUTODEPEND ../../src/gizmos\statpict.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSDLL_CXXFLAGS) $<
$(OBJS)\gizmos_xrcdll_dummy.obj : .AUTODEPEND ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(OBJS)\gizmos_xrcdll_dummy.obj : .AUTODEPEND ../../src/gizmos\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOS_XRCDLL_CXXFLAGS) $<
$(OBJS)\gizmos_xrcdll_version.res : .AUTODEPEND ../../src/gizmos\..\..\..\src\msw\version.rc
@@ -400,7 +400,7 @@ $(OBJS)\gizmos_xrcdll_version.res : .AUTODEPEND ../../src/gizmos\..\..\..\src\m
$(OBJS)\gizmos_xrcdll_xh_statpict.obj : .AUTODEPEND ../../src/gizmos\xh_statpict.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOS_XRCDLL_CXXFLAGS) $<
$(OBJS)\gizmoslib_dummy.obj : .AUTODEPEND ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(OBJS)\gizmoslib_dummy.obj : .AUTODEPEND ../../src/gizmos\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
$(OBJS)\gizmoslib_dynamicsash.obj : .AUTODEPEND ../../src/gizmos\dynamicsash.cpp
@@ -421,7 +421,7 @@ $(OBJS)\gizmoslib_splittree.obj : .AUTODEPEND ../../src/gizmos\splittree.cpp
$(OBJS)\gizmoslib_statpict.obj : .AUTODEPEND ../../src/gizmos\statpict.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOSLIB_CXXFLAGS) $<
$(OBJS)\gizmos_xrclib_dummy.obj : .AUTODEPEND ../../src/gizmos\..\..\..\src\msw\dummy.cpp
$(OBJS)\gizmos_xrclib_dummy.obj : .AUTODEPEND ../../src/gizmos\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(GIZMOS_XRCLIB_CXXFLAGS) $<
$(OBJS)\gizmos_xrclib_xh_statpict.obj : .AUTODEPEND ../../src/gizmos\xh_statpict.cpp

6
contrib/build/mmedia/makefile.bcc
View File

@@ -276,7 +276,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_bcc$(VENDORTAG).dll: $(OBJS)\mmediadll_dummy.obj $(MMEDIADLL_OBJECTS) $(OBJS)\mmediadll_version.res
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(MMEDIADLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\mmediadll_version.res
c0d32.obj $(MMEDIADLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\mmediadll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia $@
!endif
@@ -289,7 +289,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
|
!endif
$(OBJS)\mmediadll_dummy.obj: ../../src/mmedia\..\..\..\src\msw\dummy.cpp
$(OBJS)\mmediadll_dummy.obj: ../../src/mmedia\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) -H $**
$(OBJS)\mmediadll_version.res: ../../src/mmedia\..\..\..\src\msw\version.rc
@@ -355,7 +355,7 @@ $(OBJS)\mmediadll_sndwav.obj: ../../src/mmedia\sndwav.cpp
$(OBJS)\mmediadll_vidbase.obj: ../../src/mmedia\vidbase.cpp
$(CXX) -q -c -P -o$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmedialib_dummy.obj: ../../src/mmedia\..\..\..\src\msw\dummy.cpp
$(OBJS)\mmedialib_dummy.obj: ../../src/mmedia\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(MMEDIALIB_CXXFLAGS) -H $**
$(OBJS)\mmedialib_cdwin.obj: ../../src/mmedia\cdwin.cpp

6
contrib/build/mmedia/makefile.gcc
View File

@@ -270,7 +270,7 @@ clean:
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_gcc$(VENDORTAG).dll: $(MMEDIADLL_OBJECTS) $(OBJS)\mmediadll_version_rc.o
$(CXX) -shared -fPIC -o $@ $(MMEDIADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
$(CXX) -shared -fPIC -o $@ $(MMEDIADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
endif
ifeq ($(SHARED),0)
@@ -280,7 +280,7 @@ $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(
ranlib $@
endif
$(OBJS)\mmediadll_dummy.o: ../../src/mmedia/../../../src/msw/dummy.cpp
$(OBJS)\mmediadll_dummy.o: ../../src/mmedia/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\mmediadll_version_rc.o: ../../src/mmedia/../../../src/msw/version.rc
@@ -346,7 +346,7 @@ $(OBJS)\mmediadll_sndwav.o: ../../src/mmedia/sndwav.cpp
$(OBJS)\mmediadll_vidbase.o: ../../src/mmedia/vidbase.cpp
$(CXX) -c -o $@ $(MMEDIADLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\mmedialib_dummy.o: ../../src/mmedia/../../../src/msw/dummy.cpp
$(OBJS)\mmedialib_dummy.o: ../../src/mmedia/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(MMEDIALIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\mmedialib_cdwin.o: ../../src/mmedia/cdwin.cpp

6
contrib/build/mmedia/makefile.vc
View File

@@ -361,7 +361,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia_vc$(VENDORTAG).dll: $(OBJS)\mmediadll_dummy.obj $(MMEDIADLL_OBJECTS) $(OBJS)\mmediadll_version.res
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
$(MMEDIADLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib
$(MMEDIADLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia.lib
<<
!endif
@@ -373,7 +373,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
<<
!endif
$(OBJS)\mmediadll_dummy.obj: ../../src/mmedia\..\..\..\src\msw\dummy.cpp
$(OBJS)\mmediadll_dummy.obj: ../../src/mmedia\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\mmediadll_version.res: ../../src/mmedia\..\..\..\src\msw\version.rc
@@ -439,7 +439,7 @@ $(OBJS)\mmediadll_sndwav.obj: ../../src/mmedia\sndwav.cpp
$(OBJS)\mmediadll_vidbase.obj: ../../src/mmedia\vidbase.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIADLL_CXXFLAGS) $**
$(OBJS)\mmedialib_dummy.obj: ../../src/mmedia\..\..\..\src\msw\dummy.cpp
$(OBJS)\mmedialib_dummy.obj: ../../src/mmedia\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEDIALIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\mmedialib_cdwin.obj: ../../src/mmedia\cdwin.cpp

6
contrib/build/mmedia/makefile.wat
View File

@@ -307,7 +307,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\mmediadll.lbc option caseexact
@%append $(OBJS)\mmediadll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME)
@for %i in ($(MMEDIADLL_OBJECTS)) do @%append $(OBJS)\mmediadll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\mmediadll.lbc library %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\mmediadll.lbc library %i
@%append $(OBJS)\mmediadll.lbc option resource=$(OBJS)\mmediadll_version.res
@%append $(OBJS)\mmediadll.lbc system nt_dll
wlink @$(OBJS)\mmediadll.lbc
@@ -321,7 +321,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
wlib -q -p4096 -n -b $^@ @$(OBJS)\mmedialib.lbc
!endif
$(OBJS)\mmediadll_dummy.obj : .AUTODEPEND ../../src/mmedia\..\..\..\src\msw\dummy.cpp
$(OBJS)\mmediadll_dummy.obj : .AUTODEPEND ../../src/mmedia\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmediadll_version.res : .AUTODEPEND ../../src/mmedia\..\..\..\src\msw\version.rc
@@ -387,7 +387,7 @@ $(OBJS)\mmediadll_sndwav.obj : .AUTODEPEND ../../src/mmedia\sndwav.cpp
$(OBJS)\mmediadll_vidbase.obj : .AUTODEPEND ../../src/mmedia\vidbase.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIADLL_CXXFLAGS) $<
$(OBJS)\mmedialib_dummy.obj : .AUTODEPEND ../../src/mmedia\..\..\..\src\msw\dummy.cpp
$(OBJS)\mmedialib_dummy.obj : .AUTODEPEND ../../src/mmedia\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MMEDIALIB_CXXFLAGS) $<
$(OBJS)\mmedialib_cdwin.obj : .AUTODEPEND ../../src/mmedia\cdwin.cpp

2
contrib/build/mmedia/mmedia.dsp
View File

@@ -460,7 +460,7 @@ SOURCE=../../src/mmedia\cdwin.cpp
# End Source File
# Begin Source File
SOURCE=../../src/mmedia\..\..\..\src\msw\dummy.cpp
SOURCE=../../src/mmedia\..\..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File

6
contrib/build/net/makefile.bcc
View File

@@ -242,7 +242,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_bcc$(VENDORTAG).dll: $(OBJS)\netutilsdll_dummy.obj $(NETUTILSDLL_OBJECTS) $(OBJS)\netutilsdll_version.res
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(NETUTILSDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\netutilsdll_version.res
c0d32.obj $(NETUTILSDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\netutilsdll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils $@
!endif
@@ -255,7 +255,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
|
!endif
$(OBJS)\netutilsdll_dummy.obj: ../../src/net\..\..\..\src\msw\dummy.cpp
$(OBJS)\netutilsdll_dummy.obj: ../../src/net\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(NETUTILSDLL_CXXFLAGS) -H $**
$(OBJS)\netutilsdll_version.res: ../../src/net\..\..\..\src\msw\version.rc
@@ -270,7 +270,7 @@ $(OBJS)\netutilsdll_smapi.obj: ../../src/net\smapi.cpp
$(OBJS)\netutilsdll_web.obj: ../../src/net\web.cpp
$(CXX) -q -c -P -o$@ $(NETUTILSDLL_CXXFLAGS) $**
$(OBJS)\netutilslib_dummy.obj: ../../src/net\..\..\..\src\msw\dummy.cpp
$(OBJS)\netutilslib_dummy.obj: ../../src/net\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(NETUTILSLIB_CXXFLAGS) -H $**
$(OBJS)\netutilslib_email.obj: ../../src/net\email.cpp

6
contrib/build/net/makefile.gcc
View File

@@ -236,7 +236,7 @@ clean:
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_gcc$(VENDORTAG).dll: $(NETUTILSDLL_OBJECTS) $(OBJS)\netutilsdll_version_rc.o
$(CXX) -shared -fPIC -o $@ $(NETUTILSDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
$(CXX) -shared -fPIC -o $@ $(NETUTILSDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
endif
ifeq ($(SHARED),0)
@@ -246,7 +246,7 @@ $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(
ranlib $@
endif
$(OBJS)\netutilsdll_dummy.o: ../../src/net/../../../src/msw/dummy.cpp
$(OBJS)\netutilsdll_dummy.o: ../../src/net/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\netutilsdll_version_rc.o: ../../src/net/../../../src/msw/version.rc
@@ -261,7 +261,7 @@ $(OBJS)\netutilsdll_smapi.o: ../../src/net/smapi.cpp
$(OBJS)\netutilsdll_web.o: ../../src/net/web.cpp
$(CXX) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\netutilslib_dummy.o: ../../src/net/../../../src/msw/dummy.cpp
$(OBJS)\netutilslib_dummy.o: ../../src/net/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(NETUTILSLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\netutilslib_email.o: ../../src/net/email.cpp

6
contrib/build/net/makefile.vc
View File

@@ -328,7 +328,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_vc$(VENDORTAG).dll: $(OBJS)\netutilsdll_dummy.obj $(NETUTILSDLL_OBJECTS) $(OBJS)\netutilsdll_version.res
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
$(NETUTILSDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib
$(NETUTILSDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib
<<
!endif
@@ -340,7 +340,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
<<
!endif
$(OBJS)\netutilsdll_dummy.obj: ../../src/net\..\..\..\src\msw\dummy.cpp
$(OBJS)\netutilsdll_dummy.obj: ../../src/net\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(NETUTILSDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\netutilsdll_version.res: ../../src/net\..\..\..\src\msw\version.rc
@@ -355,7 +355,7 @@ $(OBJS)\netutilsdll_smapi.obj: ../../src/net\smapi.cpp
$(OBJS)\netutilsdll_web.obj: ../../src/net\web.cpp
$(CXX) /c /nologo /TP /Fo$@ $(NETUTILSDLL_CXXFLAGS) $**
$(OBJS)\netutilslib_dummy.obj: ../../src/net\..\..\..\src\msw\dummy.cpp
$(OBJS)\netutilslib_dummy.obj: ../../src/net\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(NETUTILSLIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\netutilslib_email.obj: ../../src/net\email.cpp

6
contrib/build/net/makefile.wat
View File

@@ -273,7 +273,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\netutilsdll.lbc option caseexact
@%append $(OBJS)\netutilsdll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME)
@for %i in ($(NETUTILSDLL_OBJECTS)) do @%append $(OBJS)\netutilsdll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\netutilsdll.lbc library %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\netutilsdll.lbc library %i
@%append $(OBJS)\netutilsdll.lbc option resource=$(OBJS)\netutilsdll_version.res
@%append $(OBJS)\netutilsdll.lbc system nt_dll
wlink @$(OBJS)\netutilsdll.lbc
@@ -287,7 +287,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
wlib -q -p4096 -n -b $^@ @$(OBJS)\netutilslib.lbc
!endif
$(OBJS)\netutilsdll_dummy.obj : .AUTODEPEND ../../src/net\..\..\..\src\msw\dummy.cpp
$(OBJS)\netutilsdll_dummy.obj : .AUTODEPEND ../../src/net\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $<
$(OBJS)\netutilsdll_version.res : .AUTODEPEND ../../src/net\..\..\..\src\msw\version.rc
@@ -302,7 +302,7 @@ $(OBJS)\netutilsdll_smapi.obj : .AUTODEPEND ../../src/net\smapi.cpp
$(OBJS)\netutilsdll_web.obj : .AUTODEPEND ../../src/net\web.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSDLL_CXXFLAGS) $<
$(OBJS)\netutilslib_dummy.obj : .AUTODEPEND ../../src/net\..\..\..\src\msw\dummy.cpp
$(OBJS)\netutilslib_dummy.obj : .AUTODEPEND ../../src/net\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $<
$(OBJS)\netutilslib_email.obj : .AUTODEPEND ../../src/net\email.cpp

2
contrib/build/net/net.dsp
View File

@@ -452,7 +452,7 @@ LIB32=link.exe -lib
# PROP Default_Filter ""
# Begin Source File
SOURCE=../../src/net\..\..\..\src\msw\dummy.cpp
SOURCE=../../src/net\..\..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File

6
contrib/build/ogl/makefile.bcc
View File

@@ -260,7 +260,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_bcc$(VENDORTAG).dll: $(OBJS)\ogldll_dummy.obj $(OGLDLL_OBJECTS) $(OBJS)\ogldll_version.res
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(OGLDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\ogldll_version.res
c0d32.obj $(OGLDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\ogldll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl $@
!endif
@@ -273,7 +273,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
|
!endif
$(OBJS)\ogldll_dummy.obj: ../../src/ogl\..\..\..\src\msw\dummy.cpp
$(OBJS)\ogldll_dummy.obj: ../../src/ogl\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) -H $**
$(OBJS)\ogldll_version.res: ../../src/ogl\..\..\..\src\msw\version.rc
@@ -315,7 +315,7 @@ $(OBJS)\ogldll_lines.obj: ../../src/ogl\lines.cpp
$(OBJS)\ogldll_ogldiag.obj: ../../src/ogl\ogldiag.cpp
$(CXX) -q -c -P -o$@ $(OGLDLL_CXXFLAGS) $**
$(OBJS)\ogllib_dummy.obj: ../../src/ogl\..\..\..\src\msw\dummy.cpp
$(OBJS)\ogllib_dummy.obj: ../../src/ogl\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(OGLLIB_CXXFLAGS) -H $**
$(OBJS)\ogllib_basic2.obj: ../../src/ogl\basic2.cpp

6
contrib/build/ogl/makefile.gcc
View File

@@ -253,7 +253,7 @@ clean:
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_gcc$(VENDORTAG).dll: $(OGLDLL_OBJECTS) $(OBJS)\ogldll_version_rc.o
$(CXX) -shared -fPIC -o $@ $(OGLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
$(CXX) -shared -fPIC -o $@ $(OGLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
endif
ifeq ($(SHARED),0)
@@ -263,7 +263,7 @@ $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(
ranlib $@
endif
$(OBJS)\ogldll_dummy.o: ../../src/ogl/../../../src/msw/dummy.cpp
$(OBJS)\ogldll_dummy.o: ../../src/ogl/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\ogldll_version_rc.o: ../../src/ogl/../../../src/msw/version.rc
@@ -305,7 +305,7 @@ $(OBJS)\ogldll_lines.o: ../../src/ogl/lines.cpp
$(OBJS)\ogldll_ogldiag.o: ../../src/ogl/ogldiag.cpp
$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\ogllib_dummy.o: ../../src/ogl/../../../src/msw/dummy.cpp
$(OBJS)\ogllib_dummy.o: ../../src/ogl/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\ogllib_basic2.o: ../../src/ogl/basic2.cpp

6
contrib/build/ogl/makefile.vc
View File

@@ -345,7 +345,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_vc$(VENDORTAG).dll: $(OBJS)\ogldll_dummy.obj $(OGLDLL_OBJECTS) $(OBJS)\ogldll_version.res
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
$(OGLDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib
$(OGLDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.lib
<<
!endif
@@ -357,7 +357,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
<<
!endif
$(OBJS)\ogldll_dummy.obj: ../../src/ogl\..\..\..\src\msw\dummy.cpp
$(OBJS)\ogldll_dummy.obj: ../../src/ogl\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\ogldll_version.res: ../../src/ogl\..\..\..\src\msw\version.rc
@@ -399,7 +399,7 @@ $(OBJS)\ogldll_lines.obj: ../../src/ogl\lines.cpp
$(OBJS)\ogldll_ogldiag.obj: ../../src/ogl\ogldiag.cpp
$(CXX) /c /nologo /TP /Fo$@ $(OGLDLL_CXXFLAGS) $**
$(OBJS)\ogllib_dummy.obj: ../../src/ogl\..\..\..\src\msw\dummy.cpp
$(OBJS)\ogllib_dummy.obj: ../../src/ogl\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(OGLLIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\ogllib_basic2.obj: ../../src/ogl\basic2.cpp

6
contrib/build/ogl/makefile.wat
View File

@@ -291,7 +291,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\ogldll.lbc option caseexact
@%append $(OBJS)\ogldll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME)
@for %i in ($(OGLDLL_OBJECTS)) do @%append $(OBJS)\ogldll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\ogldll.lbc library %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\ogldll.lbc library %i
@%append $(OBJS)\ogldll.lbc option resource=$(OBJS)\ogldll_version.res
@%append $(OBJS)\ogldll.lbc system nt_dll
wlink @$(OBJS)\ogldll.lbc
@@ -305,7 +305,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
wlib -q -p4096 -n -b $^@ @$(OBJS)\ogllib.lbc
!endif
$(OBJS)\ogldll_dummy.obj : .AUTODEPEND ../../src/ogl\..\..\..\src\msw\dummy.cpp
$(OBJS)\ogldll_dummy.obj : .AUTODEPEND ../../src/ogl\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogldll_version.res : .AUTODEPEND ../../src/ogl\..\..\..\src\msw\version.rc
@@ -347,7 +347,7 @@ $(OBJS)\ogldll_lines.obj : .AUTODEPEND ../../src/ogl\lines.cpp
$(OBJS)\ogldll_ogldiag.obj : .AUTODEPEND ../../src/ogl\ogldiag.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
$(OBJS)\ogllib_dummy.obj : .AUTODEPEND ../../src/ogl\..\..\..\src\msw\dummy.cpp
$(OBJS)\ogllib_dummy.obj : .AUTODEPEND ../../src/ogl\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
$(OBJS)\ogllib_basic2.obj : .AUTODEPEND ../../src/ogl\basic2.cpp

2
contrib/build/ogl/ogl.dsp
View File

@@ -484,7 +484,7 @@ SOURCE=../../src/ogl\drawn.cpp
# End Source File
# Begin Source File
SOURCE=../../src/ogl\..\..\..\src\msw\dummy.cpp
SOURCE=../../src/ogl\..\..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File

6
contrib/build/plot/makefile.bcc
View File

@@ -238,7 +238,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_bcc$(VENDORTAG).dll: $(OBJS)\plotdll_dummy.obj $(PLOTDLL_OBJECTS) $(OBJS)\plotdll_version.res
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(PLOTDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\plotdll_version.res
c0d32.obj $(PLOTDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\plotdll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot $@
!endif
@@ -251,7 +251,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
|
!endif
$(OBJS)\plotdll_dummy.obj: ../../src/plot\..\..\..\src\msw\dummy.cpp
$(OBJS)\plotdll_dummy.obj: ../../src/plot\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(PLOTDLL_CXXFLAGS) -H $**
$(OBJS)\plotdll_version.res: ../../src/plot\..\..\..\src\msw\version.rc
@@ -260,7 +260,7 @@ $(OBJS)\plotdll_version.res: ../../src/plot\..\..\..\src\msw\version.rc
$(OBJS)\plotdll_plot.obj: ../../src/plot\plot.cpp
$(CXX) -q -c -P -o$@ $(PLOTDLL_CXXFLAGS) $**
$(OBJS)\plotlib_dummy.obj: ../../src/plot\..\..\..\src\msw\dummy.cpp
$(OBJS)\plotlib_dummy.obj: ../../src/plot\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(PLOTLIB_CXXFLAGS) -H $**
$(OBJS)\plotlib_plot.obj: ../../src/plot\plot.cpp

6
contrib/build/plot/makefile.gcc
View File

@@ -232,7 +232,7 @@ clean:
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_gcc$(VENDORTAG).dll: $(PLOTDLL_OBJECTS) $(OBJS)\plotdll_version_rc.o
$(CXX) -shared -fPIC -o $@ $(PLOTDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
$(CXX) -shared -fPIC -o $@ $(PLOTDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
endif
ifeq ($(SHARED),0)
@@ -242,7 +242,7 @@ $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(
ranlib $@
endif
$(OBJS)\plotdll_dummy.o: ../../src/plot/../../../src/msw/dummy.cpp
$(OBJS)\plotdll_dummy.o: ../../src/plot/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(PLOTDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\plotdll_version_rc.o: ../../src/plot/../../../src/msw/version.rc
@@ -251,7 +251,7 @@ $(OBJS)\plotdll_version_rc.o: ../../src/plot/../../../src/msw/version.rc
$(OBJS)\plotdll_plot.o: ../../src/plot/plot.cpp
$(CXX) -c -o $@ $(PLOTDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\plotlib_dummy.o: ../../src/plot/../../../src/msw/dummy.cpp
$(OBJS)\plotlib_dummy.o: ../../src/plot/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(PLOTLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\plotlib_plot.o: ../../src/plot/plot.cpp

6
contrib/build/plot/makefile.vc
View File

@@ -323,7 +323,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_vc$(VENDORTAG).dll: $(OBJS)\plotdll_dummy.obj $(PLOTDLL_OBJECTS) $(OBJS)\plotdll_version.res
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
$(PLOTDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib
$(PLOTDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib
<<
!endif
@@ -335,7 +335,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
<<
!endif
$(OBJS)\plotdll_dummy.obj: ../../src/plot\..\..\..\src\msw\dummy.cpp
$(OBJS)\plotdll_dummy.obj: ../../src/plot\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(PLOTDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\plotdll_version.res: ../../src/plot\..\..\..\src\msw\version.rc
@@ -344,7 +344,7 @@ $(OBJS)\plotdll_version.res: ../../src/plot\..\..\..\src\msw\version.rc
$(OBJS)\plotdll_plot.obj: ../../src/plot\plot.cpp
$(CXX) /c /nologo /TP /Fo$@ $(PLOTDLL_CXXFLAGS) $**
$(OBJS)\plotlib_dummy.obj: ../../src/plot\..\..\..\src\msw\dummy.cpp
$(OBJS)\plotlib_dummy.obj: ../../src/plot\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(PLOTLIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\plotlib_plot.obj: ../../src/plot\plot.cpp

6
contrib/build/plot/makefile.wat
View File

@@ -269,7 +269,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\plotdll.lbc option caseexact
@%append $(OBJS)\plotdll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME)
@for %i in ($(PLOTDLL_OBJECTS)) do @%append $(OBJS)\plotdll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\plotdll.lbc library %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\plotdll.lbc library %i
@%append $(OBJS)\plotdll.lbc option resource=$(OBJS)\plotdll_version.res
@%append $(OBJS)\plotdll.lbc system nt_dll
wlink @$(OBJS)\plotdll.lbc
@@ -283,7 +283,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
wlib -q -p4096 -n -b $^@ @$(OBJS)\plotlib.lbc
!endif
$(OBJS)\plotdll_dummy.obj : .AUTODEPEND ../../src/plot\..\..\..\src\msw\dummy.cpp
$(OBJS)\plotdll_dummy.obj : .AUTODEPEND ../../src/plot\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(PLOTDLL_CXXFLAGS) $<
$(OBJS)\plotdll_version.res : .AUTODEPEND ../../src/plot\..\..\..\src\msw\version.rc
@@ -292,7 +292,7 @@ $(OBJS)\plotdll_version.res : .AUTODEPEND ../../src/plot\..\..\..\src\msw\versi
$(OBJS)\plotdll_plot.obj : .AUTODEPEND ../../src/plot\plot.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(PLOTDLL_CXXFLAGS) $<
$(OBJS)\plotlib_dummy.obj : .AUTODEPEND ../../src/plot\..\..\..\src\msw\dummy.cpp
$(OBJS)\plotlib_dummy.obj : .AUTODEPEND ../../src/plot\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(PLOTLIB_CXXFLAGS) $<
$(OBJS)\plotlib_plot.obj : .AUTODEPEND ../../src/plot\plot.cpp

2
contrib/build/plot/plot.dsp
View File

@@ -452,7 +452,7 @@ LIB32=link.exe -lib
# PROP Default_Filter ""
# Begin Source File
SOURCE=../../src/plot\..\..\..\src\msw\dummy.cpp
SOURCE=../../src/plot\..\..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File

2
contrib/build/stc/makefile.bcc
View File

@@ -394,7 +394,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_bcc$(VENDORTAG).dll: $(STCDLL_OBJECTS) $(OBJS)\stcdll_version.res
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(STCDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\stcdll_version.res
c0d32.obj $(STCDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\stcdll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc $@
!endif

2
contrib/build/stc/makefile.gcc
View File

@@ -387,7 +387,7 @@ clean:
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_gcc$(VENDORTAG).dll: $(STCDLL_OBJECTS) $(OBJS)\stcdll_version_rc.o
$(CXX) -shared -fPIC -o $@ $(STCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
$(CXX) -shared -fPIC -o $@ $(STCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
endif
ifeq ($(SHARED),0)

2
contrib/build/stc/makefile.vc
View File

@@ -479,7 +479,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).dll: $(STCDLL_OBJECTS) $(OBJS)\stcdll_version.res
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
$(STCDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
$(STCDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
<<
!endif

2
contrib/build/stc/makefile.wat
View File

@@ -425,7 +425,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\stcdll.lbc option caseexact
@%append $(OBJS)\stcdll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME)
@for %i in ($(STCDLL_OBJECTS)) do @%append $(OBJS)\stcdll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\stcdll.lbc library %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\stcdll.lbc library %i
@%append $(OBJS)\stcdll.lbc option resource=$(OBJS)\stcdll_version.res
@%append $(OBJS)\stcdll.lbc system nt_dll
wlink @$(OBJS)\stcdll.lbc

6
contrib/build/svg/makefile.bcc
View File

@@ -238,7 +238,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg_bcc$(VENDORTAG).dll: $(OBJS)\svgdll_dummy.obj $(SVGDLL_OBJECTS) $(OBJS)\svgdll_version.res
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(SVGDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\svgdll_version.res
c0d32.obj $(SVGDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32$(__THREADSFLAG_6)$(__RUNTIME_LIBS_9).lib,, $(OBJS)\svgdll_version.res
|
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg $@
!endif
@@ -251,7 +251,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
|
!endif
$(OBJS)\svgdll_dummy.obj: ../../src/svg\..\..\..\src\msw\dummy.cpp
$(OBJS)\svgdll_dummy.obj: ../../src/svg\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(SVGDLL_CXXFLAGS) -H $**
$(OBJS)\svgdll_version.res: ../../src/svg\..\..\..\src\msw\version.rc
@@ -260,7 +260,7 @@ $(OBJS)\svgdll_version.res: ../../src/svg\..\..\..\src\msw\version.rc
$(OBJS)\svgdll_dcsvg.obj: ../../src/svg\dcsvg.cpp
$(CXX) -q -c -P -o$@ $(SVGDLL_CXXFLAGS) $**
$(OBJS)\svglib_dummy.obj: ../../src/svg\..\..\..\src\msw\dummy.cpp
$(OBJS)\svglib_dummy.obj: ../../src/svg\..\..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(SVGLIB_CXXFLAGS) -H $**
$(OBJS)\svglib_dcsvg.obj: ../../src/svg\dcsvg.cpp

6
contrib/build/svg/makefile.gcc
View File

@@ -231,7 +231,7 @@ clean:
ifeq ($(SHARED),1)
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg_gcc$(VENDORTAG).dll: $(SVGDLL_OBJECTS) $(OBJS)\svgdll_version_rc.o
$(CXX) -shared -fPIC -o $@ $(SVGDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
$(CXX) -shared -fPIC -o $@ $(SVGDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
endif
ifeq ($(SHARED),0)
@@ -241,7 +241,7 @@ $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(
ranlib $@
endif
$(OBJS)\svgdll_dummy.o: ../../src/svg/../../../src/msw/dummy.cpp
$(OBJS)\svgdll_dummy.o: ../../src/svg/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(SVGDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\svgdll_version_rc.o: ../../src/svg/../../../src/msw/version.rc
@@ -250,7 +250,7 @@ $(OBJS)\svgdll_version_rc.o: ../../src/svg/../../../src/msw/version.rc
$(OBJS)\svgdll_dcsvg.o: ../../src/svg/dcsvg.cpp
$(CXX) -c -o $@ $(SVGDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\svglib_dummy.o: ../../src/svg/../../../src/msw/dummy.cpp
$(OBJS)\svglib_dummy.o: ../../src/svg/../../../src/common/dummy.cpp
$(CXX) -c -o $@ $(SVGLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\svglib_dcsvg.o: ../../src/svg/dcsvg.cpp

6
contrib/build/svg/makefile.vc
View File

@@ -323,7 +323,7 @@ clean:
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg_vc$(VENDORTAG).dll: $(OBJS)\svgdll_dummy.obj $(SVGDLL_OBJECTS) $(OBJS)\svgdll_version.res
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
$(SVGDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.lib
$(SVGDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg.lib
<<
!endif
@@ -335,7 +335,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
<<
!endif
$(OBJS)\svgdll_dummy.obj: ../../src/svg\..\..\..\src\msw\dummy.cpp
$(OBJS)\svgdll_dummy.obj: ../../src/svg\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(SVGDLL_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\svgdll_version.res: ../../src/svg\..\..\..\src\msw\version.rc
@@ -344,7 +344,7 @@ $(OBJS)\svgdll_version.res: ../../src/svg\..\..\..\src\msw\version.rc
$(OBJS)\svgdll_dcsvg.obj: ../../src/svg\dcsvg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(SVGDLL_CXXFLAGS) $**
$(OBJS)\svglib_dummy.obj: ../../src/svg\..\..\..\src\msw\dummy.cpp
$(OBJS)\svglib_dummy.obj: ../../src/svg\..\..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(SVGLIB_CXXFLAGS) /Ycwx/wxprec.h $**
$(OBJS)\svglib_dcsvg.obj: ../../src/svg\dcsvg.cpp

6
contrib/build/svg/makefile.wat
View File

@@ -269,7 +269,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\svgdll.lbc option caseexact
@%append $(OBJS)\svgdll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME)
@for %i in ($(SVGDLL_OBJECTS)) do @%append $(OBJS)\svgdll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\svgdll.lbc library %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\svgdll.lbc library %i
@%append $(OBJS)\svgdll.lbc option resource=$(OBJS)\svgdll_version.res
@%append $(OBJS)\svgdll.lbc system nt_dll
wlink @$(OBJS)\svgdll.lbc
@@ -283,7 +283,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
wlib -q -p4096 -n -b $^@ @$(OBJS)\svglib.lbc
!endif
$(OBJS)\svgdll_dummy.obj : .AUTODEPEND ../../src/svg\..\..\..\src\msw\dummy.cpp
$(OBJS)\svgdll_dummy.obj : .AUTODEPEND ../../src/svg\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(SVGDLL_CXXFLAGS) $<
$(OBJS)\svgdll_version.res : .AUTODEPEND ../../src/svg\..\..\..\src\msw\version.rc
@@ -292,7 +292,7 @@ $(OBJS)\svgdll_version.res : .AUTODEPEND ../../src/svg\..\..\..\src\msw\version
$(OBJS)\svgdll_dcsvg.obj : .AUTODEPEND ../../src/svg\dcsvg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(SVGDLL_CXXFLAGS) $<
$(OBJS)\svglib_dummy.obj : .AUTODEPEND ../../src/svg\..\..\..\src\msw\dummy.cpp
$(OBJS)\svglib_dummy.obj : .AUTODEPEND ../../src/svg\..\..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(SVGLIB_CXXFLAGS) $<
$(OBJS)\svglib_dcsvg.obj : .AUTODEPEND ../../src/svg\dcsvg.cpp

2
contrib/build/svg/svg.dsp
View File

@@ -456,7 +456,7 @@ SOURCE=../../src/svg\dcsvg.cpp
# End Source File
# Begin Source File
SOURCE=../../src/svg\..\..\..\src\msw\dummy.cpp
SOURCE=../../src/svg\..\..\..\src\common\dummy.cpp
# ADD BASE CPP /Yc"wx/wxprec.h"
# ADD CPP /Yc"wx/wxprec.h"
# End Source File

2
contrib/src/animate/Makefile.in
View File

@@ -229,7 +229,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3): $(ANIMATEDLL_OBJECTS) $(__animatedll___win32rc)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(ANIMATEDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__animatedll___macinstnamecmd) $(__animatedll___importlib) $(__animatedll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(ANIMATEDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__animatedll___macinstnamecmd) $(__animatedll___importlib) $(__animatedll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@
@COND_SHARED_1@ $(__animatedll___so_symlinks_cmd)

2
contrib/src/deprecated/Makefile.in
View File

@@ -259,7 +259,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3): $(DEPRECATEDDLL_OBJECTS) $(__deprecateddll___win32rc)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(DEPRECATEDDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__deprecateddll___macinstnamecmd) $(__deprecateddll___importlib) $(__deprecateddll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(DEPRECATEDDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__deprecateddll___macinstnamecmd) $(__deprecateddll___importlib) $(__deprecateddll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@
@COND_SHARED_1@ $(__deprecateddll___so_symlinks_cmd)

2
contrib/src/fl/Makefile.in
View File

@@ -260,7 +260,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3): $(FLDLL_OBJECTS) $(__fldll___win32rc)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(FLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__fldll___macinstnamecmd) $(__fldll___importlib) $(__fldll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(FLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__fldll___macinstnamecmd) $(__fldll___importlib) $(__fldll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@
@COND_SHARED_1@ $(__fldll___so_symlinks_cmd)

2
contrib/src/foldbar/Makefile.in
View File

@@ -233,7 +233,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__foldbardll___targetsuf3): $(FOLDBARDLL_OBJECTS) $(__foldbardll___win32rc)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(FOLDBARDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__foldbardll___macinstnamecmd) $(__foldbardll___importlib) $(__foldbardll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(FOLDBARDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__foldbardll___macinstnamecmd) $(__foldbardll___importlib) $(__foldbardll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@
@COND_SHARED_1@ $(__foldbardll___so_symlinks_cmd)

4
contrib/src/gizmos/Makefile.in
View File

@@ -320,7 +320,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0): $(GIZMOSDLL_OBJECTS) $(__gizmosdll___win32rc)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(GIZMOSDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__gizmosdll___macinstnamecmd) $(__gizmosdll___importlib) $(__gizmosdll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(GIZMOSDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__gizmosdll___macinstnamecmd) $(__gizmosdll___importlib) $(__gizmosdll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@
@COND_SHARED_1@ $(__gizmosdll___so_symlinks_cmd)
@@ -334,7 +334,7 @@ distclean: clean
@COND_USE_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_gizmosdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOSDLL_CXXFLAGS)
@COND_SHARED_1_USE_XRC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmos_0): $(GIZMOS_XRCDLL_OBJECTS) $(__gizmos_xrcdll___win32rc) $(__gizmosdll___depname)
@COND_SHARED_1_USE_XRC_1@ $(SHARED_LD_CXX) $@ $(GIZMOS_XRCDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__gizmos_xrcdll___macinstnamecmd) $(__gizmos_xrcdll___importlib) $(__gizmos_xrcdll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1_USE_XRC_1@ $(SHARED_LD_CXX) $@ $(GIZMOS_XRCDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__gizmos_xrcdll___macinstnamecmd) $(__gizmos_xrcdll___importlib) $(__gizmos_xrcdll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1_USE_XRC_1@
@COND_SHARED_1_USE_XRC_1@ $(__gizmos_xrcdll___so_symlinks_cmd)

2
contrib/src/mmedia/Makefile.in
View File

@@ -281,7 +281,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3): $(MMEDIADLL_OBJECTS) $(__mmediadll___win32rc)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(MMEDIADLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__mmediadll___macinstnamecmd) $(__mmediadll___importlib) $(__mmediadll___soname_flags) $(WXMACVERSION_CMD) $(EXTRALIBS_ESD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(MMEDIADLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__mmediadll___macinstnamecmd) $(__mmediadll___importlib) $(__mmediadll___soname_flags) $(WXMACVERSION_CMD) $(EXTRALIBS_ESD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@
@COND_SHARED_1@ $(__mmediadll___so_symlinks_cmd)

2
contrib/src/net/Makefile.in
View File

@@ -233,7 +233,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3): $(NETUTILSDLL_OBJECTS) $(__netutilsdll___win32rc)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(NETUTILSDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__netutilsdll___macinstnamecmd) $(__netutilsdll___importlib) $(__netutilsdll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(NETUTILSDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__netutilsdll___macinstnamecmd) $(__netutilsdll___importlib) $(__netutilsdll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@
@COND_SHARED_1@ $(__netutilsdll___so_symlinks_cmd)

2
contrib/src/ogl/Makefile.in
View File

@@ -250,7 +250,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3): $(OGLDLL_OBJECTS) $(__ogldll___win32rc)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(OGLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__ogldll___macinstnamecmd) $(__ogldll___importlib) $(__ogldll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(OGLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__ogldll___macinstnamecmd) $(__ogldll___importlib) $(__ogldll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@
@COND_SHARED_1@ $(__ogldll___so_symlinks_cmd)

2
contrib/src/plot/Makefile.in
View File

@@ -228,7 +228,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3): $(PLOTDLL_OBJECTS) $(__plotdll___win32rc)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(PLOTDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__plotdll___macinstnamecmd) $(__plotdll___importlib) $(__plotdll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(PLOTDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__plotdll___macinstnamecmd) $(__plotdll___importlib) $(__plotdll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@
@COND_SHARED_1@ $(__plotdll___so_symlinks_cmd)

2
contrib/src/stc/Makefile.in
View File

@@ -375,7 +375,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3): $(STCDLL_OBJECTS) $(__stcdll___win32rc)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(STCDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(STCDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@
@COND_SHARED_1@ $(__stcdll___so_symlinks_cmd)

2
contrib/src/svg/Makefile.in
View File

@@ -228,7 +228,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3): $(SVGDLL_OBJECTS) $(__svgdll___win32rc)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(SVGDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__svgdll___macinstnamecmd) $(__svgdll___importlib) $(__svgdll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(SVGDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__svgdll___macinstnamecmd) $(__svgdll___importlib) $(__svgdll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@
@COND_SHARED_1@ $(__svgdll___so_symlinks_cmd)

24
src/os2/dummy.cpp → src/common/dummy.cpp
View File

@@ -1,13 +1,13 @@
/*
* File: dummy.cc
* Purpose: See below
* Author: Julian Smart
* Created: 1993
* File: src/common/dummy.cpp
* Purpose: See below
* Author: Julian Smart
* Created: 1993
* Updated:
* Copyright: (c) 1993, AIAI, University of Edinburgh
*/
/* A dummy file to include wx.h. If precompiling wx.h, I
/* A dummy file to include wx.h. If precompiling wx.h,
* always start by compiling this and producing the PCH file.
* Then subsequent source files use the PCH file.
*
@@ -19,10 +19,14 @@
#include "wx/wxprec.h"
#define INCL_OS2
#include <os2.h>
#if defined(__VISAGECPP__)
char wxDummyChar = 0;
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#ifdef __WXMSW__
#include "wx/msw/msvcrt.h"
#endif
#ifdef __VISAGECPP__
char wxDummyChar = 0;
#endif

30
src/msw/dummy.cpp
View File

@@ -1,30 +0,0 @@
/*
* File: dummy.cc
* Purpose: See below
* Author: Julian Smart
* Created: 1993
* Updated:
* Copyright: (c) 1993, AIAI, University of Edinburgh
*/
/* A dummy file to include wx.h. If precompiling wx.h, I
* always start by compiling this and producing the PCH file.
* Then subsequent source files use the PCH file.
*
* If precompiling wx.h for wxWidgets and derived apps,
* link dummy.obj with your program (the MSC 7 linker complains otherwise).
*
* This is the only convenient way I found to use precompiled headers
* under MSC 7.
*
* This will produce a big PCH file.
*/
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#include "wx/msw/msvcrt.h"

25
src/msw/dummydll.cpp
View File

@@ -1,25 +0,0 @@
/*
* File: dummydll.cc
* Purpose:
* Author: Julian Smart
* Created: 1993
* Updated:
* Copyright: (c) 1993, AIAI, University of Edinburgh
*/
/* static const char sccsid[] = "@(#)dummydll.cc 1.2 5/9/94"; */
/*
* A dummy file to include wx.h. If precompiling wx.h, I
* always start by compiling this and producing the PCH file.
* Then subsequent source files use the PCH file.
*/
#include "wx/wxprec.h"
// Foils optimizations in Visual C++ (see also app.cpp). Without it,
// dummy.obj isn't linked and we get a linker error.
#if defined(__VISUALC__)
char wxDummyChar=0;
#endif

26
src/os2/dummydll.cpp
View File

@@ -1,26 +0,0 @@
/*
* File: dummydll.cc
* Purpose:
* Author: Julian Smart
* Created: 1993
* Updated:
* Copyright: (c) 1993, AIAI, University of Edinburgh
*/
/* static const char sccsid[] = "@(#)dummydll.cc 1.2 5/9/94"; */
/*
* A dummy file to include wx.h. If precompiling wx.h, I
* always start by compiling this and producing the PCH file.
* Then subsequent source files use the PCH file.
*/
#include "wx/wxprec.h"
#define INCL_OS2
#include <os2.h>
#if defined(__VISAGECPP__)
char wxDummyChar=0;
#endif

28
src/palmos/dummy.cpp
View File

@@ -1,28 +0,0 @@
/*
* File: dummy.cc
* Purpose: See below
* Author: Julian Smart
* Created: 1993
* Updated:
* Copyright: (c) 1993, AIAI, University of Edinburgh
*/
/* A dummy file to include wx.h. If precompiling wx.h, I
* always start by compiling this and producing the PCH file.
* Then subsequent source files use the PCH file.
*
* If precompiling wx.h for wxWidgets and derived apps,
* link dummy.obj with your program (the MSC 7 linker complains otherwise).
*
* This is the only convenient way I found to use precompiled headers
* under MSC 7.
*
* This will produce a big PCH file.
*/
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif

25
src/palmos/dummydll.cpp
View File

@@ -1,25 +0,0 @@
/*
* File: dummydll.cc
* Purpose:
* Author: Julian Smart
* Created: 1993
* Updated:
* Copyright: (c) 1993, AIAI, University of Edinburgh
*/
/* static const char sccsid[] = "@(#)dummydll.cc 1.2 5/9/94"; */
/*
* A dummy file to include wx.h. If precompiling wx.h, I
* always start by compiling this and producing the PCH file.
* Then subsequent source files use the PCH file.
*/
#include "wx/wxprec.h"
// Foils optimizations in Visual C++ (see also app.cpp). Without it,
// dummy.obj isn't linked and we get a linker error.
#if defined(__VISUALC__)
char wxDummyChar=0;
#endif

2
src/stc/Makefile.in
View File

@@ -375,7 +375,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3): $(STCDLL_OBJECTS) $(__stcdll___win32rc)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(STCDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(STCDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(WXMACVERSION_CMD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
@COND_SHARED_1@
@COND_SHARED_1@ $(__stcdll___so_symlinks_cmd)

26
src/wxWindows.dsp
View File

@@ -453,6 +453,11 @@ SOURCE=.\common\dseldlg.cpp
# End Source File
# Begin Source File
SOURCE=.\common\dummy.cpp
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# Begin Source File
SOURCE=.\common\dynarray.cpp
# End Source File
# Begin Source File
@@ -998,6 +1003,10 @@ SOURCE=.\generic\htmllbox.cpp
# End Source File
# Begin Source File
SOURCE=.\generic\hyperlink.cpp
# End Source File
# Begin Source File
SOURCE=.\generic\laywin.cpp
# End Source File
# Begin Source File
@@ -1346,11 +1355,6 @@ SOURCE=.\msw\dragimag.cpp
# End Source File
# Begin Source File
SOURCE=.\msw\dummy.cpp
# ADD CPP /Yc"wx/wxprec.h"
# End Source File
# Begin Source File
SOURCE=.\msw\enhmeta.cpp
# End Source File
# Begin Source File
@@ -1799,6 +1803,10 @@ SOURCE=.\xrc\xh_html.cpp
# End Source File
# Begin Source File
SOURCE=.\xrc\xh_hyperlink.cpp
# End Source File
# Begin Source File
SOURCE=.\xrc\xh_listb.cpp
# End Source File
# Begin Source File
@@ -2515,6 +2523,10 @@ SOURCE=..\include\wx\htmllbox.h
# End Source File
# Begin Source File
SOURCE=..\include\wx\hyperlink.h
# End Source File
# Begin Source File
SOURCE=..\include\wx\icon.h
# End Source File
# Begin Source File
@@ -3259,6 +3271,10 @@ SOURCE=..\include\wx\xrc\xh_html.h
# End Source File
# Begin Source File
SOURCE=..\include\wx\xrc\xh_hyperlink.h
# End Source File
# Begin Source File
SOURCE=..\include\wx\xrc\xh_listb.h
# End Source File
# Begin Source File