You can subscribe to this list here.
2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(191) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(238) |
Dec
(68) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2006 |
Jan
(104) |
Feb
(518) |
Mar
(302) |
Apr
(211) |
May
(311) |
Jun
(55) |
Jul
(6) |
Aug
(35) |
Sep
(76) |
Oct
(50) |
Nov
(37) |
Dec
(340) |
2007 |
Jan
(23) |
Feb
(107) |
Mar
(98) |
Apr
(60) |
May
(136) |
Jun
(371) |
Jul
(175) |
Aug
(74) |
Sep
(3) |
Oct
(2) |
Nov
(53) |
Dec
(129) |
2008 |
Jan
(337) |
Feb
(23) |
Mar
(18) |
Apr
(4) |
May
(3) |
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(33) |
Nov
|
Dec
(26) |
2009 |
Jan
(4) |
Feb
(1) |
Mar
(15) |
Apr
|
May
(35) |
Jun
(11) |
Jul
|
Aug
|
Sep
(19) |
Oct
(26) |
Nov
(11) |
Dec
(11) |
2010 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(8) |
Sep
|
Oct
|
Nov
(8) |
Dec
(7) |
2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(13) |
Dec
|
From: Francesco M. <fr...@us...> - 2006-01-23 21:20:37
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32251/build/bakefiles Modified Files: wxlua.bkl Added Files: options.bkl wxhacks.bkl Log Message: fixed install/uninstall under linux --- NEW FILE: options.bkl --- <?xml version="1.0" ?> <!-- Author: Francesco Montorsi <fr...@us...> --> <!-- RCS-ID: $Id: options.bkl,v 1.1 2006/01/23 21:20:29 frm Exp $ --> <!-- ====================================================================== --> <!-- WXLUA GLOBAL OPTIONS BAKEFILE --> <!-- ====================================================================== --> <makefile> <!-- ================================================================== --> <!-- The list of wxLua global OPTIONS DEFAULTS --> <!-- ================================================================== --> <set var="USE_UTIL_DEFAULT">1</set> <set var="USE_APPS_DEFAULT">1</set> <!-- ================================================================== --> <!-- The list of wxLua global OPTIONS --> <!-- ================================================================== --> <!-- options not tied to a specific module --> <if cond="TARGETING_IDE=='0'"> <option name="USE_UTIL"> <values>0,1</values> <default-value>$(USE_UTIL_DEFAULT)</default-value> <description>Should the wxLua utilities should be compiled ?</description> </option> <option name="USE_APPS"> <values>0,1</values> <default-value>$(USE_APPS_DEFAULT)</default-value> <description>Should the wxLua applications be compiled ?</description> </option> </if> <if cond="TARGETING_IDE=='1'"> <!-- IDEs are less flexible; we have to set these as variables with the default values --> <set var="USE_UTIL">$(USE_UTIL_DEFAULT)</set> <set var="USE_APPS">$(USE_APPS_DEFAULT)</set> </if> </makefile> --- NEW FILE: wxhacks.bkl --- <?xml version="1.0" ?> <!-- Created by: Francesco Montorsi <fr...@us...> --> <!-- Creation date: 29/10/2005 --> <!-- RCS-ID: $Id: wxhacks.bkl,v 1.1 2006/01/23 21:20:29 frm Exp $ --> <makefile> <requires version="0.2.0"/> <!-- --> <!-- WXPRESETS HACKS: provide a uniform and flexible build system --> <!-- based over the WX_* options on Windows and over wx-config on --> <!-- Unix. To use it you just need to use the 'wxbase' template --> <!-- together with the 'wx' or 'wx-lib' templates. --> <!-- --> <!-- --> <!-- --> <!-- --> <!-- --> <!-- This bakefile provides a lot of wxWidgets-specific settings --> <include file="presets/wx.bkl" once="1"/> <!-- A simple variable used to understand if we are --> <!-- creating a makefile for a Win32 target or a more --> <!-- generic linux/GNU-based system. --> <set var="TARGETING_WIN32"> <if cond="FORMAT=='autoconf' or FORMAT=='gnu'">0</if> <if cond="FORMAT!='autoconf' and FORMAT!='gnu'">1</if> </set> <set var="TARGETING_UNIX"> <if cond="FORMAT=='autoconf' or FORMAT=='gnu'">1</if> <if cond="FORMAT!='autoconf' and FORMAT!='gnu'">0</if> </set> <set var="TARGETING_IDE"> <if cond="FORMAT=='msvc6prj' or FORMAT=='cbuilderx'">1</if> <if cond="FORMAT!='msvc6prj' and FORMAT!='cbuilderx'">0</if> </set> <set var="TARGETING_MAKEFILE"> <if cond="FORMAT=='msvc6prj' or FORMAT=='cbuilderx'">0</if> <if cond="FORMAT!='msvc6prj' and FORMAT!='cbuilderx'">1</if> </set> <if cond="TARGETING_WIN32=='0'"> <set var="WX_SHAREDDEFINE"/> <set var="WXLIBPOSTFIX"></set> <set var="WX3RDPARTLIBPOSTFIX"></set> <!-- These options definitions are missing from wx_unix.bkl for all UNIX formats; for more info about this see: http://sourceforge.net/tracker/index.php?func=detail&aid=1254557&group_id=9863&atid=309863 wxCode bakefiles don't use its own options (BUILD,UNICODE,SHARED) and then sets WX_* options from their values; since wxCode components are "wx addons" we will use directly the WX_* options. Thus we need them also on Unix formats and thus we declare them here. All these options are set (for 'autoconf' format) by the AM_WXPRESETS macro (see wxpresets.m4 and wxcode.m4 macro files). --> <option name="WX_DEBUG"/> <option name="WX_UNICODE"/> <option name="WX_SHARED"/> <option name="WX_DIR"/> <option name="WX_VERSION"/> <option name="WX_PORT"/> </if> <if cond="TARGETING_WIN32=='1'"> <set var="WX_PORT">$(WXPORT)</set> </if> <!-- Set the build directory in a common way which makes us possible to keep separed builds done with different settings. User can safely override BUILDDIR in his bakefiles --> <template id="wxbase"> <if cond="TARGETING_WIN32=='1'"> <!-- WXSHARED-dependent --> <define> $(substituteFromDict(WX_SHARED,{'1':'WXUSINGDLL','0':''})) </define> <!-- WX_DEBUG-dependent --> <warnings> $(substituteFromDict(WX_DEBUG,{'1':'max','0':'no'})) </warnings> <optimize> $(substituteFromDict(WX_DEBUG,{'1':'off','0':'speed'})) </optimize> <debug-info> $(substituteFromDict(WX_DEBUG,{'1':'on','0':'off'})) </debug-info> </if> <!-- On Unix the m4 macros in wxpresets.m4 will set all the options above --> </template> </makefile> Index: wxlua.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxlua.bkl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxlua.bkl 23 Jan 2006 19:38:29 -0000 1.6 --- wxlua.bkl 23 Jan 2006 21:20:29 -0000 1.7 *************** *** 64,67 **** --- 64,68 ---- <subproject id="utils" cond="USE_UTIL=='1'"> + <installable>yes</installable> <dependency-of>all</dependency-of> <dir>$(WXLUA_BASEDIR)$(DIRSEP)util$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir> *************** *** 75,78 **** --- 76,80 ---- <subproject id="modules"> + <installable>yes</installable> <dependency-of>all</dependency-of> <dir>$(WXLUA_BASEDIR)$(DIRSEP)modules$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir> *************** *** 86,89 **** --- 88,92 ---- <subproject id="apps" cond="USE_APPS=='1'"> + <installable>yes</installable> <dependency-of>all</dependency-of> <dir>$(WXLUA_BASEDIR)$(DIRSEP)apps$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir> |
From: Francesco M. <fr...@us...> - 2006-01-23 21:20:36
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32251/apps/build/msw Modified Files: apps_app_wxlua.dsp apps_app_wxluaedit.dsp Log Message: fixed install/uninstall under linux Index: apps_app_wxluaedit.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/apps_app_wxluaedit.dsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** apps_app_wxluaedit.dsp 23 Jan 2006 19:38:29 -0000 1.5 --- apps_app_wxluaedit.dsp 23 Jan 2006 21:20:28 -0000 1.6 *************** *** 8,21 **** !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "apps_app_wxluaedit.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "apps_app_wxluaedit.mak" CFG="app_wxluaedit - Win32 Release" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "app_wxluaedit - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application") !MESSAGE "app_wxluaedit - Win32 DLL Unicode Release" (based on "Win32 (x86) Application") --- 8,21 ---- !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "apps_app_wxluaedit.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "apps_app_wxluaedit.mak" CFG="app_wxluaedit - Win32 Release" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "app_wxluaedit - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application") !MESSAGE "app_wxluaedit - Win32 DLL Unicode Release" (based on "Win32 (x86) Application") *************** *** 26,30 **** !MESSAGE "app_wxluaedit - Win32 Debug" (based on "Win32 (x86) Application") !MESSAGE "app_wxluaedit - Win32 Release" (based on "Win32 (x86) Application") ! !MESSAGE # Begin Project --- 26,30 ---- !MESSAGE "app_wxluaedit - Win32 Debug" (based on "Win32 (x86) Application") !MESSAGE "app_wxluaedit - Win32 Release" (based on "Win32 (x86) Application") ! !MESSAGE # Begin Project Index: apps_app_wxlua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/apps_app_wxlua.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** apps_app_wxlua.dsp 23 Jan 2006 19:38:29 -0000 1.4 --- apps_app_wxlua.dsp 23 Jan 2006 21:20:28 -0000 1.5 *************** *** 8,21 **** !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "apps_app_wxlua.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "apps_app_wxlua.mak" CFG="app_wxlua - Win32 Release" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "app_wxlua - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application") !MESSAGE "app_wxlua - Win32 DLL Unicode Release" (based on "Win32 (x86) Application") --- 8,21 ---- !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "apps_app_wxlua.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "apps_app_wxlua.mak" CFG="app_wxlua - Win32 Release" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "app_wxlua - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application") !MESSAGE "app_wxlua - Win32 DLL Unicode Release" (based on "Win32 (x86) Application") *************** *** 26,30 **** !MESSAGE "app_wxlua - Win32 Debug" (based on "Win32 (x86) Application") !MESSAGE "app_wxlua - Win32 Release" (based on "Win32 (x86) Application") ! !MESSAGE # Begin Project --- 26,30 ---- !MESSAGE "app_wxlua - Win32 Debug" (based on "Win32 (x86) Application") !MESSAGE "app_wxlua - Win32 Release" (based on "Win32 (x86) Application") ! !MESSAGE # Begin Project |
From: Francesco M. <fr...@us...> - 2006-01-23 19:38:46
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24398/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: updated bakefiles Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** makefile.vc 25 Nov 2005 20:04:35 -0000 1.9 --- makefile.vc 23 Jan 2006 19:38:29 -0000 1.10 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.0 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 15,28 **** # Use DLL build of wx library to use? [0,1] WX_SHARED = 0 # Compile Unicode build of wxWidgets? [0,1] WX_UNICODE = 0 # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] WX_DEBUG = 1 # Version of the wx library to build against. ! WX_VERSION = 26 # Does the wxLua utilities should be compiled ? [0,1] --- 15,38 ---- # Use DLL build of wx library to use? [0,1] + # 1 - DLL WX_SHARED = 0 # Compile Unicode build of wxWidgets? [0,1] + # 1 - Unicode WX_UNICODE = 0 # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] + # 0 - Release + # 1 - Debug WX_DEBUG = 1 # Version of the wx library to build against. ! WX_VERSION = 27 ! ! # Should the wxLua utilities should be compiled ? [0,1] ! USE_UTIL = 1 ! ! # Should the wxLua applications be compiled ? [0,1] ! USE_APPS = 1 # Does the wxLua utilities should be compiled ? [0,1] *************** *** 41,50 **** USE_WXLUAEDITAPP = 0 - # Does the wxLua utilities should be compiled ? [0,1] - USE_UTIL = 1 - - # Should the wxLua applications be compiled ? [0,1] - USE_APPS = 1 - --- 51,54 ---- *************** *** 58,70 **** CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" \ WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ ! WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" \ ! USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" \ USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" \ WXLUASETUP_DIR="$(WXLUASETUP_DIR)" WXLUABINDLIB_DIR="$(WXLUABINDLIB_DIR)" \ ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ ! USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)" ### Conditionally set variables: ### !if "$(USE_UTIL)" == "1" __utils___depname = sub_utils --- 62,82 ---- CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" \ WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ ! WX_VERSION="$(WX_VERSION)" USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)" \ ! USE_BIN2C="$(USE_BIN2C)" USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" \ USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" \ WXLUASETUP_DIR="$(WXLUASETUP_DIR)" WXLUABINDLIB_DIR="$(WXLUABINDLIB_DIR)" \ ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" ### Conditionally set variables: ### + !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" + WXLIBPOSTFIX = ud + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" + WXLIBPOSTFIX = d + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" + WXLIBPOSTFIX = u + !endif !if "$(USE_UTIL)" == "1" __utils___depname = sub_utils *************** *** 75,78 **** --- 87,94 ---- + all: msvc$(WXLIBPOSTFIX) + msvc$(WXLIBPOSTFIX): + -if not exist msvc$(WXLIBPOSTFIX) mkdir msvc$(WXLIBPOSTFIX) + ### Targets: ### *************** *** 80,86 **** clean: ! -if exist .\*.obj del .\*.obj ! -if exist .\*.res del .\*.res ! -if exist .\*.pch del .\*.pch cd ..\..\util\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) clean --- 96,102 ---- clean: ! -if exist msvc$(WXLIBPOSTFIX)\*.obj del msvc$(WXLIBPOSTFIX)\*.obj ! -if exist msvc$(WXLIBPOSTFIX)\*.res del msvc$(WXLIBPOSTFIX)\*.res ! -if exist msvc$(WXLIBPOSTFIX)\*.pch del msvc$(WXLIBPOSTFIX)\*.pch cd ..\..\util\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) clean Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** makefile.bcc 25 Nov 2005 20:04:34 -0000 1.8 --- makefile.bcc 23 Jan 2006 19:38:29 -0000 1.9 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.0 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 72,76 **** # Version of the wx library to build against. !ifndef WX_VERSION ! WX_VERSION = 26 !endif --- 72,86 ---- # Version of the wx library to build against. !ifndef WX_VERSION ! WX_VERSION = 27 ! !endif ! ! # Should the wxLua utilities should be compiled ? [0,1] ! !ifndef USE_UTIL ! USE_UTIL = 1 ! !endif ! ! # Should the wxLua applications be compiled ? [0,1] ! !ifndef USE_APPS ! USE_APPS = 1 !endif *************** *** 110,123 **** !endif - # Does the wxLua utilities should be compiled ? [0,1] - !ifndef USE_UTIL - USE_UTIL = 1 - !endif - - # Should the wxLua applications be compiled ? [0,1] - !ifndef USE_APPS - USE_APPS = 1 - !endif - --- 120,123 ---- *************** *** 132,145 **** -DWX_DIR="$(WX_DIR)" -DWX_SHARED="$(WX_SHARED)" \ -DWX_UNICODE="$(WX_UNICODE)" -DWX_DEBUG="$(WX_DEBUG)" \ ! -DWX_VERSION="$(WX_VERSION)" -DUSE_BIN2C="$(USE_BIN2C)" \ -DUSE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" \ -DUSE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" \ -DWXLUASETUP_DIR="$(WXLUASETUP_DIR)" \ -DWXLUABINDLIB_DIR="$(WXLUABINDLIB_DIR)" -DUSE_WXLUAAPP="$(USE_WXLUAAPP)" \ ! -DUSE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" -DUSE_UTIL="$(USE_UTIL)" \ ! -DUSE_APPS="$(USE_APPS)" ### Conditionally set variables: ### !if "$(USE_UTIL)" == "1" __utils___depname = utils --- 132,154 ---- -DWX_DIR="$(WX_DIR)" -DWX_SHARED="$(WX_SHARED)" \ -DWX_UNICODE="$(WX_UNICODE)" -DWX_DEBUG="$(WX_DEBUG)" \ ! -DWX_VERSION="$(WX_VERSION)" -DUSE_UTIL="$(USE_UTIL)" \ ! -DUSE_APPS="$(USE_APPS)" -DUSE_BIN2C="$(USE_BIN2C)" \ -DUSE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" \ -DUSE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" \ -DWXLUASETUP_DIR="$(WXLUASETUP_DIR)" \ -DWXLUABINDLIB_DIR="$(WXLUABINDLIB_DIR)" -DUSE_WXLUAAPP="$(USE_WXLUAAPP)" \ ! -DUSE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" ### Conditionally set variables: ### + !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" + WXLIBPOSTFIX = ud + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" + WXLIBPOSTFIX = d + !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" + WXLIBPOSTFIX = u + !endif !if "$(USE_UTIL)" == "1" __utils___depname = utils *************** *** 150,153 **** --- 159,166 ---- + all: borland$(WXLIBPOSTFIX) + borland$(WXLIBPOSTFIX): + -if not exist borland$(WXLIBPOSTFIX) mkdir borland$(WXLIBPOSTFIX) + ### Targets: ### *************** *** 155,194 **** clean: ! -if exist .\*.obj del .\*.obj ! -if exist .\*.res del .\*.res ! -if exist .\*.csm del .\*.csm ! @echo cd ..\..\util\build\msw >utils.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>utils.bat ! call utils.bat ! @del utils.bat ! @echo cd ..\..\modules\build\msw >modules.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>modules.bat ! call modules.bat ! @del modules.bat ! @echo cd ..\..\apps\build\msw >apps.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>apps.bat ! call apps.bat ! @del apps.bat !if "$(USE_UTIL)" == "1" utils: ! @echo cd ..\..\util\build\msw >utils.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>utils.bat ! call utils.bat ! @del utils.bat !endif modules: ! @echo cd ..\..\modules\build\msw >modules.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>modules.bat ! call modules.bat ! @del modules.bat !if "$(USE_APPS)" == "1" apps: ! @echo cd ..\..\apps\build\msw >apps.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>apps.bat ! call apps.bat ! @del apps.bat !endif --- 168,207 ---- clean: ! -if exist borland$(WXLIBPOSTFIX)\*.obj del borland$(WXLIBPOSTFIX)\*.obj ! -if exist borland$(WXLIBPOSTFIX)\*.res del borland$(WXLIBPOSTFIX)\*.res ! -if exist borland$(WXLIBPOSTFIX)\*.csm del borland$(WXLIBPOSTFIX)\*.csm ! @echo cd ..\..\util\build\msw >borland$(WXLIBPOSTFIX)\utils.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>borland$(WXLIBPOSTFIX)\utils.bat ! call borland$(WXLIBPOSTFIX)\utils.bat ! @del borland$(WXLIBPOSTFIX)\utils.bat ! @echo cd ..\..\modules\build\msw >borland$(WXLIBPOSTFIX)\modules.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>borland$(WXLIBPOSTFIX)\modules.bat ! call borland$(WXLIBPOSTFIX)\modules.bat ! @del borland$(WXLIBPOSTFIX)\modules.bat ! @echo cd ..\..\apps\build\msw >borland$(WXLIBPOSTFIX)\apps.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>borland$(WXLIBPOSTFIX)\apps.bat ! call borland$(WXLIBPOSTFIX)\apps.bat ! @del borland$(WXLIBPOSTFIX)\apps.bat !if "$(USE_UTIL)" == "1" utils: ! @echo cd ..\..\util\build\msw >borland$(WXLIBPOSTFIX)\utils.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>borland$(WXLIBPOSTFIX)\utils.bat ! call borland$(WXLIBPOSTFIX)\utils.bat ! @del borland$(WXLIBPOSTFIX)\utils.bat !endif modules: ! @echo cd ..\..\modules\build\msw >borland$(WXLIBPOSTFIX)\modules.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>borland$(WXLIBPOSTFIX)\modules.bat ! call borland$(WXLIBPOSTFIX)\modules.bat ! @del borland$(WXLIBPOSTFIX)\modules.bat !if "$(USE_APPS)" == "1" apps: ! @echo cd ..\..\apps\build\msw >borland$(WXLIBPOSTFIX)\apps.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>borland$(WXLIBPOSTFIX)\apps.bat ! call borland$(WXLIBPOSTFIX)\apps.bat ! @del borland$(WXLIBPOSTFIX)\apps.bat !endif Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** makefile.wat 25 Nov 2005 20:04:35 -0000 1.8 --- makefile.wat 23 Jan 2006 19:38:29 -0000 1.9 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.0 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 15,28 **** # Use DLL build of wx library to use? [0,1] WX_SHARED = 0 # Compile Unicode build of wxWidgets? [0,1] WX_UNICODE = 0 # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] WX_DEBUG = 1 # Version of the wx library to build against. ! WX_VERSION = 26 # Does the wxLua utilities should be compiled ? [0,1] --- 15,38 ---- # Use DLL build of wx library to use? [0,1] + # 1 - DLL WX_SHARED = 0 # Compile Unicode build of wxWidgets? [0,1] + # 1 - Unicode WX_UNICODE = 0 # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] + # 0 - Release + # 1 - Debug WX_DEBUG = 1 # Version of the wx library to build against. ! WX_VERSION = 27 ! ! # Should the wxLua utilities should be compiled ? [0,1] ! USE_UTIL = 1 ! ! # Should the wxLua applications be compiled ? [0,1] ! USE_APPS = 1 # Does the wxLua utilities should be compiled ? [0,1] *************** *** 41,50 **** USE_WXLUAEDITAPP = 0 - # Does the wxLua utilities should be compiled ? [0,1] - USE_UTIL = 1 - - # Should the wxLua applications be compiled ? [0,1] - USE_APPS = 1 - --- 51,54 ---- *************** *** 70,73 **** --- 74,93 ---- ### Conditionally set variables: ### + WXLIBPOSTFIX = + !ifeq WX_DEBUG 1 + !ifeq WX_UNICODE 1 + WXLIBPOSTFIX = ud + !endif + !endif + !ifeq WX_DEBUG 1 + !ifeq WX_UNICODE 0 + WXLIBPOSTFIX = d + !endif + !endif + !ifeq WX_DEBUG 0 + !ifeq WX_UNICODE 1 + WXLIBPOSTFIX = u + !endif + !endif __utils___depname = !ifeq USE_UTIL 1 *************** *** 84,95 **** CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" & WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" & ! WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" & ! USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" & USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" & WXLUASETUP_DIR="$(WXLUASETUP_DIR)" WXLUABINDLIB_DIR="$(WXLUABINDLIB_DIR)" & ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" & ! USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)" ### Targets: ### --- 104,118 ---- CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" & WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" & ! WX_VERSION="$(WX_VERSION)" USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)" & ! USE_BIN2C="$(USE_BIN2C)" USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" & USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" & WXLUASETUP_DIR="$(WXLUASETUP_DIR)" WXLUABINDLIB_DIR="$(WXLUABINDLIB_DIR)" & ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" + all : watcom$(WXLIBPOSTFIX) + watcom$(WXLIBPOSTFIX) : + -if not exist watcom$(WXLIBPOSTFIX) mkdir watcom$(WXLIBPOSTFIX) + ### Targets: ### *************** *** 97,105 **** clean : .SYMBOLIC ! -if exist .\*.obj del .\*.obj ! -if exist .\*.res del .\*.res ! -if exist .\*.lbc del .\*.lbc ! -if exist .\*.ilk del .\*.ilk ! -if exist .\*.pch del .\*.pch cd ..\..\util\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean --- 120,128 ---- clean : .SYMBOLIC ! -if exist watcom$(WXLIBPOSTFIX)\*.obj del watcom$(WXLIBPOSTFIX)\*.obj ! -if exist watcom$(WXLIBPOSTFIX)\*.res del watcom$(WXLIBPOSTFIX)\*.res ! -if exist watcom$(WXLIBPOSTFIX)\*.lbc del watcom$(WXLIBPOSTFIX)\*.lbc ! -if exist watcom$(WXLIBPOSTFIX)\*.ilk del watcom$(WXLIBPOSTFIX)\*.ilk ! -if exist watcom$(WXLIBPOSTFIX)\*.pch del watcom$(WXLIBPOSTFIX)\*.pch cd ..\..\util\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** makefile.gcc 25 Nov 2005 20:04:35 -0000 1.8 --- makefile.gcc 23 Jan 2006 19:38:29 -0000 1.9 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.0 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 24,28 **** # Version of the wx library to build against. ! WX_VERSION = 26 # Does the wxLua utilities should be compiled ? [0,1] --- 24,34 ---- # Version of the wx library to build against. ! WX_VERSION = 27 ! ! # Should the wxLua utilities should be compiled ? [0,1] ! USE_UTIL = 1 ! ! # Should the wxLua applications be compiled ? [0,1] ! USE_APPS = 1 # Does the wxLua utilities should be compiled ? [0,1] *************** *** 41,50 **** USE_WXLUAEDITAPP = 0 - # Does the wxLua utilities should be compiled ? [0,1] - USE_UTIL = 1 - - # Should the wxLua applications be compiled ? [0,1] - USE_APPS = 1 - --- 47,50 ---- *************** *** 58,70 **** CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" \ WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ ! WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" \ ! USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" \ USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" \ WXLUASETUP_DIR="$(WXLUASETUP_DIR)" WXLUABINDLIB_DIR="$(WXLUABINDLIB_DIR)" \ ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ ! USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)" ### Conditionally set variables: ### ifeq ($(USE_UTIL),1) __utils___depname = utils --- 58,84 ---- CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" \ WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ ! WX_VERSION="$(WX_VERSION)" USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)" \ ! USE_BIN2C="$(USE_BIN2C)" USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" \ USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" \ WXLUASETUP_DIR="$(WXLUASETUP_DIR)" WXLUABINDLIB_DIR="$(WXLUABINDLIB_DIR)" \ ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" ### Conditionally set variables: ### + ifeq ($(WX_DEBUG),1) + ifeq ($(WX_UNICODE),1) + WXLIBPOSTFIX = ud + endif + endif + ifeq ($(WX_DEBUG),1) + ifeq ($(WX_UNICODE),0) + WXLIBPOSTFIX = d + endif + endif + ifeq ($(WX_DEBUG),0) + ifeq ($(WX_UNICODE),1) + WXLIBPOSTFIX = u + endif + endif ifeq ($(USE_UTIL),1) __utils___depname = utils *************** *** 75,78 **** --- 89,96 ---- + all: mingw$(WXLIBPOSTFIX) + mingw$(WXLIBPOSTFIX): + -if not exist mingw$(WXLIBPOSTFIX) mkdir mingw$(WXLIBPOSTFIX) + ### Targets: ### *************** *** 80,85 **** clean: ! -if exist .\*.o del .\*.o ! -if exist .\*.d del .\*.d $(MAKE) -C ..\..\util\build\msw -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C ..\..\modules\build\msw -f makefile.gcc $(MAKEARGS) clean --- 98,103 ---- clean: ! -if exist mingw$(WXLIBPOSTFIX)\*.o del mingw$(WXLIBPOSTFIX)\*.o ! -if exist mingw$(WXLIBPOSTFIX)\*.d del mingw$(WXLIBPOSTFIX)\*.d $(MAKE) -C ..\..\util\build\msw -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C ..\..\modules\build\msw -f makefile.gcc $(MAKEARGS) clean *************** *** 103,105 **** # Dependencies tracking: ! -include ./*.d --- 121,123 ---- # Dependencies tracking: ! -include mingw$(WXLIBPOSTFIX)/*.d |
From: Francesco M. <fr...@us...> - 2006-01-23 19:38:44
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24398/apps/build/msw Modified Files: apps_app_wxlua.dsp apps_app_wxluaedit.dsp makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: updated bakefiles Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** makefile.bcc 30 Nov 2005 23:52:30 -0000 1.13 --- makefile.bcc 23 Jan 2006 19:38:29 -0000 1.14 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.0 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 62,66 **** # Version of the wx library to build against. !ifndef WX_VERSION ! WX_VERSION = 26 !endif --- 62,66 ---- # Version of the wx library to build against. !ifndef WX_VERSION ! WX_VERSION = 27 !endif *************** *** 86,91 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG_1) $(__DEBUGINFO) \ ! -tWM $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj \ --- 86,91 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_1) \ ! -I..\..\..\modules $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj \ *************** *** 94,100 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG_1) $(__DEBUGINFO) \ ! -tWM $(__WX_SHAREDDEFINE_p) -I$(WXSTEDIT)\include \ ! -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj \ --- 94,100 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_1) \ ! -I..\..\..\modules -I$(WXSTEDIT)\include -I$(WX_DIR)\contrib\include \ ! $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj \ *************** *** 109,115 **** --- 109,127 ---- __app_wxlua___depname = ..\..\..\bin\wxlua.exe !endif + !if "$(WX_SHARED)" == "0" + __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_lib$(WXLIBPOSTFIX) + !endif + !if "$(WX_SHARED)" == "1" + __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_dll$(WXLIBPOSTFIX) + !endif !if "$(USE_WXLUAEDITAPP)" == "1" __app_wxluaedit___depname = ..\..\..\bin\wxluaedit.exe !endif + !if "$(WX_SHARED)" == "0" + __WXLUA_OUTPUT_FOLDER_FILENAMES_1 = lib\bcc_lib$(WXLIBPOSTFIX) + !endif + !if "$(WX_SHARED)" == "1" + __WXLUA_OUTPUT_FOLDER_FILENAMES_1 = lib\bcc_dll$(WXLIBPOSTFIX) + !endif !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p = -D_UNICODE *************** *** 124,153 **** __WXDEBUG_DEFINE_p_0 = -d__WXDEBUG__ !endif ! !if "$(WX_DEBUG)" == "0" ! __OPTIMIZEFLAG_1 = -O2 ! !endif ! !if "$(WX_DEBUG)" == "1" ! __OPTIMIZEFLAG_1 = -Od ! !endif ! !if "$(WX_SHARED)" == "1" ! __WX_SHAREDDEFINE_p = -DWXUSINGDLL !endif !if "$(WX_SHARED)" == "1" ! __WX_SHAREDDEFINE_p_0 = -dWXUSINGDLL !endif !if "$(WX_SHARED)" == "0" ! __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_lib !endif !if "$(WX_SHARED)" == "1" ! __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_dll ! !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" ! WXLIBPOSTFIX = u !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" ! WXLIBPOSTFIX = d !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" ! WXLIBPOSTFIX = ud !endif !if "$(WX_SHARED)" == "0" --- 136,156 ---- __WXDEBUG_DEFINE_p_0 = -d__WXDEBUG__ !endif ! !if "$(WX_SHARED)" == "0" ! ____WX_SHARED = !endif !if "$(WX_SHARED)" == "1" ! ____WX_SHARED = -DWXUSINGDLL !endif !if "$(WX_SHARED)" == "0" ! ____WX_SHARED_0 = !endif !if "$(WX_SHARED)" == "1" ! ____WX_SHARED_0 = -dWXUSINGDLL !endif ! !if "$(WX_DEBUG)" == "0" ! ____WX_DEBUG = -O2 !endif ! !if "$(WX_DEBUG)" == "1" ! ____WX_DEBUG = -Od !endif !if "$(WX_SHARED)" == "0" *************** *** 158,165 **** !endif !if "$(WX_DEBUG)" == "0" ! __DEBUGINFO = -v- !endif !if "$(WX_DEBUG)" == "1" ! __DEBUGINFO = -v !endif --- 161,177 ---- !endif !if "$(WX_DEBUG)" == "0" ! ____WX_DEBUG_1 = -v- !endif !if "$(WX_DEBUG)" == "1" ! ____WX_DEBUG_1 = -v ! !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" ! WXLIBPOSTFIX = u ! !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" ! WXLIBPOSTFIX = d ! !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" ! WXLIBPOSTFIX = ud !endif *************** *** 192,197 **** !if "$(USE_WXLUAAPP)" == "1" ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| ! c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32mt.lib,, borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res | !endif --- 204,209 ---- !if "$(USE_WXLUAAPP)" == "1" ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_1) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| ! c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res | !endif *************** *** 199,204 **** !if "$(USE_WXLUAEDITAPP)" == "1" ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| ! c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32mt.lib,, borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res | !endif --- 211,216 ---- !if "$(USE_WXLUAEDITAPP)" == "1" ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_1) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_1) -aa @&&| ! c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res | !endif *************** *** 211,215 **** borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules $(__WX_SHAREDDEFINE_p_0) $** borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp --- 223,227 ---- borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____WX_SHARED_0) -i..\..\..\modules $** borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp *************** *** 220,223 **** borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules $(__WX_SHAREDDEFINE_p_0) $** --- 232,235 ---- borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____WX_SHARED_0) -i..\..\..\modules $** Index: apps_app_wxlua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/apps_app_wxlua.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** apps_app_wxlua.dsp 28 Dec 2005 23:02:49 -0000 1.3 --- apps_app_wxlua.dsp 23 Jan 2006 19:38:29 -0000 1.4 *************** *** 8,21 **** !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "apps_app_wxlua.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "apps_app_wxlua.mak" CFG="app_wxlua - Win32 Release" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "app_wxlua - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application") !MESSAGE "app_wxlua - Win32 DLL Unicode Release" (based on "Win32 (x86) Application") --- 8,21 ---- !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "apps_app_wxlua.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "apps_app_wxlua.mak" CFG="app_wxlua - Win32 Release" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "app_wxlua - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application") !MESSAGE "app_wxlua - Win32 DLL Unicode Release" (based on "Win32 (x86) Application") *************** *** 26,30 **** !MESSAGE "app_wxlua - Win32 Debug" (based on "Win32 (x86) Application") !MESSAGE "app_wxlua - Win32 Release" (based on "Win32 (x86) Application") ! !MESSAGE # Begin Project --- 26,30 ---- !MESSAGE "app_wxlua - Win32 Debug" (based on "Win32 (x86) Application") !MESSAGE "app_wxlua - Win32 Release" (based on "Win32 (x86) Application") ! !MESSAGE # Begin Project *************** *** 48,63 **** # PROP Intermediate_Dir "msvc6prjud\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "WXUSINGDLL" /d _WINDOWS ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "WXUSINGDLL" /d _WINDOWS BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Release" --- 48,63 ---- # PROP Intermediate_Dir "msvc6prjud\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /d "_WINDOWS" /d _DEBUG ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /d "_WINDOWS" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27ud_xrc.lib wxmsw27ud_html.lib wxmsw27ud_media.lib wxmsw27ud_adv.lib wxbase27ud_net.lib wxbase27ud_xml.lib wxmsw27ud_core.lib wxbase27ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllud" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27ud_xrc.lib wxmsw27ud_html.lib wxmsw27ud_media.lib wxmsw27ud_adv.lib wxbase27ud_net.lib wxbase27ud_xml.lib wxmsw27ud_core.lib wxbase27ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllud" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Release" *************** *** 73,88 **** # PROP Intermediate_Dir "msvc6prju\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "WXUSINGDLL" /d _WINDOWS ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "WXUSINGDLL" /d _WINDOWS BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /nodefaultlib:"MSVCRT.lib" !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Debug" --- 73,88 ---- # PROP Intermediate_Dir "msvc6prju\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /d _WINDOWS ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /d _WINDOWS BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27u_xrc.lib wxmsw27u_html.lib wxmsw27u_media.lib wxmsw27u_adv.lib wxbase27u_net.lib wxbase27u_xml.lib wxmsw27u_core.lib wxbase27u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllu" /subsystem:windows /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27u_xrc.lib wxmsw27u_html.lib wxmsw27u_media.lib wxmsw27u_adv.lib wxbase27u_net.lib wxbase27u_xml.lib wxmsw27u_core.lib wxbase27u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllu" /subsystem:windows /nodefaultlib:"MSVCRT.lib" !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Debug" *************** *** 98,113 **** # PROP Intermediate_Dir "msvc6prjd\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "WXUSINGDLL" /d _WINDOWS ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "WXUSINGDLL" /d _WINDOWS BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Release" --- 98,113 ---- # PROP Intermediate_Dir "msvc6prjd\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /d "_WINDOWS" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /d "_WINDOWS" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27d_xrc.lib wxmsw27d_html.lib wxmsw27d_media.lib wxmsw27d_adv.lib wxbase27d_net.lib wxbase27d_xml.lib wxmsw27d_core.lib wxbase27d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dlld" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27d_xrc.lib wxmsw27d_html.lib wxmsw27d_media.lib wxmsw27d_adv.lib wxbase27d_net.lib wxbase27d_xml.lib wxmsw27d_core.lib wxbase27d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dlld" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Release" *************** *** 123,138 **** # PROP Intermediate_Dir "msvc6prj\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "WXUSINGDLL" /d _WINDOWS ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "WXUSINGDLL" /d _WINDOWS BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /nodefaultlib:"MSVCRT.lib" !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode Debug" --- 123,138 ---- # PROP Intermediate_Dir "msvc6prj\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /d _WINDOWS ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /d _WINDOWS BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27_xrc.lib wxmsw27_html.lib wxmsw27_media.lib wxmsw27_adv.lib wxbase27_net.lib wxbase27_xml.lib wxmsw27_core.lib wxbase27.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27_xrc.lib wxmsw27_html.lib wxmsw27_media.lib wxmsw27_adv.lib wxbase27_net.lib wxbase27_xml.lib wxmsw27_core.lib wxbase27.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /nodefaultlib:"MSVCRT.lib" !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode Debug" *************** *** 148,163 **** # PROP Intermediate_Dir "msvc6prjud\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d _WINDOWS ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d _WINDOWS BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode Release" --- 148,163 ---- # PROP Intermediate_Dir "msvc6prjud\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_WINDOWS" /d _DEBUG ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_WINDOWS" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27ud_xrc.lib wxmsw27ud_html.lib wxmsw27ud_media.lib wxmsw27ud_adv.lib wxbase27ud_net.lib wxbase27ud_xml.lib wxmsw27ud_core.lib wxbase27ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_libud" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27ud_xrc.lib wxmsw27ud_html.lib wxmsw27ud_media.lib wxmsw27ud_adv.lib wxbase27ud_net.lib wxbase27ud_xml.lib wxmsw27ud_core.lib wxbase27ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_libud" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode Release" *************** *** 173,178 **** # PROP Intermediate_Dir "msvc6prju\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 --- 173,178 ---- # PROP Intermediate_Dir "msvc6prju\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 *************** *** 183,188 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /nodefaultlib:"MSVCRT.lib" !ELSEIF "$(CFG)" == "app_wxlua - Win32 Debug" --- 183,188 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27u_xrc.lib wxmsw27u_html.lib wxmsw27u_media.lib wxmsw27u_adv.lib wxbase27u_net.lib wxbase27u_xml.lib wxmsw27u_core.lib wxbase27u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_libu" /subsystem:windows /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27u_xrc.lib wxmsw27u_html.lib wxmsw27u_media.lib wxmsw27u_adv.lib wxbase27u_net.lib wxbase27u_xml.lib wxmsw27u_core.lib wxbase27u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_libu" /subsystem:windows /nodefaultlib:"MSVCRT.lib" !ELSEIF "$(CFG)" == "app_wxlua - Win32 Debug" *************** *** 198,213 **** # PROP Intermediate_Dir "msvc6prjd\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d _WINDOWS ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d _WINDOWS BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" !ELSEIF "$(CFG)" == "app_wxlua - Win32 Release" --- 198,213 ---- # PROP Intermediate_Dir "msvc6prjd\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_WINDOWS" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_WINDOWS" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27d_xrc.lib wxmsw27d_html.lib wxmsw27d_media.lib wxmsw27d_adv.lib wxbase27d_net.lib wxbase27d_xml.lib wxmsw27d_core.lib wxbase27d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_libd" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27d_xrc.lib wxmsw27d_html.lib wxmsw27d_media.lib wxmsw27d_adv.lib wxbase27d_net.lib wxbase27d_xml.lib wxmsw27d_core.lib wxbase27d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_libd" /subsystem:windows /debug /nodefaultlib:"MSVCRT.lib" !ELSEIF "$(CFG)" == "app_wxlua - Win32 Release" *************** *** 223,228 **** # PROP Intermediate_Dir "msvc6prj\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 --- 223,228 ---- # PROP Intermediate_Dir "msvc6prj\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 *************** *** 233,238 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /nodefaultlib:"MSVCRT.lib" !ENDIF --- 233,238 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27_xrc.lib wxmsw27_html.lib wxmsw27_media.lib wxmsw27_adv.lib wxbase27_net.lib wxbase27_xml.lib wxmsw27_core.lib wxbase27.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /nodefaultlib:"MSVCRT.lib" ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.lib wxmsw27_xrc.lib wxmsw27_html.lib wxmsw27_media.lib wxmsw27_adv.lib wxbase27_net.lib wxbase27_xml.lib wxmsw27_core.lib wxbase27.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /nodefaultlib:"MSVCRT.lib" !ENDIF Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** makefile.wat 30 Nov 2005 23:52:30 -0000 1.13 --- makefile.wat 23 Jan 2006 19:38:29 -0000 1.14 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.0 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 27,40 **** # Use DLL build of wx library to use? [0,1] WX_SHARED = 0 # Compile Unicode build of wxWidgets? [0,1] WX_UNICODE = 0 # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] WX_DEBUG = 1 # Version of the wx library to build against. ! WX_VERSION = 26 # Compile the wxLua app ? [0,1] --- 27,44 ---- # Use DLL build of wx library to use? [0,1] + # 1 - DLL WX_SHARED = 0 # Compile Unicode build of wxWidgets? [0,1] + # 1 - Unicode WX_UNICODE = 0 # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] + # 0 - Release + # 1 - Debug WX_DEBUG = 1 # Version of the wx library to build against. ! WX_VERSION = 27 # Compile the wxLua app ? [0,1] *************** *** 75,116 **** __app_wxlua___depname = ..\..\..\bin\wxlua.exe !endif __app_wxluaedit___depname = !ifeq USE_WXLUAEDITAPP 1 __app_wxluaedit___depname = ..\..\..\bin\wxluaedit.exe !endif ! __WARNINGS = ! !ifeq WX_DEBUG 0 ! __WARNINGS = !endif ! !ifeq WX_DEBUG 1 ! __WARNINGS = -wx !endif ! __OPTIMIZEFLAG = !ifeq WX_DEBUG 0 ! __OPTIMIZEFLAG = -ot -ox !endif !ifeq WX_DEBUG 1 ! __OPTIMIZEFLAG = -od !endif ! __DEBUGINFO = !ifeq WX_DEBUG 0 ! __DEBUGINFO = -d0 !endif !ifeq WX_DEBUG 1 ! __DEBUGINFO = -d2 !endif ! __DEBUGINFO_0 = !ifeq WX_DEBUG 0 ! __DEBUGINFO_0 = !endif !ifeq WX_DEBUG 1 ! __DEBUGINFO_0 = debug all !endif ! __WXLUA_OUTPUT_FOLDER_FILENAMES = ! !ifeq WX_SHARED 0 ! __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\wat_lib !endif ! !ifeq WX_SHARED 1 ! __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\wat_dll !endif __WXUNICODE_DEFINE_p = --- 79,127 ---- __app_wxlua___depname = ..\..\..\bin\wxlua.exe !endif + __WXLUA_OUTPUT_FOLDER_FILENAMES = + !ifeq WX_SHARED 0 + __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\wat_lib$(WXLIBPOSTFIX) + !endif + !ifeq WX_SHARED 1 + __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\wat_dll$(WXLIBPOSTFIX) + !endif __app_wxluaedit___depname = !ifeq USE_WXLUAEDITAPP 1 __app_wxluaedit___depname = ..\..\..\bin\wxluaedit.exe !endif ! __WXLUA_OUTPUT_FOLDER_FILENAMES_1 = ! !ifeq WX_SHARED 0 ! __WXLUA_OUTPUT_FOLDER_FILENAMES_1 = lib\wat_lib$(WXLIBPOSTFIX) !endif ! !ifeq WX_SHARED 1 ! __WXLUA_OUTPUT_FOLDER_FILENAMES_1 = lib\wat_dll$(WXLIBPOSTFIX) !endif ! ____WX_DEBUG_1 = !ifeq WX_DEBUG 0 ! ____WX_DEBUG_1 = !endif !ifeq WX_DEBUG 1 ! ____WX_DEBUG_1 = -wx !endif ! ____WX_DEBUG = !ifeq WX_DEBUG 0 ! ____WX_DEBUG = -ot -ox !endif !ifeq WX_DEBUG 1 ! ____WX_DEBUG = -od !endif ! ____WX_DEBUG_0 = !ifeq WX_DEBUG 0 ! ____WX_DEBUG_0 = -d0 !endif !ifeq WX_DEBUG 1 ! ____WX_DEBUG_0 = -d2 !endif ! ____WX_DEBUG_2 = ! !ifeq WX_DEBUG 0 ! ____WX_DEBUG_2 = !endif ! !ifeq WX_DEBUG 1 ! ____WX_DEBUG_2 = debug all !endif __WXUNICODE_DEFINE_p = *************** *** 122,125 **** --- 133,150 ---- __WXDEBUG_DEFINE_p = -d__WXDEBUG__ !endif + __WXLIBPATH_FILENAMES = + !ifeq WX_SHARED 0 + __WXLIBPATH_FILENAMES = \lib\wat_lib + !endif + !ifeq WX_SHARED 1 + __WXLIBPATH_FILENAMES = \lib\wat_dll + !endif + ____WX_SHARED = + !ifeq WX_SHARED 0 + ____WX_SHARED = + !endif + !ifeq WX_SHARED 1 + ____WX_SHARED = -dWXUSINGDLL + !endif WXLIBPOSTFIX = !ifeq WX_DEBUG 0 *************** *** 138,152 **** !endif !endif - __WXLIBPATH_FILENAMES = - !ifeq WX_SHARED 0 - __WXLIBPATH_FILENAMES = \lib\wat_lib - !endif - !ifeq WX_SHARED 1 - __WXLIBPATH_FILENAMES = \lib\wat_dll - !endif - __WX_SHAREDDEFINE_p = - !ifeq WX_SHARED 1 - __WX_SHAREDDEFINE_p = -dWXUSINGDLL - !endif ### Variables: ### --- 163,166 ---- *************** *** 154,159 **** APP_WXLUA_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include -i=..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) & ! $(__DEBUGINFO) -bm $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj & --- 168,173 ---- APP_WXLUA_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & ! $(____WX_DEBUG_0) -i=..\..\..\modules $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj & *************** *** 161,166 **** APP_WXLUAEDIT_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include -i=..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) & ! $(__DEBUGINFO) -bm $(__WX_SHAREDDEFINE_p) -i=$(%WXSTEDIT)\include & -i=$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = & --- 175,180 ---- APP_WXLUAEDIT_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & ! $(____WX_DEBUG_0) -i=..\..\..\modules -i=$(%WXSTEDIT)\include & -i=$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = & *************** *** 192,198 **** @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_0) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc file %i ! @for %i in ( wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib 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) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc library %i @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc option resource=watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.res wlink @watcom$(WXLIBPOSTFIX)\app_wxlua.lbc --- 206,212 ---- @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_2) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc file %i ! @for %i in ( wxluasocket.lib wxluadebug.lib wxlua.lib wxbind.lib lua.... [truncated message content] |
From: Francesco M. <fr...@us...> - 2006-01-23 19:38:43
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24398/build/bakefiles Modified Files: wxlua.bkl wxluabase.bkl Log Message: updated bakefiles Index: wxluabase.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxluabase.bkl 24 Nov 2005 21:34:16 -0000 1.4 --- wxluabase.bkl 23 Jan 2006 19:38:29 -0000 1.5 *************** *** 6,13 **** <!-- ====================================================================== --> ! <!-- WXLUA GENERIC BAKEFILE --> <!-- --> ! <!-- This bakefile can be used by all wxLua-based apps and --> ! <!-- libraries. --> <!-- ====================================================================== --> --- 6,12 ---- <!-- ====================================================================== --> ! <!-- WXLUA GENERIC BAKEFILE --> <!-- --> ! <!-- This bakefile can be used by all wxLua-based apps and libraries. --> <!-- ====================================================================== --> *************** *** 17,25 **** <!-- This file contains the declaration of the WX & WX-LIB templates --> ! <set var="WX_VERSION_DEFAULT">26</set> ! <include file="presets/wx.bkl"/> ! <!-- This one contains some utility targets --> ! <include file="utils.bkl"/> --- 16,23 ---- <!-- This file contains the declaration of the WX & WX-LIB templates --> ! <include file="wxhacks.bkl"/> ! <!-- This one contains some utility targets ! <include file="utils.bkl"/> --> *************** *** 41,58 **** <set var="WXLUA_MACVERSION">0</set> ! <!-- A simple variable used to understand if we are --> ! <!-- creating a makefile for a Win32 target or a more --> ! <!-- generic linux/GNU-based system. --> ! <set var="TARGETING_WIN32"> ! <if cond="FORMAT=='autoconf' or FORMAT=='gnu'">0</if> ! <if cond="FORMAT!='autoconf' and FORMAT!='gnu'">1</if> ! </set> ! <set var="TARGETING_IDE"> ! <if cond="FORMAT=='msvc6prj' or FORMAT=='cbuilderx'">1</if> ! <if cond="FORMAT!='msvc6prj' and FORMAT!='cbuilderx'">0</if> ! </set> ! <set var="WXLUA_LIBPOSTFIX"> - <!-- Use same naming conventions as for wxWidgets. --> <if cond="TARGETING_WIN32=='1'">$(WXLIBPOSTFIX)</if> <if cond="TARGETING_WIN32=='0'"></if> <!-- empty in this case... --> --- 39,44 ---- <set var="WXLUA_MACVERSION">0</set> ! <!-- Use same naming conventions as for wxWidgets. --> <set var="WXLUA_LIBPOSTFIX"> <if cond="TARGETING_WIN32=='1'">$(WXLIBPOSTFIX)</if> <if cond="TARGETING_WIN32=='0'"></if> <!-- empty in this case... --> *************** *** 73,77 **** <if cond="TARGETING_WIN32=='1'"> <!-- in this case, the COMPILER variable is defined --> ! lib$(DIRSEP)$(COMPILER)_lib </if> <if cond="TARGETING_WIN32=='0'"> --- 59,63 ---- <if cond="TARGETING_WIN32=='1'"> <!-- in this case, the COMPILER variable is defined --> ! lib$(DIRSEP)$(COMPILER)_lib$(WXLUA_LIBPOSTFIX) </if> <if cond="TARGETING_WIN32=='0'"> *************** *** 82,86 **** <if cond="TARGETING_WIN32=='1'"> <!-- in this case, the COMPILER variable is defined --> ! lib$(DIRSEP)$(COMPILER)_dll </if> <if cond="TARGETING_WIN32=='0'"> --- 68,72 ---- <if cond="TARGETING_WIN32=='1'"> <!-- in this case, the COMPILER variable is defined --> ! lib$(DIRSEP)$(COMPILER)_dll$(WXLUA_LIBPOSTFIX) </if> <if cond="TARGETING_WIN32=='0'"> *************** *** 95,156 **** <if cond="TARGETING_WIN32=='1'"> - <set var="WARNINGS"> - <if cond="WX_DEBUG=='1'">max</if> - <if cond="WX_DEBUG=='0'">no</if> - </set> - <set var="DEBUGINFO"> - <if cond="WX_DEBUG=='1'">on</if> - <if cond="WX_DEBUG=='0'">off</if> - </set> - <set var="DEBUGRUNTIME"> - <if cond="WX_DEBUG=='1'">on</if> - <if cond="WX_DEBUG=='0'">off</if> - </set> - <set var="OPTIMIZEFLAG"> - <if cond="WX_DEBUG=='1'">off</if> - <if cond="WX_DEBUG=='0'">speed</if> - </set> - <set var="WX_SHAREDDEFINE"> - <if cond="WX_SHARED=='1'">WXUSINGDLL</if> - </set> - <set var="SUBPROJECT_POSTFIX_PATH">build$(DIRSEP)msw</set> </if> <if cond="TARGETING_WIN32=='0'"> - <set var="WX_SHAREDDEFINE"/> - - <if cond="FORMAT=='autoconf'"> - <option name="WX_DEBUG"/> - <option name="WX_UNICODE"/> - <option name="WX_SHARED"/> - <option name="WX_DIR"/> - <option name="WX_VERSION"/> - </if> - <set var="SUBPROJECT_POSTFIX_PATH"/> </if> - <!-- ================================================================== --> - <!-- NEW TAGS --> - <!-- ================================================================== --> - - <!-- This defines a tag which includes headers on MSVC --> - <!-- Note that $(value) is stuck in there by bakefile, --> - <!-- and is the value between the beginning and end tag. --> - <define-tag name="headers" rules="dll,lib,exe"> - <if cond="FORMAT=='msvc6prj'"> - <msvc-project-files> - $(value) - </msvc-project-files> - </if> - </define-tag> - - <define-tag name="run-tarball" rules="action"> - <command>tar -cvzf $(value) --exclude-from=$(WXLUA_BASEDIR)$(DIRSEP)build$(DIRSEP)bakefiles$(DIRSEP)excludelist.txt wxLua/*</command> - </define-tag> - <define-tag name="run-zip" rules="action"> - <command>zip -r9 $(value) $(WXLUA_BASEDIR)$(DIRSEP)* -x *.pdb -x *.log -x *.o* -x *.#* -x *.csm -x *.il?</command> - </define-tag> --- 81,94 ---- <if cond="TARGETING_WIN32=='1'"> <set var="SUBPROJECT_POSTFIX_PATH">build$(DIRSEP)msw</set> </if> <if cond="TARGETING_WIN32=='0'"> <set var="SUBPROJECT_POSTFIX_PATH"/> </if> + <!-- Put all the objects files generated by --> + <!-- the compilation in a subfolder of BUILD --> + <if cond="FORMAT!='autoconf'"><set var="BUILDDIR">$(FORMAT)$(WXLUA_LIBPOSTFIX)</set></if> *************** *** 162,166 **** thanks to the order precedence declaration below it: --> <define-tag name="__wxlua-libs-point" rules="exe,dll,module"/> ! <define-tag name="__wxlua-req-libs-point" rules="exe,dll,module"/> <!-- our <lua-lib> tag is simple: it just declares the dependency from the --- 100,104 ---- thanks to the order precedence declaration below it: --> <define-tag name="__wxlua-libs-point" rules="exe,dll,module"/> ! <define-tag name="__wxlua-req-libs-point" rules="exe,dll,module"/> <!-- our <lua-lib> tag is simple: it just declares the dependency from the *************** *** 169,201 **** <define-tag name="wxlua-lib" rules="exe,dll,module"><sys-lib>$(value)</sys-lib></define-tag> ! <!-- this tag includes the wxLua required libraries, it will be defined ! later in options.bkl --> ! <define-tag name="wxlua-req-libs" rules="exe,dll,module"/> ! <!-- some tag infos --> <tag-info name="wxlua-lib" position="before:wxlua-req-libs"/> ! <tag-info name="wxlua-req-libs" position="before:__wxlua-libs-point"/> <tag-info name="wx-lib" position="after:__wxlua-libs-point"/> <!-- the generic template for wxLua-based libs/apps: this does not derive ! from wx or from wx-lib so that these templates can be added later to ! create templates specific for wxlua-based libs and templates specific ! for wxlua-based apps --> ! <template id="wxlua-base"> <!-- an additional include & link path are required not only on win32 but also on *nix: when compiling the samples or the library the user has not installed the library yet ! --> <include>$(WXLUA_BASEDIR)$(DIRSEP)modules</include> - - <if cond="TARGETING_WIN32=='1'"> - <warnings>$(WARNINGS)</warnings> - <optimize>$(OPTIMIZEFLAG)</optimize> - <debug-info>$(DEBUGINFO)</debug-info> - <debug-runtime-libs>$(DEBUGRUNTIME)</debug-runtime-libs> - <threading>multi</threading> - </if> - - <!-- This is a non-empty variable only when using wxWidgets as a DLL --> - <define>$(WX_SHAREDDEFINE)</define> </template> --- 107,128 ---- <define-tag name="wxlua-lib" rules="exe,dll,module"><sys-lib>$(value)</sys-lib></define-tag> ! <!-- this tag includes the wxLua required libraries, it will be defined ! later in options.bkl --> ! <define-tag name="wxlua-req-libs" rules="exe,dll,module"/> ! <!-- some tag infos --> <tag-info name="wxlua-lib" position="before:wxlua-req-libs"/> ! <tag-info name="wxlua-req-libs" position="before:__wxlua-libs-point"/> <tag-info name="wx-lib" position="after:__wxlua-libs-point"/> <!-- the generic template for wxLua-based libs/apps: this does not derive ! from wx or from wx-lib except for 'wxbase' so that these templates can ! be added later to create templates specific for wxlua-based libs and ! templates specific for wxlua-based apps --> ! <template id="wxlua-base" template="wxbase"> <!-- an additional include & link path are required not only on win32 but also on *nix: when compiling the samples or the library the user has not installed the library yet ! --> <include>$(WXLUA_BASEDIR)$(DIRSEP)modules</include> </template> Index: wxlua.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxlua.bkl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxlua.bkl 24 Nov 2005 21:34:16 -0000 1.5 --- wxlua.bkl 23 Jan 2006 19:38:29 -0000 1.6 *************** *** 11,18 **** --- 11,23 ---- <makefile> + <using module="pkgconfig"/> + <!-- This is required because it contains the definitions of a lot of utils --> <include file="wxluabase.bkl"/> + <!-- This file contains the list of global WXLUA options --> + <include file="options.bkl"/> + <!-- This file contains the list of UTILS options --> <include file="../../util/build/bakefiles/options.bkl"/> *************** *** 44,72 **** --> ! <set var="USE_UTIL_DEFAULT">1</set> ! <set var="USE_APPS_DEFAULT">1</set> ! ! <!-- options not tied to a specific module --> ! <if cond="TARGETING_IDE=='0'"> ! ! <option name="USE_UTIL"> ! <values>0,1</values> ! <default-value>$(USE_UTIL_DEFAULT)</default-value> ! <description>Does the wxLua utilities should be compiled ?</description> ! </option> ! <option name="USE_APPS"> ! <values>0,1</values> ! <default-value>$(USE_APPS_DEFAULT)</default-value> ! <description>Should the wxLua applications be compiled ?</description> ! </option> ! ! </if> ! ! <if cond="TARGETING_IDE=='1'"> ! ! <!-- IDEs are less flexible; we have to set these as variables with the default ! values --> ! <set var="USE_UTIL">$(USE_UTIL_DEFAULT)</set> ! <set var="USE_APPS">$(USE_APPS_DEFAULT)</set> </if> --- 49,57 ---- --> ! <if cond="TARGETING_WIN32=='1'"> ! <set var="VARS_DONT_ELIMINATE" append="1"> ! WX_DIR WX_VERSION WX_SHARED USE_WXLUASOCKETLIB USE_WXLUADEBUGLIB ! USE_BIN2C USE_WXLUAAPP USE_WXLUAEDITAPP ! </set> </if> *************** *** 74,89 **** - <if cond="TARGETING_WIN32=='1'"> - <set var="dummy1"><if cond="WX_DIR=='dummy'">AAA</if></set> - <set var="dummy2"><if cond="WX_VERSION=='dummy'">AAA</if></set> - <set var="dummy3"><if cond="WX_SHARED=='dummy'">AAA</if></set> - <set var="dummy4"><if cond="USE_WXLUASOCKETLIB=='dummy'">AAA</if></set> - <set var="dummy5"><if cond="USE_WXLUADEBUGLIB=='dummy'">AAA</if></set> - <set var="dummy6"><if cond="USE_BIN2C=='dummy'">AAA</if></set> - <set var="dummy7"><if cond="USE_WXLUAAPP=='dummy'">AAA</if></set> - <set var="dummy8"><if cond="USE_WXLUAEDITAPP=='dummy'">AAA</if></set> - </if> - - <!-- ================================================================== --> <!-- The utils --> --- 59,62 ---- *************** *** 123,126 **** --- 96,103 ---- <!-- ================================================================== --> + <pkgconfig id="pkgconfig" cond="FORMAT=='autoconf'"> + <files>build/autoconf/wxlua.pc</files> + </pkgconfig> + <!-- <action id="docs"> |
From: Francesco M. <fr...@us...> - 2006-01-23 19:38:43
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24398/apps/wxlua/src Modified Files: lconsole.cpp Log Message: updated bakefiles Index: lconsole.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/lconsole.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lconsole.cpp 29 Nov 2005 05:57:12 -0000 1.3 --- lconsole.cpp 23 Jan 2006 19:38:29 -0000 1.4 *************** *** 118,122 **** --- 118,124 ---- m_pApp(pApp), m_fError(false) { + #ifdef __WXMSW__ pApp->SetLuaConsole(this); + #endif SetIcon(wxICON(LUA)); *************** *** 148,152 **** --- 150,156 ---- void wxLuaConsole::OnCloseWindow(wxCloseEvent&) { + #ifdef __WXMSW__ m_pApp->SetLuaConsole(NULL); + #endif Destroy(); if (m_fError) |
From: Francesco M. <fr...@us...> - 2006-01-23 19:38:43
|
Update of /cvsroot/wxlua/wxLua/util/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24398/util/build/bakefiles Modified Files: util.bkl Log Message: updated bakefiles Index: util.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/build/bakefiles/util.bkl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** util.bkl 24 Nov 2005 21:34:16 -0000 1.4 --- util.bkl 23 Jan 2006 19:38:30 -0000 1.5 *************** *** 15,20 **** <include file="../../../build/bakefiles/wxluabase.bkl"/> - <!-- required for copy-files tag --> - <using module="datafiles"/> <!-- ================================================================== --> --- 15,18 ---- *************** *** 25,28 **** --- 23,27 ---- <include file="options.bkl"/> + <!-- ================================================================== --> <!-- VARIABLES --> *************** *** 37,41 **** </if> <set var="SRCDIR">$(UTIL_BASEDIR)</set> ! <set var="BUILDDIR">$(FORMAT)</set> <!-- ================================================================== --> --- 36,40 ---- </if> <set var="SRCDIR">$(UTIL_BASEDIR)</set> ! <!-- ================================================================== --> *************** *** 45,49 **** <!-- our utilities --> <exe id="util_bin2c" cond="USE_BIN2C=='1'"> ! <exename>bin2c</exename> <dirname>$(UTIL_BASEDIR)$(DIRSEP)..$(DIRSEP)bin</dirname> <sources>bin2c/bin2c.c</sources> --- 44,48 ---- <!-- our utilities --> <exe id="util_bin2c" cond="USE_BIN2C=='1'"> ! <exename>bin2c</exename> <dirname>$(UTIL_BASEDIR)$(DIRSEP)..$(DIRSEP)bin</dirname> <sources>bin2c/bin2c.c</sources> |
From: Francesco M. <fr...@us...> - 2006-01-23 19:38:43
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24398/apps/build/bakefiles Modified Files: apps.bkl Log Message: updated bakefiles Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** apps.bkl 28 Dec 2005 23:02:49 -0000 1.13 --- apps.bkl 23 Jan 2006 19:38:29 -0000 1.14 *************** *** 69,81 **** </if> ! <!-- Libraries must be put in the reverse order they'll be loaded --> <wxlua-lib>wxluasocket</wxlua-lib> <wxlua-lib>wxluadebug</wxlua-lib> - <wxlua-lib>wxbind</wxlua-lib> <wxlua-lib>wxlua</wxlua-lib> <wxlua-lib>lua</wxlua-lib> - <wx-lib>stc</wx-lib> - <wx-lib>xrc</wx-lib> <wx-lib>html</wx-lib> --- 69,79 ---- </if> ! <!-- Libraries must be put in this EXACT order ! --> <wxlua-lib>wxluasocket</wxlua-lib> <wxlua-lib>wxluadebug</wxlua-lib> <wxlua-lib>wxlua</wxlua-lib> + <wxlua-lib>wxbind</wxlua-lib> <wxlua-lib>lua</wxlua-lib> <wx-lib>xrc</wx-lib> <wx-lib>html</wx-lib> *************** *** 86,90 **** <wx-lib>core</wx-lib> <wx-lib>base</wx-lib> - </exe> --- 84,87 ---- *************** *** 134,138 **** <wx-lib>core</wx-lib> <wx-lib>base</wx-lib> ! </exe> --- 131,135 ---- <wx-lib>core</wx-lib> <wx-lib>base</wx-lib> ! </exe> |
From: Francesco M. <fr...@us...> - 2006-01-23 19:38:43
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24398/build/autoconf Modified Files: aclocal.m4 autoconf_inc.m4 configure.ac wxpresets.m4 Added Files: wxlua.pc.in Log Message: updated bakefiles Index: wxpresets.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/wxpresets.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxpresets.m4 26 Nov 2005 14:06:05 -0000 1.2 --- wxpresets.m4 23 Jan 2006 19:38:29 -0000 1.3 *************** *** 1,4 **** --- 1,5 ---- dnl --------------------------------------------------------------------------- dnl Author: Francesco Montorsi + dnl (contributions by David Hart) dnl Creation date: 13/9/2005 dnl RCS-ID: $Id$ *************** *** 53,56 **** --- 54,87 ---- dnl --------------------------------------------------------------------------- + dnl AM_SAVE_COREVAR() + dnl + dnl Saves the CPPFLAGS, CXXFLAGS, CFLAGS and LIBS variables in some helper + dnl variables which are used to restore them later (see AM_RESTORE_COREVAR) + dnl --------------------------------------------------------------------------- + AC_DEFUN([AM_SAVE_COREVAR], + [ + SAVED_CPPFLAGS="$CPPFLAGS" + SAVED_CXXFLAGS="$CXXFLAGS" + SAVED_CFLAGS="$CFLAGS" + SAVED_LIBS="$LIBS" + ]) + + + dnl --------------------------------------------------------------------------- + dnl AM_RESTORE_COREVAR() + dnl + dnl Loads into the CPPFLAGS, CXXFLAGS, CFLAGS and LIBS variables the values + dnl of the helper variables set by AM_SAVE_COREVAR + dnl --------------------------------------------------------------------------- + AC_DEFUN([AM_RESTORE_COREVAR], + [ + CPPFLAGS="$SAVED_CPPFLAGS" + CXXFLAGS="$SAVED_CXXFLAGS" + CFLAGS="$SAVED_CFLAGS" + LIBS="$SAVED_LIBS" + ]) + + + dnl --------------------------------------------------------------------------- dnl AM_WXFLAGS_CONTAIN / AM_WXSELECTEDCONFIG_CONTAIN ([RESULTVAR], [STRING]) dnl *************** *** 473,479 **** dnl --------------------------------------------------------------------------- ! dnl AM_WXPRESETS([minimum-wx-version], [addwxlibraries]) dnl dnl where "addwxlibraries" are those wxWidgets libraries (when wx is built --- 504,534 ---- + dnl --------------------------------------------------------------------------- + dnl AM_GET_GTK_FLAGS + dnl + dnl When using the wxGTK port, this macro creates a GTKPKG_FLAGS variable that + dnl contains the c flags (-I and -D flags) required to compile a program which + dnl uses directly the GTK libraries (instead using the wx layer). + dnl --------------------------------------------------------------------------- + AC_DEFUN([AM_GET_GTK_FLAGS], + [ + if test "$WX_PORT" = "gtk" ; then + dnl The commands below were taken from usenet postings by John Labenski + dnl NB Trying to do GTKPKG_FLAGS=`gtk-config --cflags` fails, you have + dnl to use an intermediate var + if test "$WX_GTKPORT_VERSION" = "1" ; then + _GTKPKG_FL="gtk-config --cflags" + GTKPKG_FLAGS=`$_GTKPKG_FL` + else + _GTKPKG_FL="pkg-config --cflags gtk+-2.0" + GTKPKG_FLAGS=`$_GTKPKG_FL` + fi + fi + ]) + + dnl --------------------------------------------------------------------------- ! dnl AM_WXPRESETS([minimum-wx-version], [addwxlibraries], [addgtkflags]) dnl dnl where "addwxlibraries" are those wxWidgets libraries (when wx is built *************** *** 482,488 **** dnl dnl Just a convenience macro for - dnl AM_OPTIONS_WXCONFIG dnl AM_PATH_WXCONFIG([minimum-wx-version], [], [], [addwxlibraries]) dnl AM_WXPRESETS_CHECK dnl macros. dnl --------------------------------------------------------------------------- --- 537,543 ---- dnl dnl Just a convenience macro for dnl AM_PATH_WXCONFIG([minimum-wx-version], [], [], [addwxlibraries]) dnl AM_WXPRESETS_CHECK + dnl AM_GET_GTK_FLAGS (only when addgtkflags != '') dnl macros. dnl --------------------------------------------------------------------------- *************** *** 527,530 **** --- 582,597 ---- dnl Synch our WX_DEBUG,WX_UNICODE,WX_SHARED variables with wx ones AM_WXPRESETS_CHECK + + dnl It doesn't matter what "gtkaddflags" parameter contains, + dnl if it's non-empty it's true + if test -n "$3" ; then + dnl Add gtk-specific flags (useful when compiling wx sources + dnl that directly use the GTK libraries) + AM_GET_GTK_FLAGS + + dnl Update global flags + CXXFLAGS="$CXXFLAGS $GTKPKG_FLAGS" + CFLAGS="$CFLAGS $GTKPKG_FLAGS" + fi ]) *************** *** 532,536 **** dnl --------------------------------------------------------------------------- ! dnl AM_WXPRESETS_FULL([minimum-wx-version], [addwxlibraries]) dnl dnl Like AM_WXPRESETS but this macro also does those standard checks --- 599,603 ---- dnl --------------------------------------------------------------------------- ! dnl AM_WXPRESETS_FULL([minimum-wx-version], [addwxlibraries], [addgtkflags]) dnl dnl Like AM_WXPRESETS but this macro also does those standard checks *************** *** 560,567 **** dnl check for wxWidgets library and initialization of WX_* variables ! AM_WXPRESETS([$1], [$2]) dnl add the optimize/debug flags - dnl FIXME: unsure if these are right also for compilers other than GCC dnl NOTE1: these checks must be put after AM_WXPRESETS (which sets the $WX_* variables)... dnl NOTE2: the CXXFLAGS are merged together with the CPPFLAGS so we don't need to set them, too --- 627,633 ---- dnl check for wxWidgets library and initialization of WX_* variables ! AM_WXPRESETS([$1], [$2], [$3]) dnl add the optimize/debug flags dnl NOTE1: these checks must be put after AM_WXPRESETS (which sets the $WX_* variables)... dnl NOTE2: the CXXFLAGS are merged together with the CPPFLAGS so we don't need to set them, too *************** *** 632,633 **** --- 698,700 ---- ]) + Index: autoconf_inc.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/autoconf_inc.m4,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** autoconf_inc.m4 25 Nov 2005 23:06:10 -0000 1.3 --- autoconf_inc.m4 23 Jan 2006 19:38:29 -0000 1.4 *************** *** 2,9 **** dnl dnl This macro was generated by ! dnl Bakefile 0.1.9 (http://bakefile.sourceforge.net) dnl Do not modify, all changes will be overwritten! ! BAKEFILE_AUTOCONF_INC_M4_VERSION="0.1.9" dnl ### begin block 20_COND_DEPS_TRACKING_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### --- 2,9 ---- dnl dnl This macro was generated by ! dnl Bakefile 0.2.0 (http://bakefile.sourceforge.net) dnl Do not modify, all changes will be overwritten! ! BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.0" dnl ### begin block 20_COND_DEPS_TRACKING_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl,./wxlua.bkl] ### Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** configure.ac 26 Nov 2005 14:20:30 -0000 1.4 --- configure.ac 23 Jan 2006 19:38:29 -0000 1.5 *************** *** 58,61 **** --- 58,68 ---- + # Global wxLua options: + # we could use these to define options like --enable-all-apps or --enable-all-utils + # but these would be rather uncommon options in Unix world and thus we'll leave these + # options fixed to their default values + USE_UTIL=1 + USE_APPS=1 + AM_OPTIONS_WXCONFIG # don't touch this macro *************** *** 69,73 **** ##################################################################### ! AM_WXPRESETS_FULL([2.4.0], []) --- 76,80 ---- ##################################################################### ! AM_WXPRESETS_FULL([2.4.0], [xrc,html,media,adv,net,xml]) *************** *** 78,82 **** AC_BAKEFILE([m4_include(autoconf_inc.m4)]) ! AC_CONFIG_FILES([Makefile modules/Makefile apps/Makefile util/Makefile]) AC_OUTPUT --- 85,89 ---- AC_BAKEFILE([m4_include(autoconf_inc.m4)]) ! AC_CONFIG_FILES([Makefile modules/Makefile apps/Makefile util/Makefile build/autoconf/wxlua.pc]) AC_OUTPUT --- NEW FILE: wxlua.pc.in --- prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ # the include paths required to build something wxLua-based includepaths=${includedir} libpaths=${libdir} libs="wxlua" Name: @PACKAGE_NAME@ Description: wxWidgets lua wrappers Version: @PACKAGE_VERSION@ Libs: -L${libdir} -lwxlua Cflags: -I${includedir} # in reality, wxLua requires wxWidgets; however wxWidgets does not # uses pkg-config utility and thus we cannot list it here; # so, you'll need to use `wx-config --cxxflags` and `wx-config --libs` # commands for the additional compiler & linker flags required. Requires: Index: aclocal.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/aclocal.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** aclocal.m4 26 Nov 2005 14:06:05 -0000 1.2 --- aclocal.m4 23 Jan 2006 19:38:29 -0000 1.3 *************** *** 301,305 **** [ #ifndef __INTEL_COMPILER ! #error Not icc #endif ], --- 301,305 ---- [ #ifndef __INTEL_COMPILER ! #error Not ICC #endif ], *************** *** 657,660 **** --- 657,662 ---- GCC_PCH=0 + ICC_PCH=0 + USE_PCH=0 case ${BAKEFILE_HOST} in *************** *** 681,685 **** #if (__GNUC__ == 3) && \ ((!defined(__APPLE_CC__) && (__GNUC_MINOR__ < 4)) || \ ! ( defined(__APPLE_CC__) && (__GNUC_MINOR__ < 3))) #error "no pch support" #endif --- 683,688 ---- #if (__GNUC__ == 3) && \ ((!defined(__APPLE_CC__) && (__GNUC_MINOR__ < 4)) || \ ! ( defined(__APPLE_CC__) && (__GNUC_MINOR__ < 3))) || \ ! ( defined(__INTEL_COMPILER) ) #error "no pch support" #endif *************** *** 690,696 **** ], [ ! AC_MSG_RESULT([no]) ]) ! if test $GCC_PCH = 1 ; then AC_BAKEFILE_CREATE_FILE_BK_MAKE_PCH chmod +x bk-make-pch --- 693,713 ---- ], [ ! AC_TRY_COMPILE([], ! [ ! #if !defined(__INTEL_COMPILER) || \ ! (__INTEL_COMPILER < 900) ! #error "no pch support" ! #endif ! ], ! [ ! AC_MSG_RESULT([yes]) ! ICC_PCH=1 ! ], ! [ ! AC_MSG_RESULT([no]) ! ]) ]) ! if test $GCC_PCH = 1 -o $ICC_PCH = 1 ; then ! USE_PCH=1 AC_BAKEFILE_CREATE_FILE_BK_MAKE_PCH chmod +x bk-make-pch *************** *** 700,703 **** --- 717,721 ---- AC_SUBST(GCC_PCH) + AC_SUBST(ICC_PCH) ]) *************** *** 730,733 **** --- 748,755 ---- if test "x$BAKEFILE_HOST" = "x"; then + if test "x${host}" = "x" ; then + AC_MSG_ERROR([You must call the autoconf "CANONICAL_HOST" macro in your configure.ac (or .in) file.]) + fi + BAKEFILE_HOST="${host}" fi *************** *** 745,749 **** AC_BAKEFILE_RES_COMPILERS ! BAKEFILE_BAKEFILE_M4_VERSION="0.1.9" dnl includes autoconf_inc.m4: --- 767,771 ---- AC_BAKEFILE_RES_COMPILERS ! BAKEFILE_BAKEFILE_M4_VERSION="0.2.0" dnl includes autoconf_inc.m4: *************** *** 1478,1484 **** shift ! compiler= ! headerfile= while test ${D}{#} -gt 0; do case "${D}{1}" in -I* ) --- 1500,1508 ---- shift ! compiler="" ! headerfile="" ! while test ${D}{#} -gt 0; do + add_to_cmdline=1 case "${D}{1}" in -I* ) *************** *** 1488,1498 **** fi ;; esac ! compiler="${D}{compiler} ${D}{1}" shift done if test "x${D}{headerfile}" = "x" ; then ! echo "error: can't find header ${D}{header} in include paths" >2 else if test -f ${D}{outfile} ; then --- 1512,1528 ---- fi ;; + -use-pch ) + shift + add_to_cmdline=0 + ;; esac ! if test ${D}add_to_cmdline = 1 ; then ! compiler="${D}{compiler} ${D}{1}" ! fi shift done if test "x${D}{headerfile}" = "x" ; then ! echo "error: can't find header ${D}{header} in include paths" >&2 else if test -f ${D}{outfile} ; then *************** *** 1503,1508 **** depsfile=".deps/\`echo ${D}{outfile} | tr '/.' '__'\`.d" mkdir -p .deps ! # can do this because gcc is >= 3.4: ! ${D}{compiler} -o ${D}{outfile} -MMD -MF "${D}{depsfile}" "${D}{headerfile}" exit ${D}{?} fi --- 1533,1551 ---- depsfile=".deps/\`echo ${D}{outfile} | tr '/.' '__'\`.d" mkdir -p .deps ! if test "x${GCC_PCH}" = "x1" ; then ! # can do this because gcc is >= 3.4: ! ${D}{compiler} -o ${D}{outfile} -MMD -MF "${D}{depsfile}" "${D}{headerfile}" ! elif test "x${ICC_PCH}" = "x1" ; then ! filename=pch_gen-${D}${D} ! file=${D}{filename}.c ! dfile=${D}{filename}.d ! cat > ${D}file <<EOT ! #include "${D}header" ! EOT ! # using -MF icc complains about differing command lines in creation/use ! ${D}compiler -c -create-pch ${D}outfile -MMD ${D}file && \\ ! sed -e "s,^.*:,${D}outfile:," -e "s, ${D}file,," < ${D}dfile > ${D}depsfile && \\ ! rm -f ${D}file ${D}dfile ${D}{filename}.o ! fi exit ${D}{?} fi |
From: Francesco M. <fr...@us...> - 2006-01-23 19:38:43
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24398 Modified Files: Makefile.in configure Log Message: updated bakefiles Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.in 20 Nov 2005 11:35:17 -0000 1.4 --- Makefile.in 23 Jan 2006 19:38:28 -0000 1.5 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.0 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 11,14 **** --- 11,18 ---- exec_prefix = @exec_prefix@ INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_DIR = @INSTALL_DIR@ + srcdir = @srcdir@ + libdir = @libdir@ ### Variables: ### *************** *** 26,39 **** install: all ! (cd ./util/ && $(MAKE) install) ! (cd ./modules/ && $(MAKE) install) ! (cd ./apps/ && $(MAKE) install) uninstall: install-strip: install - (cd ./util/ && $(MAKE) install-strip) - (cd ./modules/ && $(MAKE) install-strip) - (cd ./apps/ && $(MAKE) install-strip) clean: --- 30,40 ---- install: all ! $(INSTALL_DIR) $(DESTDIR)$(libdir)/pkgconfig ! (cd $(srcdir)/ ; $(INSTALL_DATA) build/autoconf/wxlua.pc $(DESTDIR)$(libdir)/pkgconfig) uninstall: + (cd $(DESTDIR)$(libdir)/pkgconfig ; rm -f wxlua.pc) install-strip: install clean: Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** configure 26 Nov 2005 14:20:30 -0000 1.4 --- configure 23 Jan 2006 19:38:29 -0000 1.5 *************** *** 948,952 **** echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi ! cd $ac_popdir done fi --- 948,952 ---- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi ! cd "$ac_popdir" done fi *************** *** 1362,1365 **** --- 1362,1375 ---- + + + + + + + + + + ac_aux_dir= for ac_dir in build/autoconf $srcdir/build/autoconf; do *************** *** 1517,1520 **** --- 1527,1537 ---- + # Global wxLua options: + # we could use these to define options like --enable-all-apps or --enable-all-utils + # but these would be rather uncommon options in Unix world and thus we'll leave these + # options fixed to their default values + USE_UTIL=1 + USE_APPS=1 + *************** *** 2679,2684 **** echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 --- 2696,2700 ---- echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 *************** *** 2738,2743 **** echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 --- 2754,2758 ---- echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 *************** *** 2855,2860 **** echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 --- 2870,2874 ---- echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 *************** *** 2910,2915 **** echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 --- 2924,2928 ---- echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 *************** *** 2956,2961 **** echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 --- 2969,2973 ---- echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 *************** *** 3001,3006 **** echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 --- 3013,3017 ---- echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 *************** *** 3186,3191 **** echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_cxx_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 --- 3197,3201 ---- echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 *************** *** 3245,3250 **** echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_cxx_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 --- 3255,3259 ---- echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 *************** *** 3317,3322 **** echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_cxx_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 --- 3326,3330 ---- echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 *************** *** 3362,3367 **** echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_cxx_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 --- 3370,3374 ---- echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 *************** *** 3751,3755 **** fi ! WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $WXCFG_FLAGS ,core,base" WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null` --- 3758,3762 ---- fi ! WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $WXCFG_FLAGS xrc,html,media,adv,net,xml,core,base" WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null` *************** *** 4497,4502 **** ! if [ "$WX_DEBUG" = "1" ]; then CXXFLAGS="$CXXFLAGS -g -O0 -Wall -Wundef -Wno-ctor-dtor-privacy" --- 4504,4526 ---- + if test -n "" ; then + + if test "$WX_PORT" = "gtk" ; then + if test "$WX_GTKPORT_VERSION" = "1" ; then + _GTKPKG_FL="gtk-config --cflags" + GTKPKG_FLAGS=`$_GTKPKG_FL` + else + _GTKPKG_FL="pkg-config --cflags gtk+-2.0" + GTKPKG_FLAGS=`$_GTKPKG_FL` + fi + fi + + + CXXFLAGS="$CXXFLAGS $GTKPKG_FLAGS" + CFLAGS="$CFLAGS $GTKPKG_FLAGS" + fi ! ! if [ "$WX_DEBUG" = "1" ]; then CXXFLAGS="$CXXFLAGS -g -O0 -Wall -Wundef -Wno-ctor-dtor-privacy" *************** *** 4519,4522 **** --- 4543,4552 ---- if test "x$BAKEFILE_HOST" = "x"; then + if test "x${host}" = "x" ; then + { { echo "$as_me:$LINENO: error: You must call the autoconf \"CANONICAL_HOST\" macro in your configure.ac (or .in) file." >&5 + echo "$as_me: error: You must call the autoconf \"CANONICAL_HOST\" macro in your configure.ac (or .in) file." >&2;} + { (exit 1); exit 1; }; } + fi + BAKEFILE_HOST="${host}" fi *************** *** 5232,5236 **** #ifndef __INTEL_COMPILER ! #error Not icc #endif --- 5262,5266 ---- #ifndef __INTEL_COMPILER ! #error Not ICC #endif *************** *** 5248,5253 **** echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_cxx_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 --- 5278,5282 ---- echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 *************** *** 5425,5430 **** echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_cxx_werror_flag" ! || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 --- 5454,5458 ---- echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 *************** *** 6428,6435 **** ! BAKEFILE_BAKEFILE_M4_VERSION="0.1.9" ! BAKEFILE_AUTOCONF_INC_M4_VERSION="0.1.9" COND_DEPS_TRACKING_0="#" --- 6456,6463 ---- ! BAKEFILE_BAKEFILE_M4_VERSION="0.2.0" ! BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.0" COND_DEPS_TRACKING_0="#" *************** *** 6557,6561 **** fi ! ac_config_files="$ac_config_files Makefile modules/Makefile apps/Makefile util/Makefile" cat >confcache <<\_ACEOF --- 6585,6589 ---- fi ! ac_config_files="$ac_config_files Makefile modules/Makefile apps/Makefile util/Makefile build/autoconf/wxlua.pc" cat >confcache <<\_ACEOF *************** *** 7114,7117 **** --- 7142,7146 ---- "apps/Makefile" ) CONFIG_FILES="$CONFIG_FILES apps/Makefile" ;; "util/Makefile" ) CONFIG_FILES="$CONFIG_FILES util/Makefile" ;; + "build/autoconf/wxlua.pc" ) CONFIG_FILES="$CONFIG_FILES build/autoconf/wxlua.pc" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} *************** *** 7472,7480 **** esac - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 - echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: --- 7501,7504 ---- *************** *** 7515,7518 **** --- 7539,7548 ---- esac done` || { (exit 1); exit 1; } + + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF |
From: Francesco M. <fr...@us...> - 2006-01-23 19:38:43
|
Update of /cvsroot/wxlua/wxLua/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24398/util Modified Files: Makefile.in Log Message: updated bakefiles Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/Makefile.in,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.in 23 Nov 2005 06:03:40 -0000 1.5 --- Makefile.in 23 Jan 2006 19:38:30 -0000 1.6 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.0 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 24,28 **** UTIL_BIN2C_CFLAGS = $(CPPFLAGS) $(CFLAGS) UTIL_BIN2C_OBJECTS = \ ! autoconf/util_bin2c_bin2c.o ### Conditionally set variables: ### --- 24,28 ---- UTIL_BIN2C_CFLAGS = $(CPPFLAGS) $(CFLAGS) UTIL_BIN2C_OBJECTS = \ ! util_bin2c_bin2c.o ### Conditionally set variables: ### *************** *** 32,36 **** @COND_USE_BIN2C_1@__util_bin2c___depname = ./../bin/bin2c$(EXEEXT) @COND_PLATFORM_MAC_1@__util_bin2c___mac_setfilecmd = \ ! @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL bin2c$(EXEEXT) ### Targets: ### --- 32,36 ---- @COND_USE_BIN2C_1@__util_bin2c___depname = ./../bin/bin2c$(EXEEXT) @COND_PLATFORM_MAC_1@__util_bin2c___mac_setfilecmd = \ ! @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ./../bin/bin2c$(EXEEXT) ### Targets: ### *************** *** 45,50 **** clean: ! rm -rf autoconf/.deps autoconf/.pch ! rm -f autoconf/*.o rm -f ./../bin/bin2c$(EXEEXT) --- 45,50 ---- clean: ! rm -rf ./.deps ./.pch ! rm -f ./*.o rm -f ./../bin/bin2c$(EXEEXT) *************** *** 57,61 **** @COND_USE_BIN2C_1@ $(__util_bin2c___mac_setfilecmd) ! autoconf/util_bin2c_bin2c.o: ./bin2c/bin2c.c $(CCC) -c -o $@ $(UTIL_BIN2C_CFLAGS) ./bin2c/bin2c.c --- 57,61 ---- @COND_USE_BIN2C_1@ $(__util_bin2c___mac_setfilecmd) ! util_bin2c_bin2c.o: ./bin2c/bin2c.c $(CCC) -c -o $@ $(UTIL_BIN2C_CFLAGS) ./bin2c/bin2c.c |
From: Francesco M. <fr...@us...> - 2006-01-23 19:38:43
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24398/modules/build/bakefiles Modified Files: modules.bkl Log Message: updated bakefiles Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** modules.bkl 24 Nov 2005 21:34:16 -0000 1.10 --- modules.bkl 23 Jan 2006 19:38:30 -0000 1.11 *************** *** 6,10 **** <!-- ====================================================================== --> ! <!-- WXLUA BAKEFILE --> <!-- --> <!-- The bakefile used to build all the modules. --> --- 6,10 ---- <!-- ====================================================================== --> ! <!-- WXLUA MODULES BAKEFILE --> <!-- --> <!-- The bakefile used to build all the modules. --> *************** *** 13,46 **** <makefile> ! <!-- This is a bakefile, that is, a generic template used to --> ! <!-- generate makefiles ALL supported compilers. --> ! <!-- To use this project file type something like: --> ! <!-- bakefile -fmsvc modules.bkl --> ! <!-- See http://bakefile.sourceforge.net for more info. --> ! ! <!-- This file contains the wxLua template --> <include file="../../../build/bakefiles/wxluabase.bkl"/> <!-- ================================================================== --> ! <!-- SOURCE LIST --> <!-- ================================================================== --> ! <!-- This one contains the lists of all source & header files --> ! <include file="sources.bkl"/> ! <!-- ================================================================== --> ! <!-- VARIABLES --> ! <!-- ================================================================== --> - <!-- All the source files & header files linked above are relative to our base dir --> - <if cond="FORMAT!='autoconf'"><set var="WXLUA_MODULEDIR">..$(DIRSEP)..</set></if> - <if cond="FORMAT=='autoconf'"><set var="WXLUA_MODULEDIR">.</set></if> - <set var="WXLUA_BASEDIR">$(WXLUA_MODULEDIR)$(DIRSEP)..</set> - <!-- Put all the objects files generated by --> - <!-- the compilation in a subfolder of BUILD --> - <if cond="FORMAT!='autoconf'"><set var="BUILDDIR">$(FORMAT)$(WXLUA_LIBPOSTFIX)</set></if> --- 13,52 ---- <makefile> ! <!-- This file contains the wxLua template --> <include file="../../../build/bakefiles/wxluabase.bkl"/> <!-- ================================================================== --> ! <!-- SOURCES and HEADERS LIST --> <!-- ================================================================== --> ! <!-- All the source files & header files linked above are relative to our base dir --> ! <if cond="FORMAT!='autoconf'"><set var="WXLUA_MODULEDIR">../..</set></if> ! <if cond="FORMAT=='autoconf'"><set var="WXLUA_MODULEDIR">.</set></if> ! <set var="WXLUA_BASEDIR">$(WXLUA_MODULEDIR)/..</set> + <!-- all the sources listed into sources.bkl contain path relative to our MODULES dir --> + <set var="SRCDIR">$(WXLUA_MODULEDIR)</set> ! <!-- the ldllmain.c file must be excluded ! --> ! <set var="LUA_SRC">$(fileList('lua/src/*.c', '*dll*'))</set> ! <set var="LUA_HDR">$(fileList('lua/include/*.h'))</set> ! ! <set var="LUALIB_SRC">$(fileList('lua/src/lib/*.c'))</set> ! <set var="LUALIB_HDR">$(fileList('lua/src/lib/*.h'))</set> ! ! <set var="WXBIND_SRC">$(fileList('wxbind/src/*.cpp'))</set> ! <set var="WXBIND_HDR">$(fileList('wxbind/include/*.h'))</set> ! ! <set var="WXLUA_SRC">$(fileList('wxlua/src/*.cpp'))</set> ! <set var="WXLUA_HDR">$(fileList('wxlua/include/*.h'))</set> ! ! <set var="WXLUADEBUG_SRC">$(fileList('wxluadebug/src/*.cpp'))</set> ! <set var="WXLUADEBUG_HDR">$(fileList('wxluadebug/include/*.h'))</set> ! ! <set var="WXLUASOCKET_SRC">$(fileList('wxluasocket/src/*.cpp'))</set> ! <set var="WXLUASOCKET_HDR">$(fileList('wxluasocket/include/*.h'))</set> *************** *** 61,64 **** --- 67,73 ---- <template> <dirname>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_LIBOUTPUT_FOLDER)</dirname> + <install-to>$(LIBDIR)</install-to> + <headers-install-to>$(INCLUDEDIR)</headers-install-to> + <set var="__modname"/> </template> *************** *** 67,79 **** <set var="__modnamelow">$(__modname.lower())</set> - <set var="__modsrc">$(mk.evalExpr('$(' + __modnamelow + '_src)'))</set> - <set var="__modhdr">$(mk.evalExpr('$(' + __modnamelow + '_hdr)'))</set> - <libname>$(__modnamelow)</libname> ! <sources>$(__modsrc)</sources> ! <headers>$(__modhdr)</headers> ! <!-- This is required because wxbind.h refers to wx contrib section, too --> ! <if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)$(DIRSEP)contrib$(DIRSEP)include</include></if> <!-- to make MSVC6PRJ output look better... --> --- 76,85 ---- <set var="__modnamelow">$(__modname.lower())</set> <libname>$(__modnamelow)</libname> ! <sources>$(mk.evalExpr('$(' + value + '_SRC)'))</sources> ! <headers>$(mk.evalExpr('$(' + value + '_HDR)'))</headers> ! <!-- This is required because wxbind.h refers to wx contrib section, too --> ! <if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)$(DIRSEP)contrib$(DIRSEP)include</include></if> <!-- to make MSVC6PRJ output look better... --> *************** *** 86,89 **** --- 92,97 ---- <template> <dirname>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_DLLOUTPUT_FOLDER)</dirname> + <install-to>$(LIBDIR)</install-to> + <headers-install-to>$(INCLUDEDIR)</headers-install-to> <!-- The DLL version --> *************** *** 105,117 **** <set var="__modnamelow">$(__modname.lower())</set> - <set var="__modsrc">$(mk.evalExpr('$(' + __modnamelow + '_src)'))</set> - <set var="__modhdr">$(mk.evalExpr('$(' + __modnamelow + '_hdr)'))</set> - <libname>$(__modnamelow)</libname> ! <sources>$(__modsrc)</sources> ! <headers>$(__modhdr)</headers> ! <!-- This is required because wxbind.h refers to wx contrib section, too --> ! <if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)$(DIRSEP)contrib$(DIRSEP)include</include></if> <!-- to make MSVC6PRJ output look better... --> --- 113,122 ---- <set var="__modnamelow">$(__modname.lower())</set> <libname>$(__modnamelow)</libname> ! <sources>$(mk.evalExpr('$(' + value + '_SRC)'))</sources> ! <headers>$(mk.evalExpr('$(' + value + '_HDR)'))</headers> ! <!-- This is required because wxbind.h refers to wx contrib section, too --> ! <if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)$(DIRSEP)contrib$(DIRSEP)include</include></if> <!-- to make MSVC6PRJ output look better... --> *************** *** 120,135 **** <!-- now, shared stuff --> ! <define>A2D$(__modname)MAKINGDLL</define> </define-tag> </define-rule> <!-- ================================================================== --> <!-- AUXILIARY TARGETS --> <!-- ================================================================== --> ! <if cond="TARGETING_IDE=='0' and TARGETING_WIN32=='1'"> ! <!-- the two folders where output will be stored --> <mkdir id="setuplibdir"> <dependency-of>all</dependency-of> --- 125,141 ---- <!-- now, shared stuff --> ! <define>$(value)_MAKINGDLL</define> </define-tag> </define-rule> + <!-- ================================================================== --> <!-- AUXILIARY TARGETS --> <!-- ================================================================== --> ! <if cond="TARGETING_IDE=='0' and TARGETING_WIN32=='1'"> ! <!-- the two folders where output will be stored --> <mkdir id="setuplibdir"> <dependency-of>all</dependency-of> *************** *** 140,166 **** <dir>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_DLLOUTPUT_FOLDER)</dir> </mkdir> - </if> <!-- ================================================================== --> <!-- The list of wxLua MODULES --> ! <!-- --> ! <!-- NOTE: the 'mod_' prefix in the ID is mainly because in this way the --> ! <!-- DSP files generated by this bakefile makes clear for the user what --> ! <!-- is a module, what is an app (since app bakefile uses 'app_' prefix) --> ! <!-- and what is a util... --> <!-- ================================================================== --> - <!-- all the sources listed into sources.bkl contain path relative to our MODULES dir --> - <set var="SRCDIR">$(WXLUA_MODULEDIR)</set> - <!-- lua must always be built inconditionally in static mode NOTE: we won't use the lua_lib rule since the LUA module does not follow the same conventions followed by other modules... --> ! <lib id="mod_lua_lib"> <define>WXLUA_CODE</define> ! <sources>$(lua_src) $(lualib_src)</sources> ! <headers>(lua_hdr) $(lualib_hdr)</headers> <include>$(WXLUA_MODULEDIR)$(DIRSEP)lua$(DIRSEP)include</include> <dirname>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_LIBOUTPUT_FOLDER)</dirname> --- 146,169 ---- <dir>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_DLLOUTPUT_FOLDER)</dir> </mkdir> + </if> <!-- ================================================================== --> <!-- The list of wxLua MODULES --> ! <!-- --> ! <!-- NOTE: the 'mod_' prefix in the ID is mainly because in this way the --> ! <!-- DSP files generated by this bakefile makes clear for the user what --> ! <!-- is a module, what is an app (since app bakefile uses 'app_' prefix) --> ! <!-- and what is a util... --> <!-- ================================================================== --> <!-- lua must always be built inconditionally in static mode NOTE: we won't use the lua_lib rule since the LUA module does not follow the same conventions followed by other modules... --> ! <lib id="mod_lua_lib" template="wxbase"> <define>WXLUA_CODE</define> ! <sources>$(LUA_SRC) $(LUALIB_SRC)</sources> ! <headers>(LUA_HDR) $(LUALIB_HDR)</headers> <include>$(WXLUA_MODULEDIR)$(DIRSEP)lua$(DIRSEP)include</include> <dirname>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_LIBOUTPUT_FOLDER)</dirname> *************** *** 170,174 **** <!-- this is the lua app NOTE: like for lua_lib we don't use any wxLua-project-specific rule here --> ! <exe id="mod_lua"> <library>mod_lua_lib</library> <sources>lua/src/lua/lua.c</sources> --- 173,177 ---- <!-- this is the lua app NOTE: like for lua_lib we don't use any wxLua-project-specific rule here --> ! <exe id="mod_lua" template="wxbase"> <library>mod_lua_lib</library> <sources>lua/src/lua/lua.c</sources> *************** *** 223,231 **** <set var="MSVC6PRJ_MERGED_TARGETS"> mod_wxlua=wxlua_lib+wxlua_dll ! mod_wxbind=wxbind_lib+wxbind_dll ! mod_wxluadebug=wxluadebug_lib+wxluadebug_dll ! mod_wxluasocket=wxluasocket_lib+wxluasocket_dll </set> - </makefile> --- 226,233 ---- <set var="MSVC6PRJ_MERGED_TARGETS"> mod_wxlua=wxlua_lib+wxlua_dll ! mod_wxbind=wxbind_lib+wxbind_dll ! mod_wxluadebug=wxluadebug_lib+wxluadebug_dll ! mod_wxluasocket=wxluasocket_lib+wxluasocket_dll </set> </makefile> |
From: Francesco M. <fr...@us...> - 2006-01-23 19:38:43
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24398/modules/wxbind/src Modified Files: wxluasetup.h Log Message: updated bakefiles Index: wxluasetup.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxluasetup.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxluasetup.h 23 Jan 2006 04:38:29 -0000 1.1 --- wxluasetup.h 23 Jan 2006 19:38:30 -0000 1.2 *************** *** 97,101 **** #define wxLUA_USE_wxStatusBar 1 #define wxLUA_USE_wxStringList 1 ! #define wxLUA_USE_wxStyledTextCtrl 1 #define wxLUA_USE_wxSystemSettings 1 #define wxLUA_USE_wxTabCtrl 1 --- 97,101 ---- #define wxLUA_USE_wxStatusBar 1 #define wxLUA_USE_wxStringList 1 ! #define wxLUA_USE_wxStyledTextCtrl 0 #define wxLUA_USE_wxSystemSettings 1 #define wxLUA_USE_wxTabCtrl 1 |
From: Francesco M. <fr...@us...> - 2006-01-23 19:38:43
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24398/modules/wxlua/src Modified Files: wxlbind.cpp wxlstate.cpp Log Message: updated bakefiles Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** wxlstate.cpp 19 Jan 2006 03:49:37 -0000 1.20 --- wxlstate.cpp 23 Jan 2006 19:38:30 -0000 1.21 *************** *** 1272,1276 **** { wxCHECK_RET(Ok() && pObject, wxT("Invalid wxLuaState or wxObject to track")); ! M_WXLSTATEDATA->m_pTrackedList->Put((int)pObject, pObject); } --- 1272,1276 ---- { wxCHECK_RET(Ok() && pObject, wxT("Invalid wxLuaState or wxObject to track")); ! M_WXLSTATEDATA->m_pTrackedList->Put((long)pObject, pObject); } *************** *** 1285,1289 **** wxCHECK_MSG(Ok() && pObject, false, wxT("Invalid wxLuaState or object")) ! wxObject *pDeleteObject = M_WXLSTATEDATA->m_pTrackedList->Delete((int) pObject); bool result = pDeleteObject != NULL; --- 1285,1289 ---- wxCHECK_MSG(Ok() && pObject, false, wxT("Invalid wxLuaState or object")) ! wxObject *pDeleteObject = M_WXLSTATEDATA->m_pTrackedList->Delete((long) pObject); bool result = pDeleteObject != NULL; *************** *** 2124,2128 **** if (wxlsData) { ! wxHashTable *pHashTable = (wxHashTable *) wxlsData->m_pDerivedList->Get((int) pObject); if (pHashTable != NULL) { --- 2124,2128 ---- if (wxlsData) { ! wxHashTable *pHashTable = (wxHashTable *) wxlsData->m_pDerivedList->Get((long) pObject); if (pHashTable != NULL) { *************** *** 2142,2146 **** if (wxlsData) { ! wxHashTable *pHashTable = (wxHashTable *) wxlsData->m_pDerivedList->Get((int) pObject); if (pHashTable != NULL) { --- 2142,2146 ---- if (wxlsData) { ! wxHashTable *pHashTable = (wxHashTable *) wxlsData->m_pDerivedList->Get((long) pObject); if (pHashTable != NULL) { Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxlbind.cpp 30 Dec 2005 04:35:59 -0000 1.12 --- wxlbind.cpp 23 Jan 2006 19:38:30 -0000 1.13 *************** *** 44,48 **** if ((pClass != NULL) && lua_isuserdata(L, 1) && (lua_islightuserdata(L, 1) == 0) && (wxlState.ttag(1) == *pClass->class_tag)) { ! wxHashTable *pHashTable = (wxHashTable *) wxlState.GetLuaStateRefData()->m_pDerivedList->Delete((int)wxlState.ttouserdata(1, true)); if (pHashTable != NULL) delete pHashTable; --- 44,49 ---- if ((pClass != NULL) && lua_isuserdata(L, 1) && (lua_islightuserdata(L, 1) == 0) && (wxlState.ttag(1) == *pClass->class_tag)) { ! wxHashTable *pHashTable = (wxHashTable *) wxlState.GetLuaStateRefData()-> ! m_pDerivedList->Delete((long)wxlState.ttouserdata(1, true)); if (pHashTable != NULL) delete pHashTable; *************** *** 169,173 **** bool fCreated = false; ! wxHashTable *pHashTable = (wxHashTable *) wxlState.GetLuaStateRefData()->m_pDerivedList->Get((int) pObject); if (pHashTable == NULL) { --- 170,174 ---- bool fCreated = false; ! wxHashTable *pHashTable = (wxHashTable *) wxlState.GetLuaStateRefData()->m_pDerivedList->Get((long) pObject); if (pHashTable == NULL) { *************** *** 177,181 **** pHashTable->DeleteContents(true); ! wxlState.GetLuaStateRefData()->m_pDerivedList->Put((int) pObject, pHashTable); fCreated = true; } --- 178,182 ---- pHashTable->DeleteContents(true); ! wxlState.GetLuaStateRefData()->m_pDerivedList->Put((long) pObject, pHashTable); fCreated = true; } |
From: Francesco M. <fr...@us...> - 2006-01-23 19:38:42
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24398/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat modules_mod_lua.dsp modules_mod_lua_lib.dsp modules_mod_wxbind.dsp modules_mod_wxlua.dsp modules_mod_wxluadebug.dsp modules_mod_wxluasocket.dsp Log Message: updated bakefiles Index: modules_mod_lua_lib.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_lua_lib.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** modules_mod_lua_lib.dsp 25 Nov 2005 22:29:08 -0000 1.3 --- modules_mod_lua_lib.dsp 23 Jan 2006 19:38:30 -0000 1.4 *************** *** 8,21 **** !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_lua_lib.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_lua_lib.mak" CFG="mod_lua_lib - Win32 Release" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "mod_lua_lib - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_lua_lib - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library") --- 8,21 ---- !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_lua_lib.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_lua_lib.mak" CFG="mod_lua_lib - Win32 Release" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "mod_lua_lib - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_lua_lib - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library") *************** *** 26,30 **** !MESSAGE "mod_lua_lib - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_lua_lib - Win32 Release" (based on "Win32 (x86) Static Library") ! !MESSAGE # Begin Project --- 26,30 ---- !MESSAGE "mod_lua_lib - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_lua_lib - Win32 Release" (based on "Win32 (x86) Static Library") ! !MESSAGE # Begin Project *************** *** 38,52 **** # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\lib\vc_lib" # PROP BASE Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\lib\vc_lib" # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 38,52 ---- # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\lib\vc_libud" # PROP BASE Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\lib\vc_libud" # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 55,60 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 DLL Unicode Release" --- 55,60 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libud\lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libud\lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 DLL Unicode Release" *************** *** 62,75 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\lib\vc_lib" # PROP BASE Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\lib\vc_lib" # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 62,75 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\lib\vc_libu" # PROP BASE Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\lib\vc_libu" # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_libu\lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_libu\lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 78,98 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 DLL Debug" # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\lib\vc_lib" # PROP BASE Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\lib\vc_lib" # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 78,98 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libu\lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libu\lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 DLL Debug" # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\lib\vc_libd" # PROP BASE Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\lib\vc_libd" # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libd\lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libd\lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 101,106 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 DLL Release" --- 101,106 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libd\lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libd\lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 DLL Release" *************** *** 116,121 **** # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 116,121 ---- # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 130,144 **** # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\lib\vc_lib" # PROP BASE Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\lib\vc_lib" # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 130,144 ---- # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\lib\vc_libud" # PROP BASE Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\lib\vc_libud" # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 147,152 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 Unicode Release" --- 147,152 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libud\lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libud\lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 Unicode Release" *************** *** 154,167 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\lib\vc_lib" # PROP BASE Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\lib\vc_lib" # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 154,167 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\lib\vc_libu" # PROP BASE Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\lib\vc_libu" # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_libu\lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_libu\lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 170,190 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 Debug" # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\lib\vc_lib" # PROP BASE Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\lib\vc_lib" # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 170,190 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libu\lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libu\lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 Debug" # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\lib\vc_libd" # PROP BASE Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\lib\vc_libd" # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libd\lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libd\lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 193,198 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 Release" --- 193,198 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libd\lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libd\lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 Release" *************** *** 208,213 **** # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 208,213 ---- # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 236,348 **** # Begin Source File ! SOURCE=..\..\lua\src\lapi.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lib\lauxlib.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lib\lbaselib.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lcode.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lib\ldblib.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\ldebug.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\ldo.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\ldump.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lfunc.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lgc.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lib\liolib.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\llex.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lib\lmathlib.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lmem.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lib\loadlib.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lobject.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lopcodes.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lparser.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lstate.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lstring.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lib\lstrlib.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\ltable.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lib\ltablib.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\ltests.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\ltm.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lundump.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lvm.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lzio.c # End Source File # End Group --- 236,348 ---- # Begin Source File ! SOURCE=../..\lua\src\lapi.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lib\lauxlib.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lib\lbaselib.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lcode.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lib\ldblib.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\ldebug.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\ldo.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\ldump.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lfunc.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lgc.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lib\liolib.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\llex.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lib\lmathlib.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lmem.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lib\loadlib.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lobject.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lopcodes.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lparser.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lstate.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lstring.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lib\lstrlib.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\ltable.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lib\ltablib.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\ltests.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\ltm.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lundump.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lvm.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lzio.c # End Source File # End Group Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** makefile.bcc 29 Nov 2005 23:52:11 -0000 1.16 --- makefile.bcc 23 Jan 2006 19:38:30 -0000 1.17 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.0 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! [...1529 lines suppressed...] *************** *** 857,864 **** $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.obj: ..\..\wxluasocket\src\wxlhandl.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxlsock.obj: ..\..\wxluasocket\src\wxlsock.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** --- 891,898 ---- $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxldserv.obj: ..\..\wxluasocket\src\wxldserv.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxluasocket_dll_dservice.obj: ..\..\wxluasocket\src\dservice.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** Index: modules_mod_wxlua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_wxlua.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** modules_mod_wxlua.dsp 25 Nov 2005 22:29:08 -0000 1.3 --- modules_mod_wxlua.dsp 23 Jan 2006 19:38:30 -0000 1.4 *************** *** 9,22 **** !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxlua.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxlua.mak" CFG="mod_wxlua - Win32 Release" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "mod_wxlua - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxlua - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library") --- 9,22 ---- !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxlua.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxlua.mak" CFG="mod_wxlua - Win32 Release" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "mod_wxlua - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxlua - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library") *************** *** 27,31 **** !MESSAGE "mod_wxlua - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxlua - Win32 Release" (based on "Win32 (x86) Static Library") ! !MESSAGE # Begin Project --- 27,31 ---- !MESSAGE "mod_wxlua - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxlua - Win32 Release" (based on "Win32 (x86) Static Library") ! !MESSAGE # Begin Project *************** *** 40,63 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "A2DWXLUAMAKINGDLL" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "A2DWXLUAMAKINGDLL" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "A2DWXLUAMAKINGDLL" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "A2DWXLUAMAKINGDLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "WXUSINGDLL" /i "$(WXWIN)\contrib\include" /d A2DWXLUAMAKINGDLL ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "WXUSINGDLL" /i "$(WXWIN)\contrib\include" /d A2DWXLUAMAKINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxmsw26ud_adv.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua.lib" /debug ! # ADD LINK32 wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxmsw26ud_adv.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Unicode Release" --- 40,63 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\lib\vc_dllud" # PROP BASE Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\lib\vc_dllud" # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dllud\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dllud\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i "$(WXWIN)\contrib\include" /d "WXLUA_MAKINGDLL" /d _DEBUG ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i "$(WXWIN)\contrib\include" /d "WXLUA_MAKINGDLL" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase27ud.lib wxmsw27ud_core.lib wxbase27ud_xml.lib wxmsw27ud_adv.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dllud\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllud" /implib:"..\..\..\lib\vc_dllud\wxlua.lib" /debug ! # ADD LINK32 wxbase27ud.lib wxmsw27ud_core.lib wxbase27ud_xml.lib wxmsw27ud_adv.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib 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 oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dllud\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllud" /implib:"..\..\..\lib\vc_dllud\wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Unicode Release" *************** *** 65,88 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "msvc6prju\mod_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "A2DWXLUAMAKINGDLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "A2DWXLUAMAKINGDLL" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "A2DWXLUAMAKINGDLL" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "A2DWXLUAMAKINGDLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "WXUSINGDLL" /i "$(WXWIN)\contrib\include" /d A2DWXLUAMAKINGDLL ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "WXUSINGDLL" /i "$(WXWIN)\contrib\include" /d A2DWXLUAMAKINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxmsw26u_adv.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua.lib" ! # ADD LINK32 wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxmsw26u_adv.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Debug" --- 65,88 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\lib\vc_dllu" # PROP BASE Intermediate_Dir "msvc6prju\mod_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\lib\vc_dllu" # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dllu\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dllu\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i "$(WXWIN)\contrib\include" /d WXLUA_MAKINGDLL ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i "$(WXWIN)\contrib\include" /d WXLUA_MAKINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase27u.lib wxmsw27u_core.lib wxbase27u_xml.lib wxmsw27u_adv.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dllu\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllu" /implib:"..\..\..\lib\vc_dllu\wxlua.lib" ! # ADD LINK32 wxbase27u.lib wxmsw27u_core.lib wxbase27u_xml.lib wxmsw27u_adv.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib 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 oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dllu\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllu" /implib:"..\..\..\lib\vc_dllu\wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Debug" *************** *** 90,113 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "A2DWXLUAMAKINGDLL" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "A2DWXLUAMAKINGDLL" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "A2DWXLUAMAKINGDLL" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "A2DWXLUAMAKINGDLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "WXUSINGDLL" /i "$(WXWIN)\contrib\include" /d A2DWXLUAMAKINGDLL ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "WXUSINGDLL" /i "$(WXWIN)\contrib\include" /d A2DWXLUAMAKINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxmsw26d_adv.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua.lib" /debug ! # ADD LINK32 wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxmsw26d_adv.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Release" --- 90,113 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\lib\vc_dlld" # PROP BASE Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\lib\vc_dlld" # PROP Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dlld\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dlld\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i "$(WXWIN)\contrib\include" /d "WXLUA_MAKINGDLL" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i "$(WXWIN)\contrib\include" /d "WXLUA_MAKINGDLL" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase27d.lib wxmsw27d_core.lib wxbase27d_xml.lib wxmsw27d_adv.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dlld\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dlld" /implib:"..\..\..\lib\vc_dlld\wxlua.lib" /debug ! # ADD LINK32 wxbase27d.lib wxmsw27d_core.lib wxbase27d_xml.lib wxmsw27d_adv.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dlld\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dlld" /implib:"..\..\..\lib\vc_dlld\wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Release" *************** *** 123,138 **** # PROP Intermediate_Dir "msvc6prj\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "A2DWXLUAMAKINGDLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "A2DWXLUAMAKINGDLL" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "A2DWXLUAMAKINGDLL" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "A2DWXLUAMAKINGDLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "WXUSINGDLL" /i "$(WXWIN)\contrib\include" /d A2DWXLUAMAKINGDLL ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "WXUSINGDLL" /i "$(WXWIN)\contrib\include" /d A2DWXLUAMAKINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26.lib wxmsw26_core.lib wxbase26_xml.lib wxmsw26_adv.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua.lib" ! # ADD LINK32 wxbase26.lib wxmsw26_core.lib wxbase26_xml.lib wxmsw26_adv.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Unicode Debug" --- 123,138 ---- # PROP Intermediate_Dir "msvc6prj\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i "$(WXWIN)\contrib\include" /d WXLUA_MAKINGDLL ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i "$(WXWIN)\contrib\include" /d WXLUA_MAKINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase27.lib wxmsw27_core.lib wxbase27_xml.lib wxmsw27_adv.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua.lib" ! # ADD LINK32 wxbase27.lib wxmsw27_core.lib wxbase27_xml.lib wxmsw27_adv.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Unicode Debug" *************** *** 140,153 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\lib\vc_lib" # PROP BASE Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\lib\vc_lib" # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 140,153 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\lib\vc_libud" # PROP BASE Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\lib\vc_libud" # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 156,161 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Unicode Release" --- 156,161 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libud\wxlua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libud\wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Unicode Release" *************** *** 163,176 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\lib\vc_lib" # PROP BASE Intermediate_Dir "msvc6prju\mod_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\lib\vc_lib" # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 163,176 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\lib\vc_libu" # PROP BASE Intermediate_Dir "msvc6prju\mod_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\lib\vc_libu" # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_libu\wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_libu\wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 179,184 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Debug" --- 179,184 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libu\wxlua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libu\wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Debug" *************** *** 186,199 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\lib\vc_lib" # PROP BASE Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\lib\vc_lib" # PROP Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 186,199 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\lib\vc_libd" # PROP BASE Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\lib\vc_libd" # PROP Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libd\wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libd\wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 202,207 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Release" --- 202,207 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libd\wxlua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libd\wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Release" *************** *** 217,222 **** # PROP Intermediate_Dir "msvc6prj\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 217,222 ---- # PROP Intermediate_Dir "msvc6prj\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 245,265 **** # Begin Source File ! SOURCE=..\..\wxlua\src\internal.cpp # End Source File # Begin Source File ! SOURCE=..\..\wxlua\src\wxlbind.cpp # End Source File # Begin Source File ! SOURCE=..\..\wxlua\src\wxlcallb.cpp # End Source File # Begin Source File ! SOURCE=..\..\wxlua\src\wxlintrp.cpp # End Source File # Begin Source File ! SOURCE=..\..\wxlua\src\wxlstate.cpp # End Source File # End Group --- 245,265 ---- # Begin Source File ! SOURCE=../..\wxlua\src\internal.cpp # End Source File # Begin Source File ! SOURCE=../..\wxlua\src\wxlbind.cpp # End Source File # Begin Source File ! SOURCE=../..\wxlua\src\wxlcallb.cpp # End Source File # Begin Source File ! SOURCE=../..\wxlua\src\wxlintrp.cpp # End Source File # Begin Source File ! SOURCE=../..\wxlua\src\wxlstate.cpp # End Source File # End Group *************** *** 269,297 **** # Begin Source File ! SOURCE=..\..\wxlua\include\internal.h # End Source File # Begin Source File ! SOURCE=..\..\wxlua\include\wxlbind.h # End Source File # Begin Source File ! SOURCE=..\..\wxlua\include\wxlcallb.h # End Source File # Begin Source File ! SOURCE=..\..\wxlua\include\wxldefs.h # End Source File # Begin Source File ! SOURCE=..\..\wxlua\include\wxlintrp.h # End Source File # Begin Source File ! SOURCE=..\..\wxlua\include\wxlstate.h # End Source File # Begin Source File ! SOURCE=..\..\wxlua\include\wxlua.h # End Source File # End Group --- 269,297 ---- # Begin Source File ! SOURCE=../..\wxlua\include\internal.h # End Source File # Begin Source File ! SOURCE=../..\wxlua\include\wxlbind.h # End Source File # Begin Source File ! SOURCE=../..\wxlua\include\wxlcallb.h # End Source File # Begin Source File ! SOURCE=../..\wxlua\include\wxldefs.h # End Source File # Begin Source File ! SOURCE=../..\wxlua\include\wxlintrp.h # End Source File # Begin Source File ! SOURCE=../..\wxlua\include\wxlstate.h # End Source File # Begin Source File ! SOURCE=../..\wxlua\include\wxlua.h # End Source File # End Group Index: modules_mod_wxbind.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_wxbind.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** modules_mod_wxbind.dsp 25 Nov 2005 22:29:08 -0000 1.3 --- modules_mod_wxbind.dsp 23 Jan 2006 19:38:30 -0000 1.4 *************** *** 9,22 **** !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxbind.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxbind.mak" CFG="mod_wxbind - Win32 Release" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "mod_wxbind - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxbind - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library") --- 9,22 ---- !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxbind.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxbind.mak" CFG="mod_wxbind - Win32 Release" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "mod_wxbind - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxbind - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library") *************** *** 27,31 **** !MESSAGE "mod_wxbind - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxbind - Win32 Release" (based on "Win32 (x86) Static Library") ! !MESSAGE # Begin Project --- 27,31 ---- !MESSAGE "mod_wxbind - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxbind - Win32 Release" (based on "Win32 (x86) Static Library") ! !MESSAGE # Begin Project *************** *** 40,63 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "msvc6prjud\mod_wxbind" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "msvc6prjud\mod_wxbind" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxbind_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "A2DWXBINDMAKINGDLL" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxbind_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "A2DWXBINDMAKINGDLL" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "A2DWXBINDMAKINGDLL" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "A2DWXBINDMAKINGDLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG... [truncated message content] |
From: Francesco M. <fr...@us...> - 2006-01-23 19:38:42
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24398/modules/wxluadebug/src Modified Files: staktree.cpp Log Message: updated bakefiles Index: staktree.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/staktree.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** staktree.cpp 7 Dec 2005 05:53:30 -0000 1.12 --- staktree.cpp 23 Jan 2006 19:38:30 -0000 1.13 *************** *** 323,327 **** { m_nCurrentSel = nCurrentSel; ! int nEntry = (int) m_stackComboBox->GetClientData(nCurrentSel); if (m_pServer != NULL) --- 323,327 ---- { m_nCurrentSel = nCurrentSel; ! int nEntry = (long) m_stackComboBox->GetClientData(nCurrentSel); if (m_pServer != NULL) |
From: Francesco M. <fr...@us...> - 2006-01-23 19:38:42
|
Update of /cvsroot/wxlua/wxLua/util/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24398/util/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat util.dsp Log Message: updated bakefiles Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/build/msw/makefile.vc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** makefile.vc 23 Nov 2005 06:03:40 -0000 1.5 --- makefile.vc 23 Jan 2006 19:38:30 -0000 1.6 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.0 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 24,33 **** --- 24,37 ---- # Use DLL build of wx library to use? [0,1] + # 1 - DLL WX_SHARED = 0 # Compile Unicode build of wxWidgets? [0,1] + # 1 - Unicode WX_UNICODE = 0 # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] + # 0 - Release + # 1 - Debug WX_DEBUG = 1 *************** *** 45,49 **** UTIL_BIN2C_CFLAGS = /MD /DWIN32 $(CPPFLAGS) $(CFLAGS) UTIL_BIN2C_OBJECTS = \ ! msvc\util_bin2c_bin2c.obj ### Conditionally set variables: ### --- 49,53 ---- UTIL_BIN2C_CFLAGS = /MD /DWIN32 $(CPPFLAGS) $(CFLAGS) UTIL_BIN2C_OBJECTS = \ ! msvc$(WXLIBPOSTFIX)\util_bin2c_bin2c.obj ### Conditionally set variables: ### *************** *** 52,60 **** __util_bin2c___depname = ..\..\..\bin\bin2c.exe !endif ! all: msvc ! msvc: ! -if not exist msvc mkdir msvc ### Targets: ### --- 56,73 ---- __util_bin2c___depname = ..\..\..\bin\bin2c.exe !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" + WXLIBPOSTFIX = u + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" + WXLIBPOSTFIX = d + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" + WXLIBPOSTFIX = ud + !endif ! all: msvc$(WXLIBPOSTFIX) ! msvc$(WXLIBPOSTFIX): ! -if not exist msvc$(WXLIBPOSTFIX) mkdir msvc$(WXLIBPOSTFIX) ### Targets: ### *************** *** 63,69 **** clean: ! -if exist msvc\*.obj del msvc\*.obj ! -if exist msvc\*.res del msvc\*.res ! -if exist msvc\*.pch del msvc\*.pch -if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe -if exist ..\..\..\bin\bin2c.ilk del ..\..\..\bin\bin2c.ilk --- 76,82 ---- clean: ! -if exist msvc$(WXLIBPOSTFIX)\*.obj del msvc$(WXLIBPOSTFIX)\*.obj ! -if exist msvc$(WXLIBPOSTFIX)\*.res del msvc$(WXLIBPOSTFIX)\*.res ! -if exist msvc$(WXLIBPOSTFIX)\*.pch del msvc$(WXLIBPOSTFIX)\*.pch -if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe -if exist ..\..\..\bin\bin2c.ilk del ..\..\..\bin\bin2c.ilk *************** *** 77,81 **** !endif ! msvc\util_bin2c_bin2c.obj: ..\..\bin2c\bin2c.c $(CC) /c /nologo /TC /Fo$@ $(UTIL_BIN2C_CFLAGS) $** --- 90,94 ---- !endif ! msvc$(WXLIBPOSTFIX)\util_bin2c_bin2c.obj: ..\..\bin2c\bin2c.c $(CC) /c /nologo /TC /Fo$@ $(UTIL_BIN2C_CFLAGS) $** Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/build/msw/makefile.bcc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** makefile.bcc 23 Nov 2005 06:03:40 -0000 1.5 --- makefile.bcc 23 Jan 2006 19:38:30 -0000 1.6 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.0 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 70,74 **** UTIL_BIN2C_CFLAGS = -I$(BCCDIR)\include $(CPPFLAGS) $(CFLAGS) UTIL_BIN2C_OBJECTS = \ ! borland\util_bin2c_bin2c.obj ### Conditionally set variables: ### --- 70,74 ---- UTIL_BIN2C_CFLAGS = -I$(BCCDIR)\include $(CPPFLAGS) $(CFLAGS) UTIL_BIN2C_OBJECTS = \ ! borland$(WXLIBPOSTFIX)\util_bin2c_bin2c.obj ### Conditionally set variables: ### *************** *** 77,85 **** __util_bin2c___depname = ..\..\..\bin\bin2c.exe !endif ! all: borland ! borland: ! -if not exist borland mkdir borland ### Targets: ### --- 77,94 ---- __util_bin2c___depname = ..\..\..\bin\bin2c.exe !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" + WXLIBPOSTFIX = u + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" + WXLIBPOSTFIX = d + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" + WXLIBPOSTFIX = ud + !endif ! all: borland$(WXLIBPOSTFIX) ! borland$(WXLIBPOSTFIX): ! -if not exist borland$(WXLIBPOSTFIX) mkdir borland$(WXLIBPOSTFIX) ### Targets: ### *************** *** 88,94 **** clean: ! -if exist borland\*.obj del borland\*.obj ! -if exist borland\*.res del borland\*.res ! -if exist borland\*.csm del borland\*.csm -if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe -if exist ..\..\..\bin\bin2c.tds del ..\..\..\bin\bin2c.tds --- 97,103 ---- clean: ! -if exist borland$(WXLIBPOSTFIX)\*.obj del borland$(WXLIBPOSTFIX)\*.obj ! -if exist borland$(WXLIBPOSTFIX)\*.res del borland$(WXLIBPOSTFIX)\*.res ! -if exist borland$(WXLIBPOSTFIX)\*.csm del borland$(WXLIBPOSTFIX)\*.csm -if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe -if exist ..\..\..\bin\bin2c.tds del ..\..\..\bin\bin2c.tds *************** *** 105,109 **** !endif ! borland\util_bin2c_bin2c.obj: ..\..\bin2c\bin2c.c $(CC) -q -c -P- -o$@ $(UTIL_BIN2C_CFLAGS) $** --- 114,118 ---- !endif ! borland$(WXLIBPOSTFIX)\util_bin2c_bin2c.obj: ..\..\bin2c\bin2c.c $(CC) -q -c -P- -o$@ $(UTIL_BIN2C_CFLAGS) $** Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/build/msw/makefile.gcc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** makefile.gcc 23 Nov 2005 06:03:40 -0000 1.5 --- makefile.gcc 23 Jan 2006 19:38:30 -0000 1.6 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.0 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 46,50 **** UTIL_BIN2C_CFLAGS = $(CPPFLAGS) $(CFLAGS) UTIL_BIN2C_OBJECTS = \ ! mingw\util_bin2c_bin2c.o ### Conditionally set variables: ### --- 46,50 ---- UTIL_BIN2C_CFLAGS = $(CPPFLAGS) $(CFLAGS) UTIL_BIN2C_OBJECTS = \ ! mingw$(WXLIBPOSTFIX)\util_bin2c_bin2c.o ### Conditionally set variables: ### *************** *** 53,61 **** __util_bin2c___depname = ..\..\..\bin\bin2c.exe endif ! all: mingw ! mingw: ! -if not exist mingw mkdir mingw ### Targets: ### --- 53,76 ---- __util_bin2c___depname = ..\..\..\bin\bin2c.exe endif + ifeq ($(WX_DEBUG),0) + ifeq ($(WX_UNICODE),1) + WXLIBPOSTFIX = u + endif + endif + ifeq ($(WX_DEBUG),1) + ifeq ($(WX_UNICODE),0) + WXLIBPOSTFIX = d + endif + endif + ifeq ($(WX_DEBUG),1) + ifeq ($(WX_UNICODE),1) + WXLIBPOSTFIX = ud + endif + endif ! all: mingw$(WXLIBPOSTFIX) ! mingw$(WXLIBPOSTFIX): ! -if not exist mingw$(WXLIBPOSTFIX) mkdir mingw$(WXLIBPOSTFIX) ### Targets: ### *************** *** 64,69 **** clean: ! -if exist mingw\*.o del mingw\*.o ! -if exist mingw\*.d del mingw\*.d -if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe --- 79,84 ---- clean: ! -if exist mingw$(WXLIBPOSTFIX)\*.o del mingw$(WXLIBPOSTFIX)\*.o ! -if exist mingw$(WXLIBPOSTFIX)\*.d del mingw$(WXLIBPOSTFIX)\*.d -if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe *************** *** 73,77 **** endif ! mingw\util_bin2c_bin2c.o: ../../bin2c/bin2c.c $(CC) -c -o $@ $(UTIL_BIN2C_CFLAGS) $(CPPDEPS) $< --- 88,92 ---- endif ! mingw$(WXLIBPOSTFIX)\util_bin2c_bin2c.o: ../../bin2c/bin2c.c $(CC) -c -o $@ $(UTIL_BIN2C_CFLAGS) $(CPPDEPS) $< *************** *** 80,82 **** # Dependencies tracking: ! -include mingw/*.d --- 95,97 ---- # Dependencies tracking: ! -include mingw$(WXLIBPOSTFIX)/*.d Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/build/msw/makefile.wat,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** makefile.wat 23 Nov 2005 06:03:40 -0000 1.5 --- makefile.wat 23 Jan 2006 19:38:30 -0000 1.6 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.0 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 24,33 **** --- 24,37 ---- # Use DLL build of wx library to use? [0,1] + # 1 - DLL WX_SHARED = 0 # Compile Unicode build of wxWidgets? [0,1] + # 1 - Unicode WX_UNICODE = 0 # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] + # 0 - Release + # 1 - Debug WX_DEBUG = 1 *************** *** 62,65 **** --- 66,85 ---- __util_bin2c___depname = ..\..\..\bin\bin2c.exe !endif + WXLIBPOSTFIX = + !ifeq WX_DEBUG 0 + !ifeq WX_UNICODE 1 + WXLIBPOSTFIX = u + !endif + !endif + !ifeq WX_DEBUG 1 + !ifeq WX_UNICODE 0 + WXLIBPOSTFIX = d + !endif + !endif + !ifeq WX_DEBUG 1 + !ifeq WX_UNICODE 1 + WXLIBPOSTFIX = ud + !endif + !endif ### Variables: ### *************** *** 67,76 **** UTIL_BIN2C_CFLAGS = $(CPPFLAGS) $(CFLAGS) UTIL_BIN2C_OBJECTS = & ! watcom\util_bin2c_bin2c.obj ! all : watcom ! watcom : ! -if not exist watcom mkdir watcom ### Targets: ### --- 87,96 ---- UTIL_BIN2C_CFLAGS = $(CPPFLAGS) $(CFLAGS) UTIL_BIN2C_OBJECTS = & ! watcom$(WXLIBPOSTFIX)\util_bin2c_bin2c.obj ! all : watcom$(WXLIBPOSTFIX) ! watcom$(WXLIBPOSTFIX) : ! -if not exist watcom$(WXLIBPOSTFIX) mkdir watcom$(WXLIBPOSTFIX) ### Targets: ### *************** *** 79,103 **** clean : .SYMBOLIC ! -if exist watcom\*.obj del watcom\*.obj ! -if exist watcom\*.res del watcom\*.res ! -if exist watcom\*.lbc del watcom\*.lbc ! -if exist watcom\*.ilk del watcom\*.ilk ! -if exist watcom\*.pch del watcom\*.pch -if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe !ifeq USE_BIN2C 1 ..\..\..\bin\bin2c.exe : $(UTIL_BIN2C_OBJECTS) ! @%create watcom\util_bin2c.lbc ! @%append watcom\util_bin2c.lbc option quiet ! @%append watcom\util_bin2c.lbc name $^@ ! @%append watcom\util_bin2c.lbc option caseexact ! @%append watcom\util_bin2c.lbc $(LDFLAGS) ! @for %i in ($(UTIL_BIN2C_OBJECTS)) do @%append watcom\util_bin2c.lbc file %i ! @for %i in () do @%append watcom\util_bin2c.lbc library %i ! @%append watcom\util_bin2c.lbc ! wlink @watcom\util_bin2c.lbc !endif ! watcom\util_bin2c_bin2c.obj : .AUTODEPEND ..\..\bin2c\bin2c.c ! $(CC) -zq -fo=$^@ $(UTIL_BIN2C_CFLAGS) $< --- 99,123 ---- clean : .SYMBOLIC ! -if exist watcom$(WXLIBPOSTFIX)\*.obj del watcom$(WXLIBPOSTFIX)\*.obj ! -if exist watcom$(WXLIBPOSTFIX)\*.res del watcom$(WXLIBPOSTFIX)\*.res ! -if exist watcom$(WXLIBPOSTFIX)\*.lbc del watcom$(WXLIBPOSTFIX)\*.lbc ! -if exist watcom$(WXLIBPOSTFIX)\*.ilk del watcom$(WXLIBPOSTFIX)\*.ilk ! -if exist watcom$(WXLIBPOSTFIX)\*.pch del watcom$(WXLIBPOSTFIX)\*.pch -if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe !ifeq USE_BIN2C 1 ..\..\..\bin\bin2c.exe : $(UTIL_BIN2C_OBJECTS) ! @%create watcom$(WXLIBPOSTFIX)\util_bin2c.lbc ! @%append watcom$(WXLIBPOSTFIX)\util_bin2c.lbc option quiet ! @%append watcom$(WXLIBPOSTFIX)\util_bin2c.lbc name $^@ ! @%append watcom$(WXLIBPOSTFIX)\util_bin2c.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\util_bin2c.lbc $(LDFLAGS) ! @for %i in ($(UTIL_BIN2C_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\util_bin2c.lbc file %i ! @for %i in () do @%append watcom$(WXLIBPOSTFIX)\util_bin2c.lbc library %i ! @%append watcom$(WXLIBPOSTFIX)\util_bin2c.lbc ! wlink @watcom$(WXLIBPOSTFIX)\util_bin2c.lbc !endif ! watcom$(WXLIBPOSTFIX)\util_bin2c_bin2c.obj : .AUTODEPEND ..\..\bin2c\bin2c.c ! $(CC) -bt=nt -zq -fo=$^@ $(UTIL_BIN2C_CFLAGS) $< Index: util.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/build/msw/util.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** util.dsp 25 Nov 2005 22:29:08 -0000 1.3 --- util.dsp 23 Jan 2006 19:38:30 -0000 1.4 *************** *** 8,21 **** !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "util.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "util.mak" CFG="util_bin2c - Win32 Release" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "util_bin2c - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application") !MESSAGE "util_bin2c - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application") --- 8,21 ---- !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "util.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "util.mak" CFG="util_bin2c - Win32 Release" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "util_bin2c - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application") !MESSAGE "util_bin2c - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application") *************** *** 26,30 **** !MESSAGE "util_bin2c - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE "util_bin2c - Win32 Release" (based on "Win32 (x86) Console Application") ! !MESSAGE # Begin Project --- 26,30 ---- !MESSAGE "util_bin2c - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE "util_bin2c - Win32 Release" (based on "Win32 (x86) Console Application") ! !MESSAGE # Begin Project *************** *** 40,49 **** # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prj\util_bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prj\util_bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c --- 40,49 ---- # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prjud\util_bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prjud\util_bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c *************** *** 63,72 **** # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prj\util_bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prj\util_bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c --- 63,72 ---- # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prju\util_bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prju\util_bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c *************** *** 86,95 **** # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prj\util_bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prj\util_bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c --- 86,95 ---- # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prjd\util_bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prjd\util_bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c *************** *** 132,141 **** # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prj\util_bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prj\util_bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c --- 132,141 ---- # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prjud\util_bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prjud\util_bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c *************** *** 155,164 **** # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prj\util_bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prj\util_bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c --- 155,164 ---- # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prju\util_bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prju\util_bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c *************** *** 178,187 **** # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prj\util_bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prj\util_bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c --- 178,187 ---- # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prjd\util_bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prjd\util_bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c |
From: Francesco M. <fr...@us...> - 2006-01-23 19:38:42
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24398/modules Modified Files: Makefile.in Log Message: updated bakefiles Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Makefile.in 25 Nov 2005 19:45:36 -0000 1.13 --- Makefile.in 23 Jan 2006 19:38:29 -0000 1.14 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.0 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! [...1370 lines suppressed...] wxluasocket_dll_wxldtarg.o: ./wxluasocket/src/wxldtarg.cpp $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) ./wxluasocket/src/wxldtarg.cpp ! wxluasocket_dll_wxldserv.o: ./wxluasocket/src/wxldserv.cpp ! $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) ./wxluasocket/src/wxldserv.cpp ! wxluasocket_dll_dservice.o: ./wxluasocket/src/dservice.cpp ! $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) ./wxluasocket/src/dservice.cpp *************** *** 766,768 **** @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean --- 911,913 ---- @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_wxlua_lib uninstall_wxlua_lib install_wxlua_dll uninstall_wxlua_dll install_wxbind_lib uninstall_wxbind_lib install_wxbind_dll uninstall_wxbind_dll install_wxluadebug_lib uninstall_wxluadebug_lib install_wxluadebug_dll uninstall_wxluadebug_dll install_wxluasocket_lib uninstall_wxluasocket_lib install_wxluasocket_dll uninstall_wxluasocket_dll |
From: Francesco M. <fr...@us...> - 2006-01-23 19:38:42
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24398/apps Modified Files: Makefile.in Log Message: updated bakefiles Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile.in 28 Dec 2005 23:02:48 -0000 1.12 --- Makefile.in 23 Jan 2006 19:38:29 -0000 1.13 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.2.0 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 12,16 **** INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ ! RESCOMP = @RESCOMP@ SETFILE = @SETFILE@ NM = @NM@ --- 12,16 ---- INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ ! WINDRES = @WINDRES@ SETFILE = @SETFILE@ NM = @NM@ *************** *** 27,31 **** DESTDIR = ! APP_WXLUA_CXXFLAGS = -I../modules $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ app_wxlua_wxlua.o \ --- 27,31 ---- DESTDIR = ! APP_WXLUA_CXXFLAGS = -I../modules $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ app_wxlua_wxlua.o \ *************** *** 45,49 **** @COND_USE_WXLUAAPP_1@__app_wxlua___depname = ../bin/wxlua$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxlua___mac_setfilecmd = \ ! @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL wxlua$(EXEEXT) COND_PLATFORM_OS2_1___app_wxlua___os2_emxbindcmd = $(NM) wxlua$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep wxlua$(EXEEXT) ; fi --- 45,49 ---- @COND_USE_WXLUAAPP_1@__app_wxlua___depname = ../bin/wxlua$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxlua___mac_setfilecmd = \ ! @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ../bin/wxlua$(EXEEXT) COND_PLATFORM_OS2_1___app_wxlua___os2_emxbindcmd = $(NM) wxlua$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep wxlua$(EXEEXT) ; fi *************** *** 53,57 **** @COND_USE_WXLUAEDITAPP_1@ = ../bin/wxluaedit$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxluaedit___mac_setfilecmd \ ! @COND_PLATFORM_MAC_1@ = $(SETFILE) -t APPL wxluaedit$(EXEEXT) COND_PLATFORM_OS2_1___app_wxluaedit___os2_emxbindcmd = $(NM) \ wxluaedit$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep wxluaedit$(EXEEXT) ; fi --- 53,57 ---- @COND_USE_WXLUAEDITAPP_1@ = ../bin/wxluaedit$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxluaedit___mac_setfilecmd \ ! @COND_PLATFORM_MAC_1@ = $(SETFILE) -t APPL ../bin/wxluaedit$(EXEEXT) COND_PLATFORM_OS2_1___app_wxluaedit___os2_emxbindcmd = $(NM) \ wxluaedit$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep wxluaedit$(EXEEXT) ; fi *************** *** 80,84 **** @COND_USE_WXLUAAPP_1@../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) ! @COND_USE_WXLUAAPP_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L../lib $(LDFLAGS_GUI) $(WX_LIBS) -lwxluasocket -lwxluadebug -lwxbind -lwxlua -llua @COND_USE_WXLUAAPP_1@ @COND_USE_WXLUAAPP_1@ $(__app_wxlua___mac_setfilecmd) --- 80,84 ---- @COND_USE_WXLUAAPP_1@../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) ! @COND_USE_WXLUAAPP_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L../lib $(LDFLAGS_GUI) -lwxluasocket -lwxluadebug -lwxlua -lwxbind -llua $(WX_LIBS) @COND_USE_WXLUAAPP_1@ @COND_USE_WXLUAAPP_1@ $(__app_wxlua___mac_setfilecmd) *************** *** 86,90 **** @COND_USE_WXLUAEDITAPP_1@../bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) ! @COND_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L../lib $(LDFLAGS_GUI) $(WX_LIBS) -lwxluasocket -lwxluadebug -lwxbind -lwxlua -llua @COND_USE_WXLUAEDITAPP_1@ @COND_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd) --- 86,90 ---- @COND_USE_WXLUAEDITAPP_1@../bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) ! @COND_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L../lib $(LDFLAGS_GUI) -lwxluasocket -lwxluadebug -lwxbind -lwxlua -llua $(WX_LIBS) @COND_USE_WXLUAEDITAPP_1@ @COND_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd) *************** *** 98,102 **** app_wxlua_wxlua_rc.o: ./wxlua/src/wxlua.rc ! $(RESCOMP) -i$< -o$@ --include-dir ../modules app_wxluaedit_wxledit.o: ./wxluaedit/src/wxledit.cpp --- 98,102 ---- app_wxlua_wxlua_rc.o: ./wxlua/src/wxlua.rc ! $(WINDRES) -i$< -o$@ --include-dir ../modules app_wxluaedit_wxledit.o: ./wxluaedit/src/wxledit.cpp *************** *** 107,111 **** app_wxluaedit_wxluaedit_rc.o: ./wxluaedit/src/wxluaedit.rc ! $(RESCOMP) -i$< -o$@ --include-dir ../modules --- 107,111 ---- app_wxluaedit_wxluaedit_rc.o: ./wxluaedit/src/wxluaedit.rc ! $(WINDRES) -i$< -o$@ --include-dir ../modules |
From: John L. <jr...@us...> - 2006-01-23 04:38:40
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19400/wxLua/modules/wxlua/include Modified Files: internal.h Log Message: Fixes for 64bit processors, use long not int Fixes for wxWidgets 27 CVS HEAD, gdi.i, fontmapper doesn't have SetConfig anymore switch to using wxluasetup.h instead of luasetup.h Index: internal.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/internal.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** internal.h 30 Dec 2005 04:35:59 -0000 1.17 --- internal.h 23 Jan 2006 04:38:29 -0000 1.18 *************** *** 107,111 **** void LUACALL wxLua_addToTrackedMemoryList(wxLuaState& wxlState, theObject *p##theObject) \ { \ ! wxlState.addToTrackedMemoryList((int)p##theObject, new theObject##wxLuaObject(p##theObject)); \ } --- 107,111 ---- void LUACALL wxLua_addToTrackedMemoryList(wxLuaState& wxlState, theObject *p##theObject) \ { \ ! wxlState.addToTrackedMemoryList((long)p##theObject, new theObject##wxLuaObject(p##theObject)); \ } |
From: John L. <jr...@us...> - 2006-01-23 04:38:40
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19400/wxLua/modules/wxbind/src Modified Files: Makefile wxlhtmlwin.cpp wxlprint.cpp Added Files: wxluasetup.h Removed Files: luasetup.h Log Message: Fixes for 64bit processors, use long not int Fixes for wxWidgets 27 CVS HEAD, gdi.i, fontmapper doesn't have SetConfig anymore switch to using wxluasetup.h instead of luasetup.h Index: wxlprint.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlprint.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxlprint.cpp 30 Nov 2005 04:46:17 -0000 1.5 --- wxlprint.cpp 23 Jan 2006 04:38:29 -0000 1.6 *************** *** 28,32 **** #include "wxlua/include/internal.h" #include "wxlua/include/wxlcallb.h" ! #include "luasetup.h" #if wxLUA_USE_wxLuaPrintout --- 28,32 ---- #include "wxlua/include/internal.h" #include "wxlua/include/wxlcallb.h" ! #include "wxluasetup.h" #if wxLUA_USE_wxLuaPrintout Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 12 Dec 2005 05:16:31 -0000 1.4 --- Makefile 23 Jan 2006 04:38:29 -0000 1.5 *************** *** 7,12 **** # Makefile for wxLuaBinding library using gmake ! # Override this on the command line to use your own luasetup.h ! WXLUASETUP = luasetup.h # --- wxLua parameters ------------------------------------------------------- --- 7,12 ---- # Makefile for wxLuaBinding library using gmake ! # Override this on the command line to use your own wxluasetup.h ! WXLUASETUP = wxluasetup.h # --- wxLua parameters ------------------------------------------------------- --- luasetup.h DELETED --- --- NEW FILE: wxluasetup.h --- // Automatically generated by utils/get_luasetup edit as necessary. #ifndef __WXLUA_SETUP__ #define __WXLUA_SETUP__ #define wxLUA_USE_FL 0 #define wxLUA_USE_Geometry 1 #define wxLUA_USE_MDI 1 #define wxLUA_USE_wxAcceleratorTable 1 #define wxLUA_USE_wxApp 1 #define wxLUA_USE_wxArrayInt 1 #define wxLUA_USE_wxArrayString 1 #define wxLUA_USE_wxBitmap 1 #define wxLUA_USE_wxBitmapButton 1 #define wxLUA_USE_wxBrushList 1 #define wxLUA_USE_wxButton 1 #define wxLUA_USE_wxCalendarCtrl 1 #define wxLUA_USE_wxCaret 1 #define wxLUA_USE_wxCheckBox 1 #define wxLUA_USE_wxCheckListBox 1 #define wxLUA_USE_wxChoice 1 #define wxLUA_USE_wxClassInfo 1 #define wxLUA_USE_wxClipboard 1 #define wxLUA_USE_wxColourDialog 1 #define wxLUA_USE_wxColourPenBrush 1 #define wxLUA_USE_wxComboBox 1 #define wxLUA_USE_wxCommandProcessor 1 #define wxLUA_USE_wxConfig 1 #define wxLUA_USE_wxCursor 1 #define wxLUA_USE_wxDataObject 1 #define wxLUA_USE_wxDateSpan 1 #define wxLUA_USE_wxDateTime 1 #define wxLUA_USE_wxDC 1 #define wxLUA_USE_wxDialog 1 #define wxLUA_USE_wxDir 1 #define wxLUA_USE_wxDirDialog 1 #define wxLUA_USE_wxDragDrop 1 #define wxLUA_USE_wxFile 1 #define wxLUA_USE_wxFileDialog 1 #define wxLUA_USE_wxFileHistory 1 #define wxLUA_USE_wxFileName 1 #define wxLUA_USE_wxFindReplaceDialog 1 #define wxLUA_USE_wxFont 1 #define wxLUA_USE_wxFontDialog 1 #define wxLUA_USE_wxFontEnumerator 1 #define wxLUA_USE_wxFontList 1 #define wxLUA_USE_wxFontMapper 1 #define wxLUA_USE_wxFrame 1 #define wxLUA_USE_wxGauge 1 #define wxLUA_USE_wxGenericValidator 1 #define wxLUA_USE_wxGrid 1 #define wxLUA_USE_wxHashTable 1 #define wxLUA_USE_wxHelpController 1 #define wxLUA_USE_wxHTML 1 #define wxLUA_USE_wxHtmlHelpController 1 #define wxLUA_USE_wxIcon 1 #define wxLUA_USE_wxID_XXX 1 #define wxLUA_USE_wxImage 1 #define wxLUA_USE_wxImageList 1 #define wxLUA_USE_wxLayoutConstraints 1 #define wxLUA_USE_wxList 1 #define wxLUA_USE_wxListBox 1 #define wxLUA_USE_wxListCtrl 1 #define wxLUA_USE_wxLuaDebugServer 1 #define wxLUA_USE_wxLuaHtmlWindow 1 #define wxLUA_USE_wxLuaPrintout 1 #define wxLUA_USE_wxMask 1 #define wxLUA_USE_wxMenu 1 #define wxLUA_USE_wxMessageDialog 1 #define wxLUA_USE_wxMetafile 1 #define wxLUA_USE_wxMiniFrame 1 #define wxLUA_USE_wxNotebook 1 #define wxLUA_USE_wxObject 1 #define wxLUA_USE_wxPalette 1 #define wxLUA_USE_wxPenList 1 #define wxLUA_USE_wxPointSizeRect 1 #define wxLUA_USE_wxPrint 1 #define wxLUA_USE_wxProgressDialog 1 #define wxLUA_USE_wxRadioBox 1 #define wxLUA_USE_wxRadioButton 1 #define wxLUA_USE_wxRegEx 1 #define wxLUA_USE_wxRegion 1 #define wxLUA_USE_wxSashWindow 1 #define wxLUA_USE_wxScrollBar 1 #define wxLUA_USE_wxScrolledWindow 1 #define wxLUA_USE_wxSingleChoiceDialog 1 #define wxLUA_USE_wxSizer 1 #define wxLUA_USE_wxSlider 1 #define wxLUA_USE_wxSocket 1 #define wxLUA_USE_wxSpinButton 1 #define wxLUA_USE_wxSpinCtrl 1 #define wxLUA_USE_wxSplitterWindow 1 #define wxLUA_USE_wxStaticBitmap 1 #define wxLUA_USE_wxStaticBox 1 #define wxLUA_USE_wxStaticLine 1 #define wxLUA_USE_wxStaticText 1 #define wxLUA_USE_wxStatusBar 1 #define wxLUA_USE_wxStringList 1 #define wxLUA_USE_wxStyledTextCtrl 1 #define wxLUA_USE_wxSystemSettings 1 #define wxLUA_USE_wxTabCtrl 1 #define wxLUA_USE_wxTaskBarIcon 1 #define wxLUA_USE_wxTextCtrl 1 #define wxLUA_USE_wxTextEntryDialog 1 #define wxLUA_USE_wxTextValidator 1 #define wxLUA_USE_wxTimer 1 #define wxLUA_USE_wxTimeSpan 1 #define wxLUA_USE_wxToolbar 1 #define wxLUA_USE_wxTooltip 1 #define wxLUA_USE_wxTreeCtrl 1 #define wxLUA_USE_wxValidator 1 #define wxLUA_USE_wxWave 1 #define wxLUA_USE_wxWindowList 1 #define wxLUA_USE_wxWizard 1 #define wxLUA_USE_wxXMLResource 1 #endif // __WXLUA_SETUP__ Index: wxlhtmlwin.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlhtmlwin.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxlhtmlwin.cpp 30 Nov 2005 04:46:17 -0000 1.5 --- wxlhtmlwin.cpp 23 Jan 2006 04:38:29 -0000 1.6 *************** *** 28,32 **** #include "wxlua/include/wxlcallb.h" #include "wxlua/include/internal.h" ! #include "luasetup.h" #if wxLUA_USE_wxHTML --- 28,32 ---- #include "wxlua/include/wxlcallb.h" #include "wxlua/include/internal.h" ! #include "wxluasetup.h" #if wxLUA_USE_wxHTML |
From: John L. <jr...@us...> - 2006-01-23 04:38:40
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19400/wxLua/bindings/wxwidgets Modified Files: Makefile gdi.i Added Files: wxluasetup.h.in Removed Files: luasetup.h.in Log Message: Fixes for 64bit processors, use long not int Fixes for wxWidgets 27 CVS HEAD, gdi.i, fontmapper doesn't have SetConfig anymore switch to using wxluasetup.h instead of luasetup.h Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 20 Nov 2005 22:28:07 -0000 1.2 --- Makefile 23 Jan 2006 04:38:29 -0000 1.3 *************** *** 3,7 **** # Author: J Winwood # Created: 2002 ! # Updated: # Copyright: (c) 2002. J Winwood # --- 3,7 ---- # Author: J Winwood # Created: 2002 ! # Updated: # Copyright: (c) 2002. J Winwood # *************** *** 13,17 **** include $(WXLUA_DIR)/bindings/wxwidgets/wrappers.lst THEWRAPPERS=$(addprefix $(WXLUA_DIR)/bindings/wxwidgets/, $(WRAPPERS)) ! DEPFILES=luasetup.h.in $(WXLUA_DIR)/bindings/genwxbind.lua $(WXLUA_DIR)/bindings/wxwidgets/override.hpp # $(THEWRAPPERS) all: genwxbind --- 13,17 ---- include $(WXLUA_DIR)/bindings/wxwidgets/wrappers.lst THEWRAPPERS=$(addprefix $(WXLUA_DIR)/bindings/wxwidgets/, $(WRAPPERS)) ! DEPFILES=wxluasetup.h.in $(WXLUA_DIR)/bindings/genwxbind.lua $(WXLUA_DIR)/bindings/wxwidgets/override.hpp # $(THEWRAPPERS) all: genwxbind --- NEW FILE: wxluasetup.h.in --- // Automatically generated by utils/get_luasetup edit as necessary. #ifndef __WXLUA_SETUP__ #define __WXLUA_SETUP__ #define wxLUA_USE_FL 0 #define wxLUA_USE_Geometry 1 #define wxLUA_USE_MDI 1 #define wxLUA_USE_wxAcceleratorTable 1 #define wxLUA_USE_wxApp 1 #define wxLUA_USE_wxArrayInt 1 #define wxLUA_USE_wxArrayString 1 #define wxLUA_USE_wxBitmap 1 #define wxLUA_USE_wxBitmapButton 1 #define wxLUA_USE_wxBrushList 1 #define wxLUA_USE_wxButton 1 #define wxLUA_USE_wxCalendarCtrl 1 #define wxLUA_USE_wxCaret 1 #define wxLUA_USE_wxCheckBox 1 #define wxLUA_USE_wxCheckListBox 1 #define wxLUA_USE_wxChoice 1 #define wxLUA_USE_wxClassInfo 1 #define wxLUA_USE_wxClipboard 1 #define wxLUA_USE_wxColourDialog 1 #define wxLUA_USE_wxColourPenBrush 1 #define wxLUA_USE_wxComboBox 1 #define wxLUA_USE_wxCommandProcessor 1 #define wxLUA_USE_wxConfig 1 #define wxLUA_USE_wxCursor 1 #define wxLUA_USE_wxDataObject 1 #define wxLUA_USE_wxDateSpan 1 #define wxLUA_USE_wxDateTime 1 #define wxLUA_USE_wxDC 1 #define wxLUA_USE_wxDialog 1 #define wxLUA_USE_wxDir 1 #define wxLUA_USE_wxDirDialog 1 #define wxLUA_USE_wxDragDrop 1 #define wxLUA_USE_wxFile 1 #define wxLUA_USE_wxFileDialog 1 #define wxLUA_USE_wxFileHistory 1 #define wxLUA_USE_wxFileName 1 #define wxLUA_USE_wxFindReplaceDialog 1 #define wxLUA_USE_wxFont 1 #define wxLUA_USE_wxFontDialog 1 #define wxLUA_USE_wxFontEnumerator 1 #define wxLUA_USE_wxFontList 1 #define wxLUA_USE_wxFontMapper 1 #define wxLUA_USE_wxFrame 1 #define wxLUA_USE_wxGauge 1 #define wxLUA_USE_wxGenericValidator 1 #define wxLUA_USE_wxGrid 1 #define wxLUA_USE_wxHashTable 1 #define wxLUA_USE_wxHelpController 1 #define wxLUA_USE_wxHTML 1 #define wxLUA_USE_wxHtmlHelpController 1 #define wxLUA_USE_wxIcon 1 #define wxLUA_USE_wxID_XXX 1 #define wxLUA_USE_wxImage 1 #define wxLUA_USE_wxImageList 1 #define wxLUA_USE_wxLayoutConstraints 1 #define wxLUA_USE_wxList 1 #define wxLUA_USE_wxListBox 1 #define wxLUA_USE_wxListCtrl 1 #define wxLUA_USE_wxLuaDebugServer 1 #define wxLUA_USE_wxLuaHtmlWindow 1 #define wxLUA_USE_wxLuaPrintout 1 #define wxLUA_USE_wxMask 1 #define wxLUA_USE_wxMenu 1 #define wxLUA_USE_wxMessageDialog 1 #define wxLUA_USE_wxMetafile 1 #define wxLUA_USE_wxMiniFrame 1 #define wxLUA_USE_wxNotebook 1 #define wxLUA_USE_wxObject 1 #define wxLUA_USE_wxPalette 1 #define wxLUA_USE_wxPenList 1 #define wxLUA_USE_wxPointSizeRect 1 #define wxLUA_USE_wxPrint 1 #define wxLUA_USE_wxProgressDialog 1 #define wxLUA_USE_wxRadioBox 1 #define wxLUA_USE_wxRadioButton 1 #define wxLUA_USE_wxRegEx 1 #define wxLUA_USE_wxRegion 1 #define wxLUA_USE_wxSashWindow 1 #define wxLUA_USE_wxScrollBar 1 #define wxLUA_USE_wxScrolledWindow 1 #define wxLUA_USE_wxSingleChoiceDialog 1 #define wxLUA_USE_wxSizer 1 #define wxLUA_USE_wxSlider 1 #define wxLUA_USE_wxSocket 1 #define wxLUA_USE_wxSpinButton 1 #define wxLUA_USE_wxSpinCtrl 1 #define wxLUA_USE_wxSplitterWindow 1 #define wxLUA_USE_wxStaticBitmap 1 #define wxLUA_USE_wxStaticBox 1 #define wxLUA_USE_wxStaticLine 1 #define wxLUA_USE_wxStaticText 1 #define wxLUA_USE_wxStatusBar 1 #define wxLUA_USE_wxStringList 1 #define wxLUA_USE_wxStyledTextCtrl 0 #define wxLUA_USE_wxSystemSettings 1 #define wxLUA_USE_wxTabCtrl 1 #define wxLUA_USE_wxTaskBarIcon 1 #define wxLUA_USE_wxTextCtrl 1 #define wxLUA_USE_wxTextEntryDialog 1 #define wxLUA_USE_wxTextValidator 1 #define wxLUA_USE_wxTimer 1 #define wxLUA_USE_wxTimeSpan 1 #define wxLUA_USE_wxToolbar 1 #define wxLUA_USE_wxTooltip 1 #define wxLUA_USE_wxTreeCtrl 1 #define wxLUA_USE_wxValidator 1 #define wxLUA_USE_wxWave 1 #define wxLUA_USE_wxWindowList 1 #define wxLUA_USE_wxWizard 1 #define wxLUA_USE_wxXMLResource 1 #endif // __WXLUA_SETUP__ --- luasetup.h.in DELETED --- Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** gdi.i 17 Nov 2005 05:51:20 -0000 1.4 --- gdi.i 23 Jan 2006 04:38:29 -0000 1.5 *************** *** 344,348 **** void SetDialogParent(wxWindow *parent) void SetDialogTitle(const wxString &title) ! void SetConfig(wxConfigBase *config = NULL) void SetConfigPath(const wxString &prefix) static wxFontMapper *Get() --- 344,348 ---- void SetDialogParent(wxWindow *parent) void SetDialogTitle(const wxString &title) ! !%wxchkver27 void SetConfig(wxConfigBase *config = NULL) void SetConfigPath(const wxString &prefix) static wxFontMapper *Get() |
From: John L. <jr...@us...> - 2006-01-23 04:38:39
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19400/wxLua/modules/wxlua/src Modified Files: internal.cpp Log Message: Fixes for 64bit processors, use long not int Fixes for wxWidgets 27 CVS HEAD, gdi.i, fontmapper doesn't have SetConfig anymore switch to using wxluasetup.h instead of luasetup.h Index: internal.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/internal.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** internal.cpp 30 Dec 2005 04:35:59 -0000 1.24 --- internal.cpp 23 Jan 2006 04:38:29 -0000 1.25 *************** *** 34,38 **** #include "wx/datetime.h" ! #include "../../../bindings/wxwidgets/luasetup.h.in" // get the base library setup parameters #include "wxlua/include/internal.h" #include "wxlua/include/wxlcallb.h" --- 34,38 ---- #include "wx/datetime.h" ! #include "../../../bindings/wxwidgets/wxluasetup.h.in" // get the base library setup parameters #include "wxlua/include/internal.h" #include "wxlua/include/wxlcallb.h" |
From: John L. <jr...@us...> - 2006-01-23 04:38:39
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19400/wxLua/bindings Modified Files: genwxbind.lua Log Message: Fixes for 64bit processors, use long not int Fixes for wxWidgets 27 CVS HEAD, gdi.i, fontmapper doesn't have SetConfig anymore switch to using wxluasetup.h instead of luasetup.h Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** genwxbind.lua 19 Jan 2006 04:49:11 -0000 1.17 --- genwxbind.lua 23 Jan 2006 04:38:28 -0000 1.18 *************** *** 3624,3628 **** table.insert(fileData, "\n") table.insert(fileData, "\n") ! table.insert(fileData, "#include \"luasetup.h\"\n") table.insert(fileData, "#include \"wxlua/include/internal.h\"\n") if includeList then --- 3624,3628 ---- table.insert(fileData, "\n") table.insert(fileData, "\n") ! table.insert(fileData, "#include \"wxluasetup.h\"\n") table.insert(fileData, "#include \"wxlua/include/internal.h\"\n") if includeList then *************** *** 3795,3799 **** table.insert(fileData, "#endif\n") table.insert(fileData, "\n") ! table.insert(fileData, "#include \"luasetup.h\"\n") table.insert(fileData, "#include \"wxlua/include/internal.h\"\n") if includeList then --- 3795,3799 ---- table.insert(fileData, "#endif\n") table.insert(fileData, "\n") ! table.insert(fileData, "#include \"wxluasetup.h\"\n") table.insert(fileData, "#include \"wxlua/include/internal.h\"\n") if includeList then *************** *** 3910,3914 **** table.insert(fileData, "#endif\n") table.insert(fileData, "\n") ! table.insert(fileData, "#include \"luasetup.h\"\n") table.insert(fileData, "#include \"wxlua/include/internal.h\"\n") if includeList then --- 3910,3914 ---- table.insert(fileData, "#endif\n") table.insert(fileData, "\n") ! table.insert(fileData, "#include \"wxluasetup.h\"\n") table.insert(fileData, "#include \"wxlua/include/internal.h\"\n") if includeList then *************** *** 3997,4001 **** table.insert(fileData, "#endif\n") table.insert(fileData, "\n") ! table.insert(fileData, "#include \"luasetup.h\"\n") table.insert(fileData, "#include \"wxlua/include/internal.h\"\n") if includeList then --- 3997,4001 ---- table.insert(fileData, "#endif\n") table.insert(fileData, "\n") ! table.insert(fileData, "#include \"wxluasetup.h\"\n") table.insert(fileData, "#include \"wxlua/include/internal.h\"\n") if includeList then *************** *** 4067,4071 **** table.insert(fileData, "#endif\n") table.insert(fileData, "\n") ! table.insert(fileData, "#include \"luasetup.h\"\n") table.insert(fileData, "#include \"wxlua/include/internal.h\"\n") if includeList then --- 4067,4071 ---- table.insert(fileData, "#endif\n") table.insert(fileData, "\n") ! table.insert(fileData, "#include \"wxluasetup.h\"\n") table.insert(fileData, "#include \"wxlua/include/internal.h\"\n") if includeList then *************** *** 4160,4164 **** table.insert(fileData, "#endif\n") table.insert(fileData, "\n") ! table.insert(fileData, "#include \"luasetup.h\"\n") table.insert(fileData, "#include \"wxlua/include/internal.h\"\n") if includeList then --- 4160,4164 ---- table.insert(fileData, "#endif\n") table.insert(fileData, "\n") ! table.insert(fileData, "#include \"wxluasetup.h\"\n") table.insert(fileData, "#include \"wxlua/include/internal.h\"\n") if includeList then |
From: John L. <jr...@us...> - 2006-01-19 04:49:19
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12285/bindings/wxwidgets Modified Files: wx.rules Log Message: allow using the cached data type files for other bindings Index: wx.rules =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx.rules,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wx.rules 12 Dec 2005 05:16:31 -0000 1.10 --- wx.rules 19 Jan 2006 04:49:11 -0000 1.11 *************** *** 17,27 **** ------------------------------------------------------------------------------- ! -- Set the namespace that the bindings will be placed, eg. wx.wxWindow(...) ! hook_namespace = "wx" -- Set any #includes or other C++ code to be placed verbatim at the top of -- every generated file or "" for none hook_header_includes = "#include \"wx/wxprec.h\"\n" -- Set the name of the subclassed wxLuaBinding class ! hook_binding_class = hook_namespace.."_Binding" ------------------------------------------------------------------------------- --- 17,32 ---- ------------------------------------------------------------------------------- ! -- Set the lua namespace that the bindings will be placed, eg. wx.wxWindow(...) ! hook_lua_namespace = "wx" ! ! -- Set the C++ "namespace" that the bindings will be placed, eg. function names ! -- contain this to prevent duplicate function names ! hook_cpp_namespace = "wx" ! -- Set any #includes or other C++ code to be placed verbatim at the top of -- every generated file or "" for none hook_header_includes = "#include \"wx/wxprec.h\"\n" -- Set the name of the subclassed wxLuaBinding class ! hook_binding_class = hook_cpp_namespace.."_Binding" ------------------------------------------------------------------------------- *************** *** 34,51 **** -- Set the files to output the structs of wrapped defined values, objects, -- events, builtin (static functionc), and classes ! hook_define_file = hook_namespace.."_define" ! hook_define_fn = "wxLuaGetDefineList_"..hook_namespace ! hook_object_file = hook_namespace.."_object" ! hook_object_fn = "wxLuaGetObjectList_"..hook_namespace ! hook_event_file = hook_namespace.."_event" ! hook_event_fn = "wxLuaGetEventList_"..hook_namespace ! hook_builtin_file = hook_namespace.."_builtin" ! hook_builtin_fn = "wxLuaGetBuiltinList_"..hook_namespace ! hook_class_file = hook_namespace.."_class" ! hook_class_fn = "wxLuaGetClassList_"..hook_namespace ------------------------------------------------------------------------------- --- 39,56 ---- -- Set the files to output the structs of wrapped defined values, objects, -- events, builtin (static functionc), and classes ! hook_define_file = hook_cpp_namespace.."_define" ! hook_define_fn = "wxLuaGetDefineList_"..hook_cpp_namespace ! hook_object_file = hook_cpp_namespace.."_object" ! hook_object_fn = "wxLuaGetObjectList_"..hook_cpp_namespace ! hook_event_file = hook_cpp_namespace.."_event" ! hook_event_fn = "wxLuaGetEventList_"..hook_cpp_namespace ! hook_builtin_file = hook_cpp_namespace.."_builtin" ! hook_builtin_fn = "wxLuaGetBuiltinList_"..hook_cpp_namespace ! hook_class_file = hook_cpp_namespace.."_class" ! hook_class_fn = "wxLuaGetClassList_"..hook_cpp_namespace ------------------------------------------------------------------------------- *************** *** 94,97 **** --- 99,112 ---- ------------------------------------------------------------------------------- + -- a table containing filenames of DataTypes.Cache.lua from other wrappers to + -- to define classes and data types used in this wrapper + -- NOTE: for the base wxWidgets wrappers we don't load the cache since they + -- don't depend on other wrappers and can cause problems when interface + -- files are updated. Make sure you delete or have updated any cache file + -- that changes any data types. + + --dataTypeCacheFilenames = { "wxwidgets/DataTypes.Cache.lua" } + + ------------------------------------------------------------------------------- -- virtual wxLuaBinding::OnRegister body - can load extra lua bindings here |