Menu
▾
▴
wxlua-commit — CVS commits of wxLua
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 <fr...@us...> - 2005-06-20 09:03:27
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28972/apps Modified Files: Makefile.in Log Message: Added DSW/DSP files Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.in 14 Jun 2005 21:44:39 -0000 1.2 --- Makefile.in 20 Jun 2005 09:02:45 -0000 1.3 *************** *** 48,52 **** ### Targets: ### ! all: wrap ../bin/wxlua$(EXEEXT) install: all --- 48,52 ---- ### Targets: ### ! all: ../bin/wxlua$(EXEEXT) install: all *************** *** 64,72 **** rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! wrap: ..\..\..\bindings\wxwidgets\override.hpp ! ..\..\..\bin\lua -e"target=\"msw\"" ..\..\wxlua\src\wrap.lua ! copy ..\..\..\bindings\wxwidgets\wxluawrap.i ..\..\..\bindings\wxwidgets\wxluawrap.c ! ! ../bin/wxlua$(EXEEXT): $(WXLUA_OBJECTS) wrap $(__wxlua___win32rc) $(CXX) -o $@ $(WXLUA_OBJECTS) $(LDFLAGS) -L../lib $(WX_LIBS) -lwxluadebug -lwxluasocket -lwxlua -llua --- 64,68 ---- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! ../bin/wxlua$(EXEEXT): $(WXLUA_OBJECTS) $(__wxlua___win32rc) $(CXX) -o $@ $(WXLUA_OBJECTS) $(LDFLAGS) -L../lib $(WX_LIBS) -lwxluadebug -lwxluasocket -lwxlua -llua |
|
From: Francesco <fr...@us...> - 2005-06-20 09:03:27
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28972/build/bakefiles Modified Files: utils.bkl Log Message: Added DSW/DSP files Index: utils.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/utils.bkl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** utils.bkl 12 Jun 2005 18:29:20 -0000 1.1 --- utils.bkl 20 Jun 2005 09:02:46 -0000 1.2 *************** *** 159,162 **** --- 159,175 ---- <!-- NEW RULES --> <!-- --> + + <!-- Forces the presence of the $(id) option into the final makefile; --> + <!-- this rule (which is really used more like a tag) is a tweaky way --> + <!-- to tell Bakefile not to remove from the final makefile an option --> + <!-- which has been qualified as 'useless'. --> + <!-- See bakefile docs for the VARS_DONT_ELIMINATE global switch. --> + <!-- Usage sample: --> + <!-- <force-opt-presence id="MY_USELESS_OPTION"/> --> + <define-rule name="force-opt-presence" extends="phony"> + <template id="dummytemplate_for_$(id)"> + <set var="dummy_for_$(id)"><if cond="$(id)=='dummy'">AAA</if></set> + </template> + </define-rule> <!-- Changes the current directory to the folder given to the CD --> |
|
From: Francesco <fr...@us...> - 2005-06-20 09:03:27
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28972/apps/build/bakefiles Modified Files: Bakefiles.bkgen apps.bkl Log Message: Added DSW/DSP files Index: Bakefiles.bkgen =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/Bakefiles.bkgen,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Bakefiles.bkgen 14 Jun 2005 20:22:47 -0000 1.2 --- Bakefiles.bkgen 20 Jun 2005 09:02:46 -0000 1.3 *************** *** 13,18 **** <!-- List of output formats to generate: --> <add-formats> ! <!-- autoconf,borland,dmars,mingw,,watcom,cbuilderx,cbx_unix,gnu --> ! msvc,watcom,borland,mingw,autoconf </add-formats> --- 13,17 ---- <!-- List of output formats to generate: --> <add-formats> ! autoconf,borland,dmars,mingw,watcom,cbuilderx,cbx_unix,gnu,msvc6prj </add-formats> Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** apps.bkl 14 Jun 2005 21:44:39 -0000 1.2 --- apps.bkl 20 Jun 2005 09:02:46 -0000 1.3 *************** *** 40,44 **** <!-- The WXLUA application target --> <!-- --> ! <action id="wrap"> <dependency-of>all</dependency-of> --- 40,44 ---- <!-- The WXLUA application target --> <!-- --> ! <!-- <action id="wrap"> <dependency-of>all</dependency-of> *************** *** 47,53 **** <command>copy ..\..\..\bindings\wxwidgets\wxluawrap.i ..\..\..\bindings\wxwidgets\wxluawrap.c</command> </action> <exe id="wxlua" template="wxlua"> ! <depends>wrap</depends> <sources>$(WXLUA_SRC)</sources> <headers>$(WXLUA_HDR)</headers> --- 47,54 ---- <command>copy ..\..\..\bindings\wxwidgets\wxluawrap.i ..\..\..\bindings\wxwidgets\wxluawrap.c</command> </action> + --> <exe id="wxlua" template="wxlua"> ! <!-- <depends>wrap</depends> --> <sources>$(WXLUA_SRC)</sources> <headers>$(WXLUA_HDR)</headers> |
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28972/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Added Files: modules.dsw modules_lua.dsp modules_lua_lib.dsp modules_wxbind_dll.dsp modules_wxbind_lib.dsp modules_wxlua.dsp modules_wxlua_dll.dsp modules_wxlua_lib.dsp modules_wxluadebug_dll.dsp modules_wxluadebug_lib.dsp modules_wxluasocket_dll.dsp modules_wxluasocket_lib.dsp Log Message: Added DSW/DSP files --- NEW FILE: modules_lua.dsp --- # Microsoft Developer Studio Project File - Name="modules_lua" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 CFG=lua - Win32 Default !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_lua.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_lua.mak" CFG="lua - Win32 Default" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "lua - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application") !MESSAGE "lua - Win32 DLL Unicode" (based on "Win32 (x86) Console Application") !MESSAGE "lua - Win32 DLL Debug" (based on "Win32 (x86) Console Application") !MESSAGE "lua - Win32 DLL" (based on "Win32 (x86) Console Application") !MESSAGE "lua - Win32 Unicode Debug" (based on "Win32 (x86) Console Application") !MESSAGE "lua - Win32 Unicode" (based on "Win32 (x86) Console Application") !MESSAGE "lua - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE "lua - Win32 Default" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe RSC=rc.exe !IF "$(CFG)" == "lua - Win32 DLL Unicode Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "msvc6prjud\lua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "msvc6prjud\lua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_CONSOLE" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_CONSOLE" /c # ADD BASE RSC /l 0x409 /d "_CONSOLE" /i ..\..\lua\include # ADD RSC /l 0x409 /d "_CONSOLE" /i ..\..\lua\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 ..\..\..\lib\vc_lib\lua.lib /nologo /machine:i386 /out:"..\..\..\bin\lua.exe" /subsystem:console # ADD LINK32 ..\..\..\lib\vc_lib\lua.lib /nologo /machine:i386 /out:"..\..\..\bin\lua.exe" /subsystem:console !ELSEIF "$(CFG)" == "lua - Win32 DLL Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "msvc6prju\lua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "msvc6prju\lua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_CONSOLE" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_CONSOLE" /c # ADD BASE RSC /l 0x409 /d "_CONSOLE" /i ..\..\lua\include # ADD RSC /l 0x409 /d "_CONSOLE" /i ..\..\lua\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 ..\..\..\lib\vc_lib\lua.lib /nologo /machine:i386 /out:"..\..\..\bin\lua.exe" /subsystem:console # ADD LINK32 ..\..\..\lib\vc_lib\lua.lib /nologo /machine:i386 /out:"..\..\..\bin\lua.exe" /subsystem:console !ELSEIF "$(CFG)" == "lua - Win32 DLL Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "msvc6prjd\lua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "msvc6prjd\lua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_CONSOLE" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_CONSOLE" /c # ADD BASE RSC /l 0x409 /d "_CONSOLE" /i ..\..\lua\include # ADD RSC /l 0x409 /d "_CONSOLE" /i ..\..\lua\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 ..\..\..\lib\vc_lib\lua.lib /nologo /machine:i386 /out:"..\..\..\bin\lua.exe" /subsystem:console # ADD LINK32 ..\..\..\lib\vc_lib\lua.lib /nologo /machine:i386 /out:"..\..\..\bin\lua.exe" /subsystem:console !ELSEIF "$(CFG)" == "lua - Win32 DLL" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "msvc6prj\lua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "msvc6prj\lua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_CONSOLE" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_CONSOLE" /c # ADD BASE RSC /l 0x409 /d "_CONSOLE" /i ..\..\lua\include # ADD RSC /l 0x409 /d "_CONSOLE" /i ..\..\lua\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 ..\..\..\lib\vc_lib\lua.lib /nologo /machine:i386 /out:"..\..\..\bin\lua.exe" /subsystem:console # ADD LINK32 ..\..\..\lib\vc_lib\lua.lib /nologo /machine:i386 /out:"..\..\..\bin\lua.exe" /subsystem:console !ELSEIF "$(CFG)" == "lua - Win32 Unicode Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "msvc6prjud\lua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "msvc6prjud\lua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_CONSOLE" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_CONSOLE" /c # ADD BASE RSC /l 0x409 /d "_CONSOLE" /i ..\..\lua\include # ADD RSC /l 0x409 /d "_CONSOLE" /i ..\..\lua\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 ..\..\..\lib\vc_lib\lua.lib /nologo /machine:i386 /out:"..\..\..\bin\lua.exe" /subsystem:console # ADD LINK32 ..\..\..\lib\vc_lib\lua.lib /nologo /machine:i386 /out:"..\..\..\bin\lua.exe" /subsystem:console !ELSEIF "$(CFG)" == "lua - Win32 Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "msvc6prju\lua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "msvc6prju\lua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_CONSOLE" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_CONSOLE" /c # ADD BASE RSC /l 0x409 /d "_CONSOLE" /i ..\..\lua\include # ADD RSC /l 0x409 /d "_CONSOLE" /i ..\..\lua\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 ..\..\..\lib\vc_lib\lua.lib /nologo /machine:i386 /out:"..\..\..\bin\lua.exe" /subsystem:console # ADD LINK32 ..\..\..\lib\vc_lib\lua.lib /nologo /machine:i386 /out:"..\..\..\bin\lua.exe" /subsystem:console !ELSEIF "$(CFG)" == "lua - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "msvc6prjd\lua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "msvc6prjd\lua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_CONSOLE" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_CONSOLE" /c # ADD BASE RSC /l 0x409 /d "_CONSOLE" /i ..\..\lua\include # ADD RSC /l 0x409 /d "_CONSOLE" /i ..\..\lua\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 ..\..\..\lib\vc_lib\lua.lib /nologo /machine:i386 /out:"..\..\..\bin\lua.exe" /subsystem:console # ADD LINK32 ..\..\..\lib\vc_lib\lua.lib /nologo /machine:i386 /out:"..\..\..\bin\lua.exe" /subsystem:console !ELSEIF "$(CFG)" == "lua - Win32 Default" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "msvc6prj\lua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "msvc6prj\lua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_CONSOLE" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_CONSOLE" /c # ADD BASE RSC /l 0x409 /d "_CONSOLE" /i ..\..\lua\include # ADD RSC /l 0x409 /d "_CONSOLE" /i ..\..\lua\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 ..\..\..\lib\vc_lib\lua.lib /nologo /machine:i386 /out:"..\..\..\bin\lua.exe" /subsystem:console # ADD LINK32 ..\..\..\lib\vc_lib\lua.lib /nologo /machine:i386 /out:"..\..\..\bin\lua.exe" /subsystem:console !ENDIF # Begin Target # Name "lua - Win32 DLL Unicode Debug" # Name "lua - Win32 DLL Unicode" # Name "lua - Win32 DLL Debug" # Name "lua - Win32 DLL" # Name "lua - Win32 Unicode Debug" # Name "lua - Win32 Unicode" # Name "lua - Win32 Debug" # Name "lua - Win32 Default" # Begin Group "Source Files" # PROP Default_Filter "" # Begin Source File SOURCE=..\..\lua\src\lua\lua.c # End Source File # End Group # End Target # End Project Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** makefile.bcc 19 Jun 2005 19:11:07 -0000 1.5 --- makefile.bcc 20 Jun 2005 09:02:57 -0000 1.6 *************** *** 121,125 **** -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG) $(__DEBUGINFO) -tWM \ ! $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxlua_lib_internal.obj \ --- 121,125 ---- -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG) $(__DEBUGINFO) -tWM \ ! $(__WX_SHAREDDEFINE_p) -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxlua_lib_internal.obj \ *************** *** 130,134 **** -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG) $(__DEBUGINFO) -tWM \ ! $(__WX_SHAREDDEFINE_p) -DA2DWXLUAMAKINGDLL $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxlua_dll_internal.obj \ --- 130,135 ---- -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG) $(__DEBUGINFO) -tWM \ ! $(__WX_SHAREDDEFINE_p) -I$(WX_DIR)\contrib\include -DA2DWXLUAMAKINGDLL \ ! $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxlua_dll_internal.obj \ *************** *** 139,159 **** -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG) $(__DEBUGINFO) -tWM \ ! $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) WXBIND_LIB_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxbind_lib_wxlhtmlwin.obj \ ! borland$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.obj WXBIND_DLL_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG) $(__DEBUGINFO) -tWM \ ! $(__WX_SHAREDDEFINE_p) -DA2DWXBINDMAKINGDLL $(CPPFLAGS) $(CXXFLAGS) WXBIND_DLL_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxbind_dll_wxlhtmlwin.obj \ ! borland$(WXLIBPOSTFIX)\wxbind_dll_wxlprint.obj WXLUADEBUG_LIB_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG) $(__DEBUGINFO) -tWM \ ! $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_LIB_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxluadebug_lib_debug.obj \ --- 140,229 ---- -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG) $(__DEBUGINFO) -tWM \ ! $(__WX_SHAREDDEFINE_p) -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) WXBIND_LIB_OBJECTS = \ + borland$(WXLIBPOSTFIX)\wxbind_lib_appframe.obj \ + borland$(WXLIBPOSTFIX)\wxbind_lib_clipdrag.obj \ + borland$(WXLIBPOSTFIX)\wxbind_lib_config.obj \ + borland$(WXLIBPOSTFIX)\wxbind_lib_controls.obj \ + borland$(WXLIBPOSTFIX)\wxbind_lib_data.obj \ + borland$(WXLIBPOSTFIX)\wxbind_lib_datetime.obj \ + borland$(WXLIBPOSTFIX)\wxbind_lib_defsutil.obj \ + borland$(WXLIBPOSTFIX)\wxbind_lib_dialogs.obj \ + borland$(WXLIBPOSTFIX)\wxbind_lib_event.obj \ + borland$(WXLIBPOSTFIX)\wxbind_lib_file.obj \ + borland$(WXLIBPOSTFIX)\wxbind_lib_fl.obj \ + borland$(WXLIBPOSTFIX)\wxbind_lib_gdi.obj \ + borland$(WXLIBPOSTFIX)\wxbind_lib_geometry.obj \ + borland$(WXLIBPOSTFIX)\wxbind_lib_grid.obj \ + borland$(WXLIBPOSTFIX)\wxbind_lib_help.obj \ + borland$(WXLIBPOSTFIX)\wxbind_lib_html.obj \ + borland$(WXLIBPOSTFIX)\wxbind_lib_image.obj \ + borland$(WXLIBPOSTFIX)\wxbind_lib_mdi.obj \ + borland$(WXLIBPOSTFIX)\wxbind_lib_menutool.obj \ + borland$(WXLIBPOSTFIX)\wxbind_lib_plot.obj \ + borland$(WXLIBPOSTFIX)\wxbind_lib_print.obj \ + borland$(WXLIBPOSTFIX)\wxbind_lib_regex.obj \ + borland$(WXLIBPOSTFIX)\wxbind_lib_sizer.obj \ + borland$(WXLIBPOSTFIX)\wxbind_lib_socket.obj \ + borland$(WXLIBPOSTFIX)\wxbind_lib_stc.obj \ + borland$(WXLIBPOSTFIX)\wxbind_lib_thread.obj \ + borland$(WXLIBPOSTFIX)\wxbind_lib_wave.obj \ + borland$(WXLIBPOSTFIX)\wxbind_lib_windows.obj \ borland$(WXLIBPOSTFIX)\wxbind_lib_wxlhtmlwin.obj \ ! borland$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.obj \ ! borland$(WXLIBPOSTFIX)\wxbind_lib_wxlua.obj \ ! borland$(WXLIBPOSTFIX)\wxbind_lib_wx_class.obj \ ! borland$(WXLIBPOSTFIX)\wxbind_lib_wx_define.obj \ ! borland$(WXLIBPOSTFIX)\wxbind_lib_wx_event.obj \ ! borland$(WXLIBPOSTFIX)\wxbind_lib_wx_object.obj \ ! borland$(WXLIBPOSTFIX)\wxbind_lib_xml.obj WXBIND_DLL_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG) $(__DEBUGINFO) -tWM \ ! $(__WX_SHAREDDEFINE_p) -I$(WX_DIR)\contrib\include -DA2DWXBINDMAKINGDLL \ ! $(CPPFLAGS) $(CXXFLAGS) WXBIND_DLL_OBJECTS = \ + borland$(WXLIBPOSTFIX)\wxbind_dll_appframe.obj \ + borland$(WXLIBPOSTFIX)\wxbind_dll_clipdrag.obj \ + borland$(WXLIBPOSTFIX)\wxbind_dll_config.obj \ + borland$(WXLIBPOSTFIX)\wxbind_dll_controls.obj \ + borland$(WXLIBPOSTFIX)\wxbind_dll_data.obj \ + borland$(WXLIBPOSTFIX)\wxbind_dll_datetime.obj \ + borland$(WXLIBPOSTFIX)\wxbind_dll_defsutil.obj \ + borland$(WXLIBPOSTFIX)\wxbind_dll_dialogs.obj \ + borland$(WXLIBPOSTFIX)\wxbind_dll_event.obj \ + borland$(WXLIBPOSTFIX)\wxbind_dll_file.obj \ + borland$(WXLIBPOSTFIX)\wxbind_dll_fl.obj \ + borland$(WXLIBPOSTFIX)\wxbind_dll_gdi.obj \ + borland$(WXLIBPOSTFIX)\wxbind_dll_geometry.obj \ + borland$(WXLIBPOSTFIX)\wxbind_dll_grid.obj \ + borland$(WXLIBPOSTFIX)\wxbind_dll_help.obj \ + borland$(WXLIBPOSTFIX)\wxbind_dll_html.obj \ + borland$(WXLIBPOSTFIX)\wxbind_dll_image.obj \ + borland$(WXLIBPOSTFIX)\wxbind_dll_mdi.obj \ + borland$(WXLIBPOSTFIX)\wxbind_dll_menutool.obj \ + borland$(WXLIBPOSTFIX)\wxbind_dll_plot.obj \ + borland$(WXLIBPOSTFIX)\wxbind_dll_print.obj \ + borland$(WXLIBPOSTFIX)\wxbind_dll_regex.obj \ + borland$(WXLIBPOSTFIX)\wxbind_dll_sizer.obj \ + borland$(WXLIBPOSTFIX)\wxbind_dll_socket.obj \ + borland$(WXLIBPOSTFIX)\wxbind_dll_stc.obj \ + borland$(WXLIBPOSTFIX)\wxbind_dll_thread.obj \ + borland$(WXLIBPOSTFIX)\wxbind_dll_wave.obj \ + borland$(WXLIBPOSTFIX)\wxbind_dll_windows.obj \ borland$(WXLIBPOSTFIX)\wxbind_dll_wxlhtmlwin.obj \ ! borland$(WXLIBPOSTFIX)\wxbind_dll_wxlprint.obj \ ! borland$(WXLIBPOSTFIX)\wxbind_dll_wxlua.obj \ ! borland$(WXLIBPOSTFIX)\wxbind_dll_wx_class.obj \ ! borland$(WXLIBPOSTFIX)\wxbind_dll_wx_define.obj \ ! borland$(WXLIBPOSTFIX)\wxbind_dll_wx_event.obj \ ! borland$(WXLIBPOSTFIX)\wxbind_dll_wx_object.obj \ ! borland$(WXLIBPOSTFIX)\wxbind_dll_xml.obj WXLUADEBUG_LIB_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG) $(__DEBUGINFO) -tWM \ ! $(__WX_SHAREDDEFINE_p) -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_LIB_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxluadebug_lib_debug.obj \ *************** *** 164,168 **** -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG) $(__DEBUGINFO) -tWM \ ! $(__WX_SHAREDDEFINE_p) -DA2DWXLUADEBUGMAKINGDLL $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_DLL_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxluadebug_dll_debug.obj \ --- 234,239 ---- -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG) $(__DEBUGINFO) -tWM \ ! $(__WX_SHAREDDEFINE_p) -I$(WX_DIR)\contrib\include \ ! -DA2DWXLUADEBUGMAKINGDLL $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_DLL_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxluadebug_dll_debug.obj \ *************** *** 173,177 **** -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG) $(__DEBUGINFO) -tWM \ ! $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_LIB_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxluasocket_lib_debugio.obj \ --- 244,248 ---- -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG) $(__DEBUGINFO) -tWM \ ! $(__WX_SHAREDDEFINE_p) -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_LIB_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxluasocket_lib_debugio.obj \ *************** *** 183,187 **** -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG) $(__DEBUGINFO) -tWM \ ! $(__WX_SHAREDDEFINE_p) -DA2DWXLUASOCKETMAKINGDLL $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_DLL_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxluasocket_dll_debugio.obj \ --- 254,259 ---- -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG) $(__DEBUGINFO) -tWM \ ! $(__WX_SHAREDDEFINE_p) -I$(WX_DIR)\contrib\include \ ! -DA2DWXLUASOCKETMAKINGDLL $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_DLL_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxluasocket_dll_debugio.obj \ *************** *** 504,507 **** --- 576,663 ---- $(CXX) -q -c -P -o$@ $(WXLUA_DLL_CXXFLAGS) $** + borland$(WXLIBPOSTFIX)\wxbind_lib_appframe.obj: ..\..\wxbind\src\appframe.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_clipdrag.obj: ..\..\wxbind\src\clipdrag.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_config.obj: ..\..\wxbind\src\config.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_controls.obj: ..\..\wxbind\src\controls.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_data.obj: ..\..\wxbind\src\data.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_datetime.obj: ..\..\wxbind\src\datetime.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_defsutil.obj: ..\..\wxbind\src\defsutil.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_dialogs.obj: ..\..\wxbind\src\dialogs.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_event.obj: ..\..\wxbind\src\event.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_file.obj: ..\..\wxbind\src\file.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_fl.obj: ..\..\wxbind\src\fl.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_gdi.obj: ..\..\wxbind\src\gdi.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_geometry.obj: ..\..\wxbind\src\geometry.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_grid.obj: ..\..\wxbind\src\grid.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_help.obj: ..\..\wxbind\src\help.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_html.obj: ..\..\wxbind\src\html.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_image.obj: ..\..\wxbind\src\image.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_mdi.obj: ..\..\wxbind\src\mdi.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_menutool.obj: ..\..\wxbind\src\menutool.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_plot.obj: ..\..\wxbind\src\plot.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_print.obj: ..\..\wxbind\src\print.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_regex.obj: ..\..\wxbind\src\regex.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_sizer.obj: ..\..\wxbind\src\sizer.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_socket.obj: ..\..\wxbind\src\socket.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_stc.obj: ..\..\wxbind\src\stc.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_thread.obj: ..\..\wxbind\src\thread.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_wave.obj: ..\..\wxbind\src\wave.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_windows.obj: ..\..\wxbind\src\windows.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + borland$(WXLIBPOSTFIX)\wxbind_lib_wxlhtmlwin.obj: ..\..\wxbind\src\wxlhtmlwin.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** *************** *** 510,513 **** --- 666,771 ---- $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + borland$(WXLIBPOSTFIX)\wxbind_lib_wxlua.obj: ..\..\wxbind\src\wxlua.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_wx_class.obj: ..\..\wxbind\src\wx_class.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_wx_define.obj: ..\..\wxbind\src\wx_define.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_wx_event.obj: ..\..\wxbind\src\wx_event.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_wx_object.obj: ..\..\wxbind\src\wx_object.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_xml.obj: ..\..\wxbind\src\xml.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_appframe.obj: ..\..\wxbind\src\appframe.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_clipdrag.obj: ..\..\wxbind\src\clipdrag.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_config.obj: ..\..\wxbind\src\config.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_controls.obj: ..\..\wxbind\src\controls.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_data.obj: ..\..\wxbind\src\data.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_datetime.obj: ..\..\wxbind\src\datetime.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_defsutil.obj: ..\..\wxbind\src\defsutil.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_dialogs.obj: ..\..\wxbind\src\dialogs.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_event.obj: ..\..\wxbind\src\event.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_file.obj: ..\..\wxbind\src\file.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_fl.obj: ..\..\wxbind\src\fl.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_gdi.obj: ..\..\wxbind\src\gdi.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_geometry.obj: ..\..\wxbind\src\geometry.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_grid.obj: ..\..\wxbind\src\grid.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_help.obj: ..\..\wxbind\src\help.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_html.obj: ..\..\wxbind\src\html.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_image.obj: ..\..\wxbind\src\image.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_mdi.obj: ..\..\wxbind\src\mdi.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_menutool.obj: ..\..\wxbind\src\menutool.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_plot.obj: ..\..\wxbind\src\plot.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_print.obj: ..\..\wxbind\src\print.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_regex.obj: ..\..\wxbind\src\regex.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_sizer.obj: ..\..\wxbind\src\sizer.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_socket.obj: ..\..\wxbind\src\socket.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_stc.obj: ..\..\wxbind\src\stc.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_thread.obj: ..\..\wxbind\src\thread.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_wave.obj: ..\..\wxbind\src\wave.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_windows.obj: ..\..\wxbind\src\windows.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + borland$(WXLIBPOSTFIX)\wxbind_dll_wxlhtmlwin.obj: ..\..\wxbind\src\wxlhtmlwin.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** *************** *** 516,519 **** --- 774,795 ---- $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + borland$(WXLIBPOSTFIX)\wxbind_dll_wxlua.obj: ..\..\wxbind\src\wxlua.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_wx_class.obj: ..\..\wxbind\src\wx_class.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_wx_define.obj: ..\..\wxbind\src\wx_define.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_wx_event.obj: ..\..\wxbind\src\wx_event.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_wx_object.obj: ..\..\wxbind\src\wx_object.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_xml.obj: ..\..\wxbind\src\xml.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + borland$(WXLIBPOSTFIX)\wxluadebug_lib_debug.obj: ..\..\wxluadebug\src\debug.cpp $(CXX) -q -c -P -o$@ $(WXLUADEBUG_LIB_CXXFLAGS) $** --- NEW FILE: modules.dsw --- Microsoft Developer Studio Workspace File, Format Version 6.00 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! ############################################################################### Project: "lua_lib"=modules_lua_lib.dsp - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ }}} ############################################################################### Project: "lua"=modules_lua.dsp - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ Begin Project Dependency Project_Dep_Name lua_lib End Project Dependency }}} ############################################################################### Project: "wxlua_lib"=modules_wxlua_lib.dsp - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ }}} ############################################################################### Project: "wxlua_dll"=modules_wxlua_dll.dsp - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ }}} ############################################################################### Project: "wxbind_lib"=modules_wxbind_lib.dsp - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ }}} ############################################################################### Project: "wxbind_dll"=modules_wxbind_dll.dsp - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ }}} ############################################################################### Project: "wxluadebug_lib"=modules_wxluadebug_lib.dsp - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ }}} ############################################################################### Project: "wxluadebug_dll"=modules_wxluadebug_dll.dsp - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ }}} ############################################################################### Project: "wxluasocket_lib"=modules_wxluasocket_lib.dsp - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ }}} ############################################################################### Project: "wxluasocket_dll"=modules_wxluasocket_dll.dsp - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ }}} ############################################################################### Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.vc 19 Jun 2005 19:11:07 -0000 1.3 --- makefile.vc 20 Jun 2005 09:02:58 -0000 1.4 *************** *** 91,95 **** /I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \ $(__DEBUGINFO) /Fd..\..\..\lib\vc_lib\wxlua.pdb $(____DEBUGRUNTIME) \ ! $(__WX_SHAREDDEFINE_p) /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxlua_lib_internal.obj \ --- 91,96 ---- /I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \ $(__DEBUGINFO) /Fd..\..\..\lib\vc_lib\wxlua.pdb $(____DEBUGRUNTIME) \ ! $(__WX_SHAREDDEFINE_p) /I$(WX_DIR)\contrib\include /GR /EHsc $(CPPFLAGS) \ ! $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxlua_lib_internal.obj \ *************** *** 101,105 **** /I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \ $(__DEBUGINFO) /Fd..\..\..\lib\vc_dll\wxlua_dll.pdb $(____DEBUGRUNTIME) \ ! $(__WX_SHAREDDEFINE_p) /DA2DWXLUAMAKINGDLL /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxlua_dll_internal.obj \ --- 102,107 ---- /I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \ $(__DEBUGINFO) /Fd..\..\..\lib\vc_dll\wxlua_dll.pdb $(____DEBUGRUNTIME) \ ! $(__WX_SHAREDDEFINE_p) /I$(WX_DIR)\contrib\include /DA2DWXLUAMAKINGDLL /GR \ ! /EHsc $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxlua_dll_internal.obj \ *************** *** 111,118 **** /I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \ $(__DEBUGINFO) /Fd..\..\..\lib\vc_lib\wxbind.pdb $(____DEBUGRUNTIME) \ ! $(__WX_SHAREDDEFINE_p) /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) WXBIND_LIB_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxbind_lib_wxlhtmlwin.obj \ ! msvc$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.obj WXBIND_DLL_CXXFLAGS = /MD$(__DEBUGRUNTIME) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ --- 113,155 ---- /I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \ $(__DEBUGINFO) /Fd..\..\..\lib\vc_lib\wxbind.pdb $(____DEBUGRUNTIME) \ ! $(__WX_SHAREDDEFINE_p) /I$(WX_DIR)\contrib\include /GR /EHsc $(CPPFLAGS) \ ! $(CXXFLAGS) WXBIND_LIB_OBJECTS = \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_appframe.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_clipdrag.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_config.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_controls.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_data.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_datetime.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_defsutil.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_dialogs.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_event.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_file.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_fl.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_gdi.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_geometry.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_grid.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_help.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_html.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_image.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_mdi.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_menutool.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_plot.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_print.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_regex.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_sizer.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_socket.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_stc.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_thread.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_wave.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_windows.obj \ msvc$(WXLIBPOSTFIX)\wxbind_lib_wxlhtmlwin.obj \ ! msvc$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.obj \ ! msvc$(WXLIBPOSTFIX)\wxbind_lib_wxlua.obj \ ! msvc$(WXLIBPOSTFIX)\wxbind_lib_wx_class.obj \ ! msvc$(WXLIBPOSTFIX)\wxbind_lib_wx_define.obj \ ! msvc$(WXLIBPOSTFIX)\wxbind_lib_wx_event.obj \ ! msvc$(WXLIBPOSTFIX)\wxbind_lib_wx_object.obj \ ! msvc$(WXLIBPOSTFIX)\wxbind_lib_xml.obj WXBIND_DLL_CXXFLAGS = /MD$(__DEBUGRUNTIME) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ *************** *** 120,127 **** /I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \ $(__DEBUGINFO) /Fd..\..\..\lib\vc_dll\wxbind_dll.pdb $(____DEBUGRUNTIME) \ ! $(__WX_SHAREDDEFINE_p) /DA2DWXBINDMAKINGDLL /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) WXBIND_DLL_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxbind_dll_wxlhtmlwin.obj \ ! msvc$(WXLIBPOSTFIX)\wxbind_dll_wxlprint.obj WXLUADEBUG_LIB_CXXFLAGS = /MD$(__DEBUGRUNTIME) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ --- 157,199 ---- /I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \ $(__DEBUGINFO) /Fd..\..\..\lib\vc_dll\wxbind_dll.pdb $(____DEBUGRUNTIME) \ ! $(__WX_SHAREDDEFINE_p) /I$(WX_DIR)\contrib\include /DA2DWXBINDMAKINGDLL /GR \ ! /EHsc $(CPPFLAGS) $(CXXFLAGS) WXBIND_DLL_OBJECTS = \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_appframe.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_clipdrag.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_config.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_controls.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_data.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_datetime.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_defsutil.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_dialogs.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_event.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_file.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_fl.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_gdi.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_geometry.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_grid.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_help.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_html.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_image.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_mdi.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_menutool.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_plot.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_print.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_regex.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_sizer.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_socket.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_stc.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_thread.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_wave.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_windows.obj \ msvc$(WXLIBPOSTFIX)\wxbind_dll_wxlhtmlwin.obj \ ! msvc$(WXLIBPOSTFIX)\wxbind_dll_wxlprint.obj \ ! msvc$(WXLIBPOSTFIX)\wxbind_dll_wxlua.obj \ ! msvc$(WXLIBPOSTFIX)\wxbind_dll_wx_class.obj \ ! msvc$(WXLIBPOSTFIX)\wxbind_dll_wx_define.obj \ ! msvc$(WXLIBPOSTFIX)\wxbind_dll_wx_event.obj \ ! msvc$(WXLIBPOSTFIX)\wxbind_dll_wx_object.obj \ ! msvc$(WXLIBPOSTFIX)\wxbind_dll_xml.obj WXLUADEBUG_LIB_CXXFLAGS = /MD$(__DEBUGRUNTIME) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ *************** *** 129,133 **** /I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \ $(__DEBUGINFO) /Fd..\..\..\lib\vc_lib\wxluadebug.pdb $(____DEBUGRUNTIME) \ ! $(__WX_SHAREDDEFINE_p) /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_LIB_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxluadebug_lib_debug.obj \ --- 201,206 ---- /I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \ $(__DEBUGINFO) /Fd..\..\..\lib\vc_lib\wxluadebug.pdb $(____DEBUGRUNTIME) \ ! $(__WX_SHAREDDEFINE_p) /I$(WX_DIR)\contrib\include /GR /EHsc $(CPPFLAGS) \ ! $(CXXFLAGS) WXLUADEBUG_LIB_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxluadebug_lib_debug.obj \ *************** *** 139,144 **** /I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \ $(__DEBUGINFO) /Fd..\..\..\lib\vc_dll\wxluadebug_dll.pdb \ ! $(____DEBUGRUNTIME) $(__WX_SHAREDDEFINE_p) /DA2DWXLUADEBUGMAKINGDLL /GR \ ! /EHsc $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_DLL_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxluadebug_dll_debug.obj \ --- 212,217 ---- /I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \ $(__DEBUGINFO) /Fd..\..\..\lib\vc_dll\wxluadebug_dll.pdb \ ! $(____DEBUGRUNTIME) $(__WX_SHAREDDEFINE_p) /I$(WX_DIR)\contrib\include \ ! /DA2DWXLUADEBUGMAKINGDLL /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_DLL_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxluadebug_dll_debug.obj \ *************** *** 150,154 **** /I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \ $(__DEBUGINFO) /Fd..\..\..\lib\vc_lib\wxluasocket.pdb $(____DEBUGRUNTIME) \ ! $(__WX_SHAREDDEFINE_p) /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_LIB_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxluasocket_lib_debugio.obj \ --- 223,228 ---- /I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \ $(__DEBUGINFO) /Fd..\..\..\lib\vc_lib\wxluasocket.pdb $(____DEBUGRUNTIME) \ ! $(__WX_SHAREDDEFINE_p) /I$(WX_DIR)\contrib\include /GR /EHsc $(CPPFLAGS) \ ! $(CXXFLAGS) WXLUASOCKET_LIB_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxluasocket_lib_debugio.obj \ *************** *** 161,166 **** /I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \ $(__DEBUGINFO) /Fd..\..\..\lib\vc_dll\wxluasocket_dll.pdb \ ! $(____DEBUGRUNTIME) $(__WX_SHAREDDEFINE_p) /DA2DWXLUASOCKETMAKINGDLL /GR \ ! /EHsc $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_DLL_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxluasocket_dll_debugio.obj \ --- 235,240 ---- /I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \ $(__DEBUGINFO) /Fd..\..\..\lib\vc_dll\wxluasocket_dll.pdb \ ! $(____DEBUGRUNTIME) $(__WX_SHAREDDEFINE_p) /I$(WX_DIR)\contrib\include \ ! /DA2DWXLUASOCKETMAKINGDLL /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_DLL_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxluasocket_dll_debugio.obj \ *************** *** 488,491 **** --- 562,649 ---- $(CXX) /c /nologo /TP /Fo$@ $(WXLUA_DLL_CXXFLAGS) $** + msvc$(WXLIBPOSTFIX)\wxbind_lib_appframe.obj: ..\..\wxbind\src\appframe.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_clipdrag.obj: ..\..\wxbind\src\clipdrag.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_config.obj: ..\..\wxbind\src\config.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_controls.obj: ..\..\wxbind\src\controls.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_data.obj: ..\..\wxbind\src\data.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_datetime.obj: ..\..\wxbind\src\datetime.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_defsutil.obj: ..\..\wxbind\src\defsutil.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_dialogs.obj: ..\..\wxbind\src\dialogs.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_event.obj: ..\..\wxbind\src\event.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_file.obj: ..\..\wxbind\src\file.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_fl.obj: ..\..\wxbind\src\fl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_gdi.obj: ..\..\wxbind\src\gdi.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_geometry.obj: ..\..\wxbind\src\geometry.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_grid.obj: ..\..\wxbind\src\grid.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_help.obj: ..\..\wxbind\src\help.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_html.obj: ..\..\wxbind\src\html.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_image.obj: ..\..\wxbind\src\image.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_mdi.obj: ..\..\wxbind\src\mdi.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_menutool.obj: ..\..\wxbind\src\menutool.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_plot.obj: ..\..\wxbind\src\plot.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_print.obj: ..\..\wxbind\src\print.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_regex.obj: ..\..\wxbind\src\regex.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_sizer.obj: ..\..\wxbind\src\sizer.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_socket.obj: ..\..\wxbind\src\socket.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_stc.obj: ..\..\wxbind\src\stc.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_thread.obj: ..\..\wxbind\src\thread.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_wave.obj: ..\..\wxbind\src\wave.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_windows.obj: ..\..\wxbind\src\windows.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + msvc$(WXLIBPOSTFIX)\wxbind_lib_wxlhtmlwin.obj: ..\..\wxbind\src\wxlhtmlwin.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** *************** *** 494,497 **** --- 652,757 ---- $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + msvc$(WXLIBPOSTFIX)\wxbind_lib_wxlua.obj: ..\..\wxbind\src\wxlua.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_wx_class.obj: ..\..\wxbind\src\wx_class.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_wx_define.obj: ..\..\wxbind\src\wx_define.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_wx_event.obj: ..\..\wxbind\src\wx_event.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_wx_object.obj: ..\..\wxbind\src\wx_object.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_xml.obj: ..\..\wxbind\src\xml.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_appframe.obj: ..\..\wxbind\src\appframe.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_clipdrag.obj: ..\..\wxbind\src\clipdrag.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_config.obj: ..\..\wxbind\src\config.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_controls.obj: ..\..\wxbind\src\controls.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_data.obj: ..\..\wxbind\src\data.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_datetime.obj: ..\..\wxbind\src\datetime.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_defsutil.obj: ..\..\wxbind\src\defsutil.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_dialogs.obj: ..\..\wxbind\src\dialogs.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_event.obj: ..\..\wxbind\src\event.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_file.obj: ..\..\wxbind\src\file.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_fl.obj: ..\..\wxbind\src\fl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_gdi.obj: ..\..\wxbind\src\gdi.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_geometry.obj: ..\..\wxbind\src\geometry.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_grid.obj: ..\..\wxbind\src\grid.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_help.obj: ..\..\wxbind\src\help.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_html.obj: ..\..\wxbind\src\html.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_image.obj: ..\..\wxbind\src\image.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_mdi.obj: ..\..\wxbind\src\mdi.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_menutool.obj: ..\..\wxbind\src\menutool.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_plot.obj: ..\..\wxbind\src\plot.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_print.obj: ..\..\wxbind\src\print.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_regex.obj: ..\..\wxbind\src\regex.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_sizer.obj: ..\..\wxbind\src\sizer.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_socket.obj: ..\..\wxbind\src\socket.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_stc.obj: ..\..\wxbind\src\stc.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_thread.obj: ..\..\wxbind\src\thread.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_wave.obj: ..\..\wxbind\src\wave.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_windows.obj: ..\..\wxbind\src\windows.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + msvc$(WXLIBPOSTFIX)\wxbind_dll_wxlhtmlwin.obj: ..\..\wxbind\src\wxlhtmlwin.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** *************** *** 500,503 **** --- 760,781 ---- $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + msvc$(WXLIBPOSTFIX)\wxbind_dll_wxlua.obj: ..\..\wxbind\src\wxlua.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_wx_class.obj: ..\..\wxbind\src\wx_class.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_wx_define.obj: ..\..\wxbind\src\wx_define.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_wx_event.obj: ..\..\wxbind\src\wx_event.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_wx_object.obj: ..\..\wxbind\src\wx_object.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_xml.obj: ..\..\wxbind\src\xml.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + msvc$(WXLIBPOSTFIX)\wxluadebug_lib_debug.obj: ..\..\wxluadebug\src\debug.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXLUADEBUG_LIB_CXXFLAGS) $** --- NEW FILE: modules_lua_lib.dsp --- # Microsoft Developer Studio Project File - Name="modules_lua_lib" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Static Library" 0x0104 CFG=lua_lib - Win32 Default !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_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_lua_lib.mak" CFG="lua_lib - Win32 Default" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "lua_lib - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library") !MESSAGE "lua_lib - Win32 DLL Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "lua_lib - Win32 DLL Debug" (based on "Win32 (x86) Static Library") !MESSAGE "lua_lib - Win32 DLL" (based on "Win32 (x86) Static Library") !MESSAGE "lua_lib - Win32 Unicode Debug" (based on "Win32 (x86) Static Library") !MESSAGE "lua_lib - Win32 Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "lua_lib - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "lua_lib - Win32 Default" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe RSC=rc.exe !IF "$(CFG)" == "lua_lib - Win32 DLL Unicode Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" # PROP BASE Intermediate_Dir "msvc6prjud\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\lua_lib" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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)" == "lua_lib - Win32 DLL Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" # PROP BASE Intermediate_Dir "msvc6prju\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\lua_lib" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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)" == "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\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\lua_lib" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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)" == "lua_lib - Win32 DLL" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" # PROP BASE Intermediate_Dir "msvc6prj\lua_lib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_lib" # PROP Intermediate_Dir "msvc6prj\lua_lib" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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)" == "lua_lib - Win32 Unicode Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" # PROP BASE Intermediate_Dir "msvc6prjud\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\lua_lib" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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)" == "lua_lib - Win32 Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" # PROP BASE Intermediate_Dir "msvc6prju\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\lua_lib" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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)" == "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\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\lua_lib" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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)" == "lua_lib - Win32 Default" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" # PROP BASE Intermediate_Dir "msvc6prj\lua_lib" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_lib" # PROP Intermediate_Dir "msvc6prj\lua_lib" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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" !ENDIF # Begin Target # Name "lua_lib - Win32 DLL Unicode Debug" # Name "lua_lib - Win32 DLL Unicode" # Name "lua_lib - Win32 DLL Debug" # Name "lua_lib - Win32 DLL" # Name "lua_lib - Win32 Unicode Debug" # Name "lua_lib - Win32 Unicode" # Name "lua_lib - Win32 Debug" # Name "lua_lib - Win32 Default" # Begin Group "Source Files" # PROP Default_Filter "" # 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\ldllmain.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 # Beg... [truncated message content] |
|
From: Francesco <fr...@us...> - 2005-06-20 09:03:08
|
Update of /cvsroot/wxlua/wxLua/util/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28972/util/build/msw Added Files: util.dsp util.dsw Log Message: Added DSW/DSP files --- NEW FILE: util.dsw --- Microsoft Developer Studio Workspace File, Format Version 6.00 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! ############################################################################### Project: "bin2c"=util.dsp - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ }}} ############################################################################### --- NEW FILE: util.dsp --- # Microsoft Developer Studio Project File - Name="util" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 CFG=bin2c - Win32 Default !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="bin2c - Win32 Default" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "bin2c - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application") !MESSAGE "bin2c - Win32 DLL Unicode" (based on "Win32 (x86) Console Application") !MESSAGE "bin2c - Win32 DLL Debug" (based on "Win32 (x86) Console Application") !MESSAGE "bin2c - Win32 DLL" (based on "Win32 (x86) Console Application") !MESSAGE "bin2c - Win32 Unicode Debug" (based on "Win32 (x86) Console Application") !MESSAGE "bin2c - Win32 Unicode" (based on "Win32 (x86) Console Application") !MESSAGE "bin2c - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE "bin2c - Win32 Default" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe RSC=rc.exe !IF "$(CFG)" == "bin2c - Win32 DLL Unicode Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "Release\bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "Release\bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c # ADD BASE RSC /l 0x409 /d _CONSOLE # ADD RSC /l 0x409 /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console !ELSEIF "$(CFG)" == "bin2c - Win32 DLL Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "Release\bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "Release\bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c # ADD BASE RSC /l 0x409 /d _CONSOLE # ADD RSC /l 0x409 /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console !ELSEIF "$(CFG)" == "bin2c - Win32 DLL Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "Release\bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "Release\bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c # ADD BASE RSC /l 0x409 /d _CONSOLE # ADD RSC /l 0x409 /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console !ELSEIF "$(CFG)" == "bin2c - Win32 DLL" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "Release\bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "Release\bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c # ADD BASE RSC /l 0x409 /d _CONSOLE # ADD RSC /l 0x409 /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console !ELSEIF "$(CFG)" == "bin2c - Win32 Unicode Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "Release\bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "Release\bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c # ADD BASE RSC /l 0x409 /d _CONSOLE # ADD RSC /l 0x409 /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console !ELSEIF "$(CFG)" == "bin2c - Win32 Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "Release\bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "Release\bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c # ADD BASE RSC /l 0x409 /d _CONSOLE # ADD RSC /l 0x409 /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console !ELSEIF "$(CFG)" == "bin2c - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "Release\bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "Release\bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c # ADD BASE RSC /l 0x409 /d _CONSOLE # ADD RSC /l 0x409 /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console !ELSEIF "$(CFG)" == "bin2c - Win32 Default" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "Release\bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "Release\bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c # ADD BASE RSC /l 0x409 /d _CONSOLE # ADD RSC /l 0x409 /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console !ENDIF # Begin Target # Name "bin2c - Win32 DLL Unicode Debug" # Name "bin2c - Win32 DLL Unicode" # Name "bin2c - Win32 DLL Debug" # Name "bin2c - Win32 DLL" # Name "bin2c - Win32 Unicode Debug" # Name "bin2c - Win32 Unicode" # Name "bin2c - Win32 Debug" # Name "bin2c - Win32 Default" # Begin Group "Source Files" # PROP Default_Filter "" # Begin Source File SOURCE=..\..\bin2c\bin2c.c # End Source File # End Group # End Target # End Project |
|
From: Francesco <fr...@us...> - 2005-06-20 09:03:07
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28972/modules/build/bakefiles Modified Files: modules.bkl sources.bkl Log Message: Added DSW/DSP files Index: sources.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/sources.bkl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** sources.bkl 19 Jun 2005 19:11:07 -0000 1.3 --- sources.bkl 20 Jun 2005 09:02:57 -0000 1.4 *************** *** 51,59 **** --- 51,94 ---- <!-- --> <set var="wxbind_src"> + wxbind/src/appframe.cpp + wxbind/src/clipdrag.cpp + wxbind/src/config.cpp + wxbind/src/controls.cpp + wxbind/src/data.cpp + wxbind/src/datetime.cpp + wxbind/src/defsutil.cpp + wxbind/src/dialogs.cpp + wxbind/src/event.cpp + wxbind/src/file.cpp + wxbind/src/fl.cpp + wxbind/src/gdi.cpp + wxbind/src/geometry.cpp + wxbind/src/grid.cpp + wxbind/src/help.cpp + wxbind/src/html.cpp + wxbind/src/image.cpp + wxbind/src/mdi.cpp + wxbind/src/menutool.cpp + wxbind/src/plot.cpp + wxbind/src/print.cpp + wxbind/src/regex.cpp + wxbind/src/sizer.cpp + wxbind/src/socket.cpp + wxbind/src/stc.cpp + wxbind/src/thread.cpp + wxbind/src/wave.cpp + wxbind/src/windows.cpp wxbind/src/wxlhtmlwin.cpp wxbind/src/wxlprint.cpp + wxbind/src/wxlua.cpp + wxbind/src/wx_class.cpp + wxbind/src/wx_define.cpp + wxbind/src/wx_event.cpp + wxbind/src/wx_object.cpp + wxbind/src/xml.cpp </set> <set var="wxbind_hdr"> + wxbind/include/wxbind.h wxbind/include/wxlhtmlwin.h wxbind/include/wxlprint.h Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** modules.bkl 19 Jun 2005 19:11:07 -0000 1.5 --- modules.bkl 20 Jun 2005 09:02:57 -0000 1.6 *************** *** 94,97 **** --- 94,100 ---- <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... --> *************** *** 129,133 **** <sources>$(__modsrc)</sources> <headers>$(__modhdr)</headers> ! <!-- to make MSVC6PRJ output look better... --> <msvc-file-group>$(__modname) sources:*.cpp</msvc-file-group> --- 132,139 ---- <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... --> <msvc-file-group>$(__modname) sources:*.cpp</msvc-file-group> *************** *** 220,227 **** <!-- the wxLuaSocket lib & dll --> <wxlua_lib id="wxluasocket_lib" template="wxlua-lib" cond="WX_SHARED=='0'"> ! <module-name>WXLUASOCKET</module-name> </wxlua_lib> <wxlua_dll id="wxluasocket_dll" template="wxlua" cond="WX_SHARED=='1'"> ! <module-name>WXLUASOCKET</module-name> </wxlua_dll> --- 226,233 ---- <!-- the wxLuaSocket lib & dll --> <wxlua_lib id="wxluasocket_lib" template="wxlua-lib" cond="WX_SHARED=='0'"> ! <module-name>WXLUASOCKET</module-name> </wxlua_lib> <wxlua_dll id="wxluasocket_dll" template="wxlua" cond="WX_SHARED=='1'"> ! <module-name>WXLUASOCKET</module-name> </wxlua_dll> |
|
From: Francesco <fr...@us...> - 2005-06-20 09:03:07
|
Update of /cvsroot/wxlua/wxLua/util/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28972/util/build/bakefiles Modified Files: Bakefiles.bkgen Log Message: Added DSW/DSP files Index: Bakefiles.bkgen =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/build/bakefiles/Bakefiles.bkgen,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Bakefiles.bkgen 12 Jun 2005 21:21:11 -0000 1.1 --- Bakefiles.bkgen 20 Jun 2005 09:02:58 -0000 1.2 *************** *** 4,8 **** <bakefile-gen> ! <disable-formats>msvc6prj,gnu,dmars,cbx_unix,cbuilderx</disable-formats> <input>util.bkl</input> --- 4,8 ---- <bakefile-gen> ! <disable-formats>gnu,dmars,cbx_unix,cbuilderx</disable-formats> <input>util.bkl</input> |
|
From: Francesco <fr...@us...> - 2005-06-20 09:03:06
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28972/modules Modified Files: Makefile.in Log Message: Added DSW/DSP files Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.in 19 Jun 2005 19:11:07 -0000 1.3 --- Makefile.in 20 Jun 2005 09:02:47 -0000 1.4 *************** *** 84,94 **** WXBIND_LIB_CXXFLAGS = -I./../modules $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXBIND_LIB_OBJECTS = \ wxbind_lib_wxlhtmlwin.o \ ! wxbind_lib_wxlprint.o WXBIND_DLL_CXXFLAGS = -I./../modules -DA2DWXBINDMAKINGDLL $(PIC_FLAG) \ $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXBIND_DLL_OBJECTS = \ wxbind_dll_wxlhtmlwin.o \ ! wxbind_dll_wxlprint.o WXLUADEBUG_LIB_CXXFLAGS = -I./../modules $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_LIB_OBJECTS = \ --- 84,162 ---- WXBIND_LIB_CXXFLAGS = -I./../modules $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXBIND_LIB_OBJECTS = \ + wxbind_lib_appframe.o \ + wxbind_lib_clipdrag.o \ + wxbind_lib_config.o \ + wxbind_lib_controls.o \ + wxbind_lib_data.o \ + wxbind_lib_datetime.o \ + wxbind_lib_defsutil.o \ + wxbind_lib_dialogs.o \ + wxbind_lib_event.o \ + wxbind_lib_file.o \ + wxbind_lib_fl.o \ + wxbind_lib_gdi.o \ + wxbind_lib_geometry.o \ + wxbind_lib_grid.o \ + wxbind_lib_help.o \ + wxbind_lib_html.o \ + wxbind_lib_image.o \ + wxbind_lib_mdi.o \ + wxbind_lib_menutool.o \ + wxbind_lib_plot.o \ + wxbind_lib_print.o \ + wxbind_lib_regex.o \ + wxbind_lib_sizer.o \ + wxbind_lib_socket.o \ + wxbind_lib_stc.o \ + wxbind_lib_thread.o \ + wxbind_lib_wave.o \ + wxbind_lib_windows.o \ wxbind_lib_wxlhtmlwin.o \ ! wxbind_lib_wxlprint.o \ ! wxbind_lib_wxlua.o \ ! wxbind_lib_wx_class.o \ ! wxbind_lib_wx_define.o \ ! wxbind_lib_wx_event.o \ ! wxbind_lib_wx_object.o \ ! wxbind_lib_xml.o WXBIND_DLL_CXXFLAGS = -I./../modules -DA2DWXBINDMAKINGDLL $(PIC_FLAG) \ $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXBIND_DLL_OBJECTS = \ + wxbind_dll_appframe.o \ + wxbind_dll_clipdrag.o \ + wxbind_dll_config.o \ + wxbind_dll_controls.o \ + wxbind_dll_data.o \ + wxbind_dll_datetime.o \ + wxbind_dll_defsutil.o \ + wxbind_dll_dialogs.o \ + wxbind_dll_event.o \ + wxbind_dll_file.o \ + wxbind_dll_fl.o \ + wxbind_dll_gdi.o \ + wxbind_dll_geometry.o \ + wxbind_dll_grid.o \ + wxbind_dll_help.o \ + wxbind_dll_html.o \ + wxbind_dll_image.o \ + wxbind_dll_mdi.o \ + wxbind_dll_menutool.o \ + wxbind_dll_plot.o \ + wxbind_dll_print.o \ + wxbind_dll_regex.o \ + wxbind_dll_sizer.o \ + wxbind_dll_socket.o \ + wxbind_dll_stc.o \ + wxbind_dll_thread.o \ + wxbind_dll_wave.o \ + wxbind_dll_windows.o \ wxbind_dll_wxlhtmlwin.o \ ! wxbind_dll_wxlprint.o \ ! wxbind_dll_wxlua.o \ ! wxbind_dll_wx_class.o \ ! wxbind_dll_wx_define.o \ ! wxbind_dll_wx_event.o \ ! wxbind_dll_wx_object.o \ ! wxbind_dll_xml.o WXLUADEBUG_LIB_CXXFLAGS = -I./../modules $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_LIB_OBJECTS = \ *************** *** 405,408 **** --- 473,560 ---- $(CXXC) -c -o $@ $(WXLUA_DLL_CXXFLAGS) ./wxlua/src/library.cpp + wxbind_lib_appframe.o: ./wxbind/src/appframe.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/appframe.cpp + + wxbind_lib_clipdrag.o: ./wxbind/src/clipdrag.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/clipdrag.cpp + + wxbind_lib_config.o: ./wxbind/src/config.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/config.cpp + + wxbind_lib_controls.o: ./wxbind/src/controls.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/controls.cpp + + wxbind_lib_data.o: ./wxbind/src/data.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/data.cpp + + wxbind_lib_datetime.o: ./wxbind/src/datetime.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/datetime.cpp + + wxbind_lib_defsutil.o: ./wxbind/src/defsutil.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/defsutil.cpp + + wxbind_lib_dialogs.o: ./wxbind/src/dialogs.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/dialogs.cpp + + wxbind_lib_event.o: ./wxbind/src/event.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/event.cpp + + wxbind_lib_file.o: ./wxbind/src/file.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/file.cpp + + wxbind_lib_fl.o: ./wxbind/src/fl.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/fl.cpp + + wxbind_lib_gdi.o: ./wxbind/src/gdi.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/gdi.cpp + + wxbind_lib_geometry.o: ./wxbind/src/geometry.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/geometry.cpp + + wxbind_lib_grid.o: ./wxbind/src/grid.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/grid.cpp + + wxbind_lib_help.o: ./wxbind/src/help.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/help.cpp + + wxbind_lib_html.o: ./wxbind/src/html.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/html.cpp + + wxbind_lib_image.o: ./wxbind/src/image.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/image.cpp + + wxbind_lib_mdi.o: ./wxbind/src/mdi.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/mdi.cpp + + wxbind_lib_menutool.o: ./wxbind/src/menutool.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/menutool.cpp + + wxbind_lib_plot.o: ./wxbind/src/plot.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/plot.cpp + + wxbind_lib_print.o: ./wxbind/src/print.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/print.cpp + + wxbind_lib_regex.o: ./wxbind/src/regex.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/regex.cpp + + wxbind_lib_sizer.o: ./wxbind/src/sizer.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/sizer.cpp + + wxbind_lib_socket.o: ./wxbind/src/socket.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/socket.cpp + + wxbind_lib_stc.o: ./wxbind/src/stc.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/stc.cpp + + wxbind_lib_thread.o: ./wxbind/src/thread.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/thread.cpp + + wxbind_lib_wave.o: ./wxbind/src/wave.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/wave.cpp + + wxbind_lib_windows.o: ./wxbind/src/windows.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/windows.cpp + wxbind_lib_wxlhtmlwin.o: ./wxbind/src/wxlhtmlwin.cpp $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/wxlhtmlwin.cpp *************** *** 411,414 **** --- 563,668 ---- $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/wxlprint.cpp + wxbind_lib_wxlua.o: ./wxbind/src/wxlua.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/wxlua.cpp + + wxbind_lib_wx_class.o: ./wxbind/src/wx_class.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/wx_class.cpp + + wxbind_lib_wx_define.o: ./wxbind/src/wx_define.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/wx_define.cpp + + wxbind_lib_wx_event.o: ./wxbind/src/wx_event.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/wx_event.cpp + + wxbind_lib_wx_object.o: ./wxbind/src/wx_object.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/wx_object.cpp + + wxbind_lib_xml.o: ./wxbind/src/xml.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/xml.cpp + + wxbind_dll_appframe.o: ./wxbind/src/appframe.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/appframe.cpp + + wxbind_dll_clipdrag.o: ./wxbind/src/clipdrag.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/clipdrag.cpp + + wxbind_dll_config.o: ./wxbind/src/config.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/config.cpp + + wxbind_dll_controls.o: ./wxbind/src/controls.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/controls.cpp + + wxbind_dll_data.o: ./wxbind/src/data.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/data.cpp + + wxbind_dll_datetime.o: ./wxbind/src/datetime.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/datetime.cpp + + wxbind_dll_defsutil.o: ./wxbind/src/defsutil.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/defsutil.cpp + + wxbind_dll_dialogs.o: ./wxbind/src/dialogs.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/dialogs.cpp + + wxbind_dll_event.o: ./wxbind/src/event.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/event.cpp + + wxbind_dll_file.o: ./wxbind/src/file.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/file.cpp + + wxbind_dll_fl.o: ./wxbind/src/fl.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/fl.cpp + + wxbind_dll_gdi.o: ./wxbind/src/gdi.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/gdi.cpp + + wxbind_dll_geometry.o: ./wxbind/src/geometry.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/geometry.cpp + + wxbind_dll_grid.o: ./wxbind/src/grid.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/grid.cpp + + wxbind_dll_help.o: ./wxbind/src/help.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/help.cpp + + wxbind_dll_html.o: ./wxbind/src/html.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/html.cpp + + wxbind_dll_image.o: ./wxbind/src/image.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/image.cpp + + wxbind_dll_mdi.o: ./wxbind/src/mdi.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/mdi.cpp + + wxbind_dll_menutool.o: ./wxbind/src/menutool.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/menutool.cpp + + wxbind_dll_plot.o: ./wxbind/src/plot.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/plot.cpp + + wxbind_dll_print.o: ./wxbind/src/print.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/print.cpp + + wxbind_dll_regex.o: ./wxbind/src/regex.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/regex.cpp + + wxbind_dll_sizer.o: ./wxbind/src/sizer.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/sizer.cpp + + wxbind_dll_socket.o: ./wxbind/src/socket.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/socket.cpp + + wxbind_dll_stc.o: ./wxbind/src/stc.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/stc.cpp + + wxbind_dll_thread.o: ./wxbind/src/thread.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/thread.cpp + + wxbind_dll_wave.o: ./wxbind/src/wave.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/wave.cpp + + wxbind_dll_windows.o: ./wxbind/src/windows.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/windows.cpp + wxbind_dll_wxlhtmlwin.o: ./wxbind/src/wxlhtmlwin.cpp $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/wxlhtmlwin.cpp *************** *** 417,420 **** --- 671,692 ---- $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/wxlprint.cpp + wxbind_dll_wxlua.o: ./wxbind/src/wxlua.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/wxlua.cpp + + wxbind_dll_wx_class.o: ./wxbind/src/wx_class.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/wx_class.cpp + + wxbind_dll_wx_define.o: ./wxbind/src/wx_define.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/wx_define.cpp + + wxbind_dll_wx_event.o: ./wxbind/src/wx_event.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/wx_event.cpp + + wxbind_dll_wx_object.o: ./wxbind/src/wx_object.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/wx_object.cpp + + wxbind_dll_xml.o: ./wxbind/src/xml.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/xml.cpp + wxluadebug_lib_debug.o: ./wxluadebug/src/debug.cpp $(CXXC) -c -o $@ $(WXLUADEBUG_LIB_CXXFLAGS) ./wxluadebug/src/debug.cpp |
|
From: John L. <jr...@us...> - 2005-06-20 06:55:34
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22333/wxLua/samples Modified Files: editor.wx.lua Log Message: wxLua app should probably always load standalone bitmaps for people wrong \ in genwxbind.bat hack to get genwxbind.lua to work with %enums, %builtin is still broken have editor.wx.lua use new wxToolBar::AddTool method Index: editor.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** editor.wx.lua 7 Jun 2005 05:37:45 -0000 1.1 --- editor.wx.lua 20 Jun 2005 06:55:23 -0000 1.2 *************** *** 110,136 **** end ! local bitmapPath = getPath().."/bitmaps/" ! newBitmap = wx.wxBitmapFromFile(bitmapPath.."new.bmp", wx.wxBITMAP_TYPE_BMP) ! openBitmap = wx.wxBitmapFromFile(bitmapPath.."open.bmp", wx.wxBITMAP_TYPE_BMP) ! saveBitmap = wx.wxBitmapFromFile(bitmapPath.."save.bmp", wx.wxBITMAP_TYPE_BMP) ! saveAllBitmap = wx.wxBitmapFromFile(bitmapPath.."saveall.bmp", wx.wxBITMAP_TYPE_BMP) ! cutBitmap = wx.wxBitmapFromFile(bitmapPath.."cut.bmp", wx.wxBITMAP_TYPE_BMP) ! copyBitmap = wx.wxBitmapFromFile(bitmapPath.."copy.bmp", wx.wxBITMAP_TYPE_BMP) ! pasteBitmap = wx.wxBitmapFromFile(bitmapPath.."paste.bmp", wx.wxBITMAP_TYPE_BMP) ! helpBitmap = wx.wxBitmapFromFile(bitmapPath.."help.bmp", wx.wxBITMAP_TYPE_BMP) else standaloneLoadBitmaps() end ! toolBar:AddTool(wx.wxID_NEW, newBitmap, wx.wxNullBitmap, wx.FALSE, wx.wxNull, "Creates an empty document") ! toolBar:AddTool(wx.wxID_OPEN, openBitmap, wx.wxNullBitmap, wx.FALSE, wx.wxNull, "Opens an existing document") ! toolBar:AddTool(wx.wxID_SAVE, saveBitmap, wx.wxNullBitmap, wx.FALSE, wx.wxNull, "Saves the document") ! toolBar:AddTool(wxID_SAVEALL, saveAllBitmap, wx.wxNullBitmap, wx.FALSE, wx.wxNull, "Saves the document") toolBar:AddSeparator() ! toolBar:AddTool(wx.wxID_CUT, cutBitmap, wx.wxNullBitmap, wx.FALSE, wx.wxNull, "Cut the selection") ! toolBar:AddTool(wx.wxID_COPY, copyBitmap, wx.wxNullBitmap, wx.FALSE, wx.wxNull, "Copy the selection") ! toolBar:AddTool(wx.wxID_PASTE, pasteBitmap, wx.wxNullBitmap, wx.FALSE, wx.wxNull, "Paste the clipboard") toolBar:AddSeparator() ! toolBar:AddTool(wx.wxID_HELP, helpBitmap, wx.wxNullBitmap, wx.FALSE, wx.wxNull, "Display the About box") toolBar:Realize() --- 110,137 ---- end ! local bitmapPath = getPath().."./art/" ! print(bitmapPath ) ! newBitmap = wx.wxBitmapFromFile(bitmapPath.."new.xpm", wx.wxBITMAP_TYPE_XPM) ! openBitmap = wx.wxBitmapFromFile(bitmapPath.."open.xpm", wx.wxBITMAP_TYPE_XPM) ! saveBitmap = wx.wxBitmapFromFile(bitmapPath.."save.xpm", wx.wxBITMAP_TYPE_XPM) ! saveAllBitmap = wx.wxBitmapFromFile(bitmapPath.."saveall.xpm", wx.wxBITMAP_TYPE_XPM) ! cutBitmap = wx.wxBitmapFromFile(bitmapPath.."cut.xpm", wx.wxBITMAP_TYPE_XPM) ! copyBitmap = wx.wxBitmapFromFile(bitmapPath.."copy.xpm", wx.wxBITMAP_TYPE_XPM) ! pasteBitmap = wx.wxBitmapFromFile(bitmapPath.."paste.xpm", wx.wxBITMAP_TYPE_XPM) ! helpBitmap = wx.wxBitmapFromFile(bitmapPath.."help.xpm", wx.wxBITMAP_TYPE_XPM) else standaloneLoadBitmaps() end ! toolBar:AddToolSimple(wx.wxID_NEW, "New", newBitmap, "Creates an empty document") ! toolBar:AddToolSimple(wx.wxID_OPEN, "Open", openBitmap, "Opens an existing document") ! toolBar:AddToolSimple(wx.wxID_SAVE, "Save", saveBitmap, "Saves the document") ! toolBar:AddToolSimple(wxID_SAVEALL, "Save All", saveAllBitmap, "Saves all documents") toolBar:AddSeparator() ! toolBar:AddToolSimple(wx.wxID_CUT, "Cut", cutBitmap, "Cut the selection") ! toolBar:AddToolSimple(wx.wxID_COPY, "Copy", copyBitmap, "Copy the selection") ! toolBar:AddToolSimple(wx.wxID_PASTE, "Paste", pasteBitmap, "Paste the clipboard") toolBar:AddSeparator() ! toolBar:AddToolSimple(wx.wxID_HELP, "Help", helpBitmap, "Display the About box") toolBar:Realize() |
|
From: John L. <jr...@us...> - 2005-06-20 06:55:33
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22333/wxLua/bindings Modified Files: genwxbind.bat genwxbind.lua Log Message: wxLua app should probably always load standalone bitmaps for people wrong \ in genwxbind.bat hack to get genwxbind.lua to work with %enums, %builtin is still broken have editor.wx.lua use new wxToolBar::AddTool method Index: genwxbind.bat =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.bat,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** genwxbind.bat 18 Jun 2005 20:53:41 -0000 1.1 --- genwxbind.bat 20 Jun 2005 06:55:23 -0000 1.2 *************** *** 5,9 **** echo Generating wxWidgets Binding ! %LUA% -e"rulesFilename=\"wxwidgets\wx.rules\"" genwxbind.lua > wxwidgets\error.txt echo Done. --- 5,9 ---- echo Generating wxWidgets Binding ! %LUA% -e"rulesFilename=\"wxwidgets/wx.rules\"" genwxbind.lua > wxwidgets\error.txt echo Done. Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** genwxbind.lua 18 Jun 2005 20:53:41 -0000 1.1 --- genwxbind.lua 20 Jun 2005 06:55:23 -0000 1.2 *************** *** 1228,1231 **** --- 1228,1233 ---- table.insert(parseState.ObjectStack, 1, globals) + local enumType = "" -- FIXME temp fix + local lineCount = table.getn(interfaceData) for l=1, lineCount do *************** *** 1401,1404 **** --- 1403,1408 ---- end + enumType = "" + table.insert(objectList, parseState.ObjectStack[1]) table.remove(parseState.ObjectStack, 1) *************** *** 1577,1580 **** --- 1581,1585 ---- lineState.DefType = "enum" lineState.Name = tag + lineState.DataType = enumType local member= AllocMember(lineState) *************** *** 1668,1675 **** lineState.ActionMandatory = false elseif lineState.Action == "enumname" then ! -- FIXME THIS IS THE NAME OF THE ENUM!!! ! print("ENUMNAME ", tag) parseState.ObjectStack[1].Name = tag ! lineState.Action = nil lineState.ActionMandatory = false --- 1673,1683 ---- lineState.ActionMandatory = false elseif lineState.Action == "enumname" then ! -- FIXME THIS IS THE NAME OF THE ENUM!!! ! -- print("ENUMNAME ", tag) parseState.ObjectStack[1].Name = tag ! ! lineState.DataType = tag ! enumType = tag ! lineState.Action = nil lineState.ActionMandatory = false *************** *** 2521,2528 **** elseif member.DefType == "enum" then -- FIXME - write enum as enumType::enumValue ! print(member.Name, member.DataType, member.DefType, member.TypedDataTypeWithAttrib, TypedDataType) local enumBinding = { ! Map = " { \""..member.Name.."\", false, "..member.Name..", 0 },\n", Condition = fullcondition } --- 2529,2545 ---- elseif member.DefType == "enum" then -- FIXME - write enum as enumType::enumValue ! print(member.Name, member.DataType, member.DefType, member.TypedDataTypeWithAttrib, member.TypedDataType) ! ! -- if we have wxDateTime::TZ, only take the wxDateTime part ! local dataType = member.DataType or "" ! local pos = string.find(dataType, "::") ! local namespace = "" ! if pos then ! namespace = string.sub(dataType, 0, pos - 1) .. "::" ! end ! local enumBinding = { ! Map = " { \""..member.Name.."\", false, "..namespace..member.Name..", 0 },\n", Condition = fullcondition } |
|
From: John L. <jr...@us...> - 2005-06-20 06:55:33
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22333/wxLua/bindings/wxwidgets Modified Files: defsutil.i menutool.i windows.i Log Message: wxLua app should probably always load standalone bitmaps for people wrong \ in genwxbind.bat hack to get genwxbind.lua to work with %enums, %builtin is still broken have editor.wx.lua use new wxToolBar::AddTool method Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** windows.i 18 Jun 2005 20:45:59 -0000 1.2 --- windows.i 20 Jun 2005 06:55:23 -0000 1.3 *************** *** 55,59 **** virtual wxSize GetBestSize() const %property=BestSize, read ! wxCaret * GetCaret() const virtual int GetCharHeight() const %property=CharHeight, read --- 55,59 ---- virtual wxSize GetBestSize() const %property=BestSize, read ! wxCaret* GetCaret() const virtual int GetCharHeight() const %property=CharHeight, read *************** *** 68,72 **** wxEvtHandler* GetEventHandler() const long GetExtraStyle() const ! wxFont& GetFont() const virtual wxColour GetForegroundColour() wxWindow* GetGrandParent() const --- 68,72 ---- wxEvtHandler* GetEventHandler() const long GetExtraStyle() const ! wxFont GetFont() const virtual wxColour GetForegroundColour() wxWindow* GetGrandParent() const Index: menutool.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/menutool.i,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** menutool.i 19 Jun 2005 05:47:45 -0000 1.3 --- menutool.i 20 Jun 2005 06:55:23 -0000 1.4 *************** *** 177,180 **** --- 177,181 ---- wxToolBarToolBase *AddControl(wxControl *control) wxToolBarToolBase *AddSeparator() + // FIXME this was old method - There is no AddTool that takes clientData !%wxchkver24 wxToolBarToolBase *AddTool(int id, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap, bool isToggle = FALSE, wxObject *clientData = NULL, const wxString& longHelpString = "") %wxchkver24 %rename AddToolSimple wxToolBarToolBase *AddTool(int toolid, const wxString& label, const wxBitmap& bitmap, const wxString& shortHelp = "", wxItemKind kind = wxITEM_NORMAL) *************** *** 182,185 **** --- 183,187 ---- %wxchkver24 wxToolBarToolBase *AddCheckTool(int toolid, const wxString& label, const wxBitmap& bitmap, const wxBitmap& bmpDisabled = wxNullBitmap, const wxString& shortHelp = "", const wxString& longHelp = "", wxObject *data = NULL) %wxchkver24 wxToolBarToolBase *AddRadioTool(int toolid, const wxString& label, const wxBitmap& bitmap, const wxBitmap& bmpDisabled = wxNullBitmap, const wxString& shortHelp = "", const wxString& longHelp = "", wxObject *data = NULL) + // FIXME this was old method - There is no InsertTool that takes clientData !%wxchkver24 wxToolBarToolBase *InsertTool(size_t pos, int id, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap, bool isToggle = FALSE, wxObject *clientData = NULL, const wxString& shortHelpString = "", const wxString& longHelpString = "") %wxchkver24 virtual wxToolBarToolBase *InsertTool(size_t pos, int toolid, const wxString& label, const wxBitmap& bitmap, const wxBitmap& bmpDisabled = wxNullBitmap, wxItemKind kind = wxITEM_NORMAL, const wxString& shortHelp = "", const wxString& longHelp = "", wxObject *clientData = NULL) Index: defsutil.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** defsutil.i 18 Jun 2005 20:45:58 -0000 1.2 --- defsutil.i 20 Jun 2005 06:55:23 -0000 1.3 *************** *** 90,94 **** --- 90,108 ---- // Time functions - see datatime.i + /////////////////////////////////////////////////////////////////////////////// + // wxLua platform defines - FIXME add simple method wxPlatform returning unix, msw, ... + + %win %define wxPlatformWindows + %gtk %define wxPlatformGTK + %mac %define wxPlatformMac + %mgl %define wxPlatformMgl + %motif %define wxPlatformMotif + %os2 %define wxPlatformOS2 + // %univ %define wxPlatformUniv // FIXME add this back + %x11 %define wxPlatformX11 + %cocoa %define wxPlatformCocoa + /////////////////////////////////////////////////////////////////////////////// + // wxWidgets window IDs %if wxLUA_USE_wxID_XXX *************** *** 148,151 **** --- 162,222 ---- %endif wxLUA_USE_wxID_XXX + /////////////////////////////////////////////////////////////////////////////// + // Generic defines and enums + + %define wxBACKINGSTORE + %define wxBACKWARD + %define wxBOTH + %define wxBOTTOM + %define wxCANCEL + %define wxCENTER + %define wxCENTER_FRAME + %define wxCENTER_ON_SCREEN + %define wxCENTRE + %define wxCENTRE_ON_SCREEN + %define wxCOLOURED + //%define wxED_BUTTONS_BOTTOM // for wxExtDialog? not used? + //%define wxED_BUTTONS_RIGHT + //%define wxED_CLIENT_MARGIN + //%define wxED_STATIC_LINE + %define wxEQUIV + %define wxFIXED_LENGTH + %define wxFORWARD + %define wxGTK + %define wxHELP + %define wxHORIZONTAL + %define wxINVERT + %define wxMORE + %define wxMOTIF_X + %define wxNO + %define wxNO_BORDER + %define wxNO_DEFAULT + %define wxOK + %define wxPASSWORD + %define wxPROCESS_ENTER + %define wxRESET + %define wxRESIZE_BOX + %define wxRETAINED + %define wxRIGHT + %define wxSET + %define wxSETUP + %define wxSIZE_ALLOW_MINUS_ONE + %define wxSIZE_AUTO + %define wxSIZE_AUTO_HEIGHT + %define wxSIZE_AUTO_WIDTH + %define wxSIZE_NO_ADJUSTMENTS + %define wxSIZE_USE_EXISTING + %define wxST_NO_AUTORESIZE + %define wxTOP + %define wxUNKNOWN_PLATFORM + //%define wxUSER_COLOURS depricated use wxNO_3D + %define wxVERTICAL + %define wxWINDOWS + %define wxWS_EX_VALIDATE_RECURSIVELY + %define wxXVIEW_X + %define wxYES + %define wxYES_DEFAULT + %define wxYES_NO + %enum wxDirection wxLEFT |
|
From: John L. <jr...@us...> - 2005-06-20 06:55:33
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22333/wxLua/apps/wxlua/src Modified Files: wxlua.cpp Log Message: wxLua app should probably always load standalone bitmaps for people wrong \ in genwxbind.bat hack to get genwxbind.lua to work with %enums, %builtin is still broken have editor.wx.lua use new wxToolBar::AddTool method Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxlua.cpp 18 Jun 2005 20:45:46 -0000 1.3 --- wxlua.cpp 20 Jun 2005 06:55:22 -0000 1.4 *************** *** 140,143 **** --- 140,153 ---- RegisterClasses(m_luaState); + wxFileSystem::AddHandler(new wxMemoryFSHandler); + + wxImage::AddHandler(new wxXPMHandler); + #include "../art/wxluasmall.xpm" + wxMemoryFSHandler::AddFile(wxT("wxLua"), wxBitmap(wxLuaSmall_xpm), wxBITMAP_TYPE_XPM); + m_fMemoryBitmapAdded = true; + + lua_pushcfunction(m_luaState, CreateStandaloneBitmaps); + lua_setglobal(m_luaState, "standaloneLoadBitmaps"); + if (argc == 1) { *************** *** 369,373 **** { #include "editor.h" ! wxFileSystem::AddHandler(new wxMemoryFSHandler); --- 379,383 ---- { #include "editor.h" ! /* wxFileSystem::AddHandler(new wxMemoryFSHandler); *************** *** 379,383 **** lua_pushcfunction(m_luaState, CreateStandaloneBitmaps); lua_setglobal(m_luaState, "standaloneLoadBitmaps"); ! return m_luaInterpreter->RunBuffer(wxLuaEditor, sizeof(wxLuaEditor), g_strProgramName); } --- 389,393 ---- lua_pushcfunction(m_luaState, CreateStandaloneBitmaps); lua_setglobal(m_luaState, "standaloneLoadBitmaps"); ! */ return m_luaInterpreter->RunBuffer(wxLuaEditor, sizeof(wxLuaEditor), g_strProgramName); } |
|
From: Francesco <fr...@us...> - 2005-06-19 19:11:17
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7921/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Updated makefiles Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.vc 14 Jun 2005 21:44:42 -0000 1.2 --- makefile.vc 19 Jun 2005 19:11:07 -0000 1.3 *************** *** 106,109 **** --- 106,127 ---- msvc$(WXLIBPOSTFIX)\wxlua_dll_interp.obj \ msvc$(WXLIBPOSTFIX)\wxlua_dll_library.obj + WXBIND_LIB_CXXFLAGS = /MD$(__DEBUGRUNTIME) /DWIN32 $(__WXUNICODE_DEFINE_p) \ + $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ + /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ + /I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \ + $(__DEBUGINFO) /Fd..\..\..\lib\vc_lib\wxbind.pdb $(____DEBUGRUNTIME) \ + $(__WX_SHAREDDEFINE_p) /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) + WXBIND_LIB_OBJECTS = \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_wxlhtmlwin.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.obj + WXBIND_DLL_CXXFLAGS = /MD$(__DEBUGRUNTIME) /DWIN32 $(__WXUNICODE_DEFINE_p) \ + $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ + /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ + /I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \ + $(__DEBUGINFO) /Fd..\..\..\lib\vc_dll\wxbind_dll.pdb $(____DEBUGRUNTIME) \ + $(__WX_SHAREDDEFINE_p) /DA2DWXBINDMAKINGDLL /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) + WXBIND_DLL_OBJECTS = \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_wxlhtmlwin.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_wxlprint.obj WXLUADEBUG_LIB_CXXFLAGS = /MD$(__DEBUGRUNTIME) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ *************** *** 163,166 **** --- 181,190 ---- !endif !if "$(WX_SHARED)" == "0" + __wxbind_lib___depname = ..\..\..\lib\vc_lib\wxbind.lib + !endif + !if "$(WX_SHARED)" == "1" + __wxbind_dll___depname = ..\..\..\lib\vc_dll\wxbind_dll.dll + !endif + !if "$(WX_SHARED)" == "0" __wxluadebug_lib___depname = ..\..\..\lib\vc_lib\wxluadebug.lib !endif *************** *** 175,182 **** !endif !if "$(WX_DEBUG)" == "0" ! __DEBUGINFO_1 = !endif !if "$(WX_DEBUG)" == "1" ! __DEBUGINFO_1 = /DEBUG !endif !if "$(WX_SHARED)" == "0" --- 199,206 ---- !endif !if "$(WX_DEBUG)" == "0" ! __DEBUGINFO_2 = !endif !if "$(WX_DEBUG)" == "1" ! __DEBUGINFO_2 = /DEBUG !endif !if "$(WX_SHARED)" == "0" *************** *** 248,252 **** ### Targets: ### ! all: ..\..\..\lib\vc_lib ..\..\..\lib\vc_dll ..\..\..\lib\vc_lib\lua.lib ..\..\..\bin\lua.exe $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) clean: --- 272,276 ---- ### Targets: ### ! all: ..\..\..\lib\vc_lib ..\..\..\lib\vc_dll ..\..\..\lib\vc_lib\lua.lib ..\..\..\bin\lua.exe $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxbind_lib___depname) $(__wxbind_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) clean: *************** *** 263,266 **** --- 287,295 ---- -if exist ..\..\..\lib\vc_dll\wxlua_dll.pdb del ..\..\..\lib\vc_dll\wxlua_dll.pdb -if exist ..\..\..\lib\vc_dll\wxlua.lib del ..\..\..\lib\vc_dll\wxlua.lib + -if exist ..\..\..\lib\vc_lib\wxbind.lib del ..\..\..\lib\vc_lib\wxbind.lib + -if exist ..\..\..\lib\vc_dll\wxbind_dll.dll del ..\..\..\lib\vc_dll\wxbind_dll.dll + -if exist ..\..\..\lib\vc_dll\wxbind_dll.ilk del ..\..\..\lib\vc_dll\wxbind_dll.ilk + -if exist ..\..\..\lib\vc_dll\wxbind_dll.pdb del ..\..\..\lib\vc_dll\wxbind_dll.pdb + -if exist ..\..\..\lib\vc_dll\wxbind.lib del ..\..\..\lib\vc_dll\wxbind.lib -if exist ..\..\..\lib\vc_lib\wxluadebug.lib del ..\..\..\lib\vc_lib\wxluadebug.lib -if exist ..\..\..\lib\vc_dll\wxluadebug_dll.dll del ..\..\..\lib\vc_dll\wxluadebug_dll.dll *************** *** 301,305 **** !if "$(WX_SHARED)" == "1" ..\..\..\lib\vc_dll\wxlua_dll.dll: $(WXLUA_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_1) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< $(WXLUA_DLL_OBJECTS) wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).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 /IMPLIB:..\..\..\lib\vc_dll\wxlua.lib << --- 330,334 ---- !if "$(WX_SHARED)" == "1" ..\..\..\lib\vc_dll\wxlua_dll.dll: $(WXLUA_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_2) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< $(WXLUA_DLL_OBJECTS) wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).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 /IMPLIB:..\..\..\lib\vc_dll\wxlua.lib << *************** *** 307,310 **** --- 336,354 ---- !if "$(WX_SHARED)" == "0" + ..\..\..\lib\vc_lib\wxbind.lib: $(WXBIND_LIB_OBJECTS) + if exist $@ del $@ + lib /NOLOGO /OUT:$@ @<< + $(WXBIND_LIB_OBJECTS) + << + !endif + + !if "$(WX_SHARED)" == "1" + ..\..\..\lib\vc_dll\wxbind_dll.dll: $(WXBIND_DLL_OBJECTS) + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_2) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< + $(WXBIND_DLL_OBJECTS) wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).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 /IMPLIB:..\..\..\lib\vc_dll\wxbind.lib + << + !endif + + !if "$(WX_SHARED)" == "0" ..\..\..\lib\vc_lib\wxluadebug.lib: $(WXLUADEBUG_LIB_OBJECTS) if exist $@ del $@ *************** *** 316,320 **** !if "$(WX_SHARED)" == "1" ..\..\..\lib\vc_dll\wxluadebug_dll.dll: $(WXLUADEBUG_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_1) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< $(WXLUADEBUG_DLL_OBJECTS) wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).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 /IMPLIB:..\..\..\lib\vc_dll\wxluadebug.lib << --- 360,364 ---- !if "$(WX_SHARED)" == "1" ..\..\..\lib\vc_dll\wxluadebug_dll.dll: $(WXLUADEBUG_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_2) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< $(WXLUADEBUG_DLL_OBJECTS) wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).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 /IMPLIB:..\..\..\lib\vc_dll\wxluadebug.lib << *************** *** 331,335 **** !if "$(WX_SHARED)" == "1" ..\..\..\lib\vc_dll\wxluasocket_dll.dll: $(WXLUASOCKET_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_1) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< $(WXLUASOCKET_DLL_OBJECTS) wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).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 /IMPLIB:..\..\..\lib\vc_dll\wxluasocket.lib << --- 375,379 ---- !if "$(WX_SHARED)" == "1" ..\..\..\lib\vc_dll\wxluasocket_dll.dll: $(WXLUASOCKET_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_2) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< $(WXLUASOCKET_DLL_OBJECTS) wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).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 /IMPLIB:..\..\..\lib\vc_dll\wxluasocket.lib << *************** *** 444,447 **** --- 488,503 ---- $(CXX) /c /nologo /TP /Fo$@ $(WXLUA_DLL_CXXFLAGS) $** + msvc$(WXLIBPOSTFIX)\wxbind_lib_wxlhtmlwin.obj: ..\..\wxbind\src\wxlhtmlwin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.obj: ..\..\wxbind\src\wxlprint.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_wxlhtmlwin.obj: ..\..\wxbind\src\wxlhtmlwin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_wxlprint.obj: ..\..\wxbind\src\wxlprint.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + msvc$(WXLIBPOSTFIX)\wxluadebug_lib_debug.obj: ..\..\wxluadebug\src\debug.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXLUADEBUG_LIB_CXXFLAGS) $** Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.bcc 14 Jun 2005 21:44:41 -0000 1.4 --- makefile.bcc 19 Jun 2005 19:11:07 -0000 1.5 *************** *** 135,138 **** --- 135,154 ---- borland$(WXLIBPOSTFIX)\wxlua_dll_interp.obj \ borland$(WXLIBPOSTFIX)\wxlua_dll_library.obj + WXBIND_LIB_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ + $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ + -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ + -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG) $(__DEBUGINFO) -tWM \ + $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) + WXBIND_LIB_OBJECTS = \ + borland$(WXLIBPOSTFIX)\wxbind_lib_wxlhtmlwin.obj \ + borland$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.obj + WXBIND_DLL_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ + $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ + -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ + -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG) $(__DEBUGINFO) -tWM \ + $(__WX_SHAREDDEFINE_p) -DA2DWXBINDMAKINGDLL $(CPPFLAGS) $(CXXFLAGS) + WXBIND_DLL_OBJECTS = \ + borland$(WXLIBPOSTFIX)\wxbind_dll_wxlhtmlwin.obj \ + borland$(WXLIBPOSTFIX)\wxbind_dll_wxlprint.obj WXLUADEBUG_LIB_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ *************** *** 186,189 **** --- 202,211 ---- !endif !if "$(WX_SHARED)" == "0" + __wxbind_lib___depname = ..\..\..\lib\bcc_lib\wxbind.lib + !endif + !if "$(WX_SHARED)" == "1" + __wxbind_dll___depname = ..\..\..\lib\bcc_dll\wxbind_dll.dll + !endif + !if "$(WX_SHARED)" == "0" __wxluadebug_lib___depname = ..\..\..\lib\bcc_lib\wxluadebug.lib !endif *************** *** 247,251 **** ### Targets: ### ! all: ..\..\..\lib\bcc_lib ..\..\..\lib\bcc_dll ..\..\..\lib\bcc_lib\lua.lib ..\..\..\bin\lua.exe $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) clean: --- 269,273 ---- ### Targets: ### ! all: ..\..\..\lib\bcc_lib ..\..\..\lib\bcc_dll ..\..\..\lib\bcc_lib\lua.lib ..\..\..\bin\lua.exe $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxbind_lib___depname) $(__wxbind_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) clean: *************** *** 268,271 **** --- 290,301 ---- -if exist ..\..\..\lib\bcc_dll\wxlua_dll.ils del ..\..\..\lib\bcc_dll\wxlua_dll.ils -if exist ..\..\..\lib\bcc_dll\wxlua.lib del ..\..\..\lib\bcc_dll\wxlua.lib + -if exist ..\..\..\lib\bcc_lib\wxbind.lib del ..\..\..\lib\bcc_lib\wxbind.lib + -if exist ..\..\..\lib\bcc_dll\wxbind_dll.dll del ..\..\..\lib\bcc_dll\wxbind_dll.dll + -if exist ..\..\..\lib\bcc_dll\wxbind_dll.tds del ..\..\..\lib\bcc_dll\wxbind_dll.tds + -if exist ..\..\..\lib\bcc_dll\wxbind_dll.ilc del ..\..\..\lib\bcc_dll\wxbind_dll.ilc + -if exist ..\..\..\lib\bcc_dll\wxbind_dll.ild del ..\..\..\lib\bcc_dll\wxbind_dll.ild + -if exist ..\..\..\lib\bcc_dll\wxbind_dll.ilf del ..\..\..\lib\bcc_dll\wxbind_dll.ilf + -if exist ..\..\..\lib\bcc_dll\wxbind_dll.ils del ..\..\..\lib\bcc_dll\wxbind_dll.ils + -if exist ..\..\..\lib\bcc_dll\wxbind.lib del ..\..\..\lib\bcc_dll\wxbind.lib -if exist ..\..\..\lib\bcc_lib\wxluadebug.lib del ..\..\..\lib\bcc_lib\wxluadebug.lib -if exist ..\..\..\lib\bcc_dll\wxluadebug_dll.dll del ..\..\..\lib\bcc_dll\wxluadebug_dll.dll *************** *** 319,322 **** --- 349,368 ---- !if "$(WX_SHARED)" == "0" + ..\..\..\lib\bcc_lib\wxbind.lib: $(WXBIND_LIB_OBJECTS) + if exist $@ del $@ + tlib /a /p4096 $@ @&&| + $(WXBIND_LIB_OBJECTS) + | + !endif + + !if "$(WX_SHARED)" == "1" + ..\..\..\lib\bcc_dll\wxbind_dll.dll: $(WXBIND_DLL_OBJECTS) + ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| + c0d32.obj $(WXBIND_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, + | + implib -f ..\..\..\lib\bcc_dll\wxbind $@ + !endif + + !if "$(WX_SHARED)" == "0" ..\..\..\lib\bcc_lib\wxluadebug.lib: $(WXLUADEBUG_LIB_OBJECTS) if exist $@ del $@ *************** *** 458,461 **** --- 504,519 ---- $(CXX) -q -c -P -o$@ $(WXLUA_DLL_CXXFLAGS) $** + borland$(WXLIBPOSTFIX)\wxbind_lib_wxlhtmlwin.obj: ..\..\wxbind\src\wxlhtmlwin.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.obj: ..\..\wxbind\src\wxlprint.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_wxlhtmlwin.obj: ..\..\wxbind\src\wxlhtmlwin.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_wxlprint.obj: ..\..\wxbind\src\wxlprint.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + borland$(WXLIBPOSTFIX)\wxluadebug_lib_debug.obj: ..\..\wxluadebug\src\debug.cpp $(CXX) -q -c -P -o$@ $(WXLUADEBUG_LIB_CXXFLAGS) $** Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.wat 14 Jun 2005 21:44:42 -0000 1.2 --- makefile.wat 19 Jun 2005 19:11:07 -0000 1.3 *************** *** 79,82 **** --- 79,90 ---- __wxlua_dll___depname = ..\..\..\lib\wat_dll\wxlua_dll.dll !endif + __wxbind_lib___depname = + !ifeq WX_SHARED 0 + __wxbind_lib___depname = ..\..\..\lib\wat_lib\wxbind.lib + !endif + __wxbind_dll___depname = + !ifeq WX_SHARED 1 + __wxbind_dll___depname = ..\..\..\lib\wat_dll\wxbind_dll.dll + !endif __wxluadebug_lib___depname = !ifeq WX_SHARED 0 *************** *** 95,104 **** __wxluasocket_dll___depname = ..\..\..\lib\wat_dll\wxluasocket_dll.dll !endif ! __DEBUGINFO_1 = !ifeq WX_DEBUG 0 ! __DEBUGINFO_1 = !endif !ifeq WX_DEBUG 1 ! __DEBUGINFO_1 = debug all !endif __WXLUA_OUTPUT_FOLDER_FILENAMES = --- 103,112 ---- __wxluasocket_dll___depname = ..\..\..\lib\wat_dll\wxluasocket_dll.dll !endif ! __DEBUGINFO_3 = !ifeq WX_DEBUG 0 ! __DEBUGINFO_3 = !endif !ifeq WX_DEBUG 1 ! __DEBUGINFO_3 = debug all !endif __WXLUA_OUTPUT_FOLDER_FILENAMES = *************** *** 219,222 **** --- 227,245 ---- watcom$(WXLIBPOSTFIX)\wxlua_dll_interp.obj & watcom$(WXLIBPOSTFIX)\wxlua_dll_library.obj + WXBIND_LIB_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) + WXBIND_LIB_OBJECTS = & + watcom$(WXLIBPOSTFIX)\wxbind_lib_wxlhtmlwin.obj & + watcom$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.obj + WXBIND_DLL_CXXFLAGS = -bd $(__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) -dA2DWXBINDMAKINGDLL $(CPPFLAGS) & + $(CXXFLAGS) + WXBIND_DLL_OBJECTS = & + watcom$(WXLIBPOSTFIX)\wxbind_dll_wxlhtmlwin.obj & + watcom$(WXLIBPOSTFIX)\wxbind_dll_wxlprint.obj WXLUADEBUG_LIB_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & *************** *** 263,267 **** ### Targets: ### ! all : .SYMBOLIC ..\..\..\lib\wat_lib ..\..\..\lib\wat_dll ..\..\..\lib\wat_lib\lua.lib ..\..\..\bin\lua.exe $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) clean : .SYMBOLIC --- 286,290 ---- ### Targets: ### ! all : .SYMBOLIC ..\..\..\lib\wat_lib ..\..\..\lib\wat_dll ..\..\..\lib\wat_lib\lua.lib ..\..\..\bin\lua.exe $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxbind_lib___depname) $(__wxbind_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) clean : .SYMBOLIC *************** *** 276,279 **** --- 299,305 ---- -if exist ..\..\..\lib\wat_dll\wxlua_dll.dll del ..\..\..\lib\wat_dll\wxlua_dll.dll -if exist ..\..\..\lib\wat_dll\wxlua.lib del ..\..\..\lib\wat_dll\wxlua.lib + -if exist ..\..\..\lib\wat_lib\wxbind.lib del ..\..\..\lib\wat_lib\wxbind.lib + -if exist ..\..\..\lib\wat_dll\wxbind_dll.dll del ..\..\..\lib\wat_dll\wxbind_dll.dll + -if exist ..\..\..\lib\wat_dll\wxbind.lib del ..\..\..\lib\wat_dll\wxbind.lib -if exist ..\..\..\lib\wat_lib\wxluadebug.lib del ..\..\..\lib\wat_lib\wxluadebug.lib -if exist ..\..\..\lib\wat_dll\wxluadebug_dll.dll del ..\..\..\lib\wat_dll\wxluadebug_dll.dll *************** *** 318,322 **** @%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_1) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(WXLUA_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc file %i @for %i in ( wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).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)\wxlua_dll.lbc library %i --- 344,348 ---- @%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_3) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(WXLUA_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc file %i @for %i in ( wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).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)\wxlua_dll.lbc library %i *************** *** 328,331 **** --- 354,379 ---- !ifeq WX_SHARED 0 + ..\..\..\lib\wat_lib\wxbind.lib : $(WXBIND_LIB_OBJECTS) + @%create watcom$(WXLIBPOSTFIX)\wxbind_lib.lbc + @for %i in ($(WXBIND_LIB_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxbind_lib.lbc +%i + wlib -q -p4096 -n -b $^@ @watcom$(WXLIBPOSTFIX)\wxbind_lib.lbc + !endif + + !ifeq WX_SHARED 1 + ..\..\..\lib\wat_dll\wxbind_dll.dll : $(WXBIND_DLL_OBJECTS) + @%create watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc + @%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc option quiet + @%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc name $^@ + @%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc option caseexact + @%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_3) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) + @for %i in ($(WXBIND_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc file %i + @for %i in ( wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).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)\wxbind_dll.lbc library %i + @%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc + @%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc system nt_dll + wlink @watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc + wlib -q -n -b ..\..\..\lib\wat_dll\wxbind.lib +$^@ + !endif + + !ifeq WX_SHARED 0 ..\..\..\lib\wat_lib\wxluadebug.lib : $(WXLUADEBUG_LIB_OBJECTS) @%create watcom$(WXLIBPOSTFIX)\wxluadebug_lib.lbc *************** *** 340,344 **** @%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_1) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(WXLUADEBUG_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc file %i @for %i in ( wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).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)\wxluadebug_dll.lbc library %i --- 388,392 ---- @%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_3) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(WXLUADEBUG_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc file %i @for %i in ( wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).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)\wxluadebug_dll.lbc library %i *************** *** 362,366 **** @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_1) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(WXLUASOCKET_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc file %i @for %i in ( wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).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)\wxluasocket_dll.lbc library %i --- 410,414 ---- @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_3) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(WXLUASOCKET_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc file %i @for %i in ( wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).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)\wxluasocket_dll.lbc library %i *************** *** 479,482 **** --- 527,542 ---- $(CXX) -zq -fo=$^@ $(WXLUA_DLL_CXXFLAGS) $< + watcom$(WXLIBPOSTFIX)\wxbind_lib_wxlhtmlwin.obj : .AUTODEPEND ..\..\wxbind\src\wxlhtmlwin.cpp + $(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.obj : .AUTODEPEND ..\..\wxbind\src\wxlprint.cpp + $(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\wxbind_dll_wxlhtmlwin.obj : .AUTODEPEND ..\..\wxbind\src\wxlhtmlwin.cpp + $(CXX) -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\wxbind_dll_wxlprint.obj : .AUTODEPEND ..\..\wxbind\src\wxlprint.cpp + $(CXX) -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $< + watcom$(WXLIBPOSTFIX)\wxluadebug_lib_debug.obj : .AUTODEPEND ..\..\wxluadebug\src\debug.cpp $(CXX) -zq -fo=$^@ $(WXLUADEBUG_LIB_CXXFLAGS) $< Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.gcc 14 Jun 2005 21:44:41 -0000 1.4 --- makefile.gcc 19 Jun 2005 19:11:07 -0000 1.5 *************** *** 105,108 **** --- 105,125 ---- mingw$(WXLIBPOSTFIX)\wxlua_dll_interp.o \ mingw$(WXLIBPOSTFIX)\wxlua_dll_library.o + WXBIND_LIB_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ + $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ + -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ + -I$(WX_DIR)\include -I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \ + $(__DEBUGINFO) -mthreads $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) + WXBIND_LIB_OBJECTS = \ + mingw$(WXLIBPOSTFIX)\wxbind_lib_wxlhtmlwin.o \ + mingw$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.o + WXBIND_DLL_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ + $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ + -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ + -I$(WX_DIR)\include -I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \ + $(__DEBUGINFO) -mthreads $(__WX_SHAREDDEFINE_p) -DA2DWXBINDMAKINGDLL \ + $(CPPFLAGS) $(CXXFLAGS) + WXBIND_DLL_OBJECTS = \ + mingw$(WXLIBPOSTFIX)\wxbind_dll_wxlhtmlwin.o \ + mingw$(WXLIBPOSTFIX)\wxbind_dll_wxlprint.o WXLUADEBUG_LIB_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ *************** *** 158,161 **** --- 175,184 ---- endif ifeq ($(WX_SHARED),0) + __wxbind_lib___depname = ..\..\..\lib\gcc_lib\libwxbind.a + endif + ifeq ($(WX_SHARED),1) + __wxbind_dll___depname = ..\..\..\lib\gcc_dll\wxbind_dll.dll + endif + ifeq ($(WX_SHARED),0) __wxluadebug_lib___depname = ..\..\..\lib\gcc_lib\libwxluadebug.a endif *************** *** 231,235 **** ### Targets: ### ! all: ..\..\..\lib\gcc_lib ..\..\..\lib\gcc_dll ..\..\..\lib\gcc_lib\liblua.a ..\..\..\bin\lua.exe $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) clean: --- 254,258 ---- ### Targets: ### ! all: ..\..\..\lib\gcc_lib ..\..\..\lib\gcc_dll ..\..\..\lib\gcc_lib\liblua.a ..\..\..\bin\lua.exe $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxbind_lib___depname) $(__wxbind_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) clean: *************** *** 240,243 **** --- 263,269 ---- -if exist ..\..\..\lib\gcc_dll\wxlua_dll.dll del ..\..\..\lib\gcc_dll\wxlua_dll.dll -if exist ..\..\..\lib\gcc_dll\libwxlua.a del ..\..\..\lib\gcc_dll\libwxlua.a + -if exist ..\..\..\lib\gcc_lib\libwxbind.a del ..\..\..\lib\gcc_lib\libwxbind.a + -if exist ..\..\..\lib\gcc_dll\wxbind_dll.dll del ..\..\..\lib\gcc_dll\wxbind_dll.dll + -if exist ..\..\..\lib\gcc_dll\libwxbind.a del ..\..\..\lib\gcc_dll\libwxbind.a -if exist ..\..\..\lib\gcc_lib\libwxluadebug.a del ..\..\..\lib\gcc_lib\libwxluadebug.a -if exist ..\..\..\lib\gcc_dll\wxluadebug_dll.dll del ..\..\..\lib\gcc_dll\wxluadebug_dll.dll *************** *** 274,277 **** --- 300,315 ---- ifeq ($(WX_SHARED),0) + ..\..\..\lib\gcc_lib\libwxbind.a: $(WXBIND_LIB_OBJECTS) + if exist $@ del $@ + ar rcu $@ $(WXBIND_LIB_OBJECTS) + ranlib $@ + endif + + ifeq ($(WX_SHARED),1) + ..\..\..\lib\gcc_dll\wxbind_dll.dll: $(WXBIND_DLL_OBJECTS) + $(CXX) -shared -fPIC -o $@ $(WXBIND_DLL_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--out-implib,..\..\..\lib\gcc_dll\libwxbind.a -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxtiff$(WX3RDPARTLIBPOSTFIX) -lwxjpeg$(WX3RDPARTLIBPOSTFIX) -lwxpng$(WX3RDPARTLIBPOSTFIX) -lwxzlib$(WX3RDPARTLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 + endif + + ifeq ($(WX_SHARED),0) ..\..\..\lib\gcc_lib\libwxluadebug.a: $(WXLUADEBUG_LIB_OBJECTS) if exist $@ del $@ *************** *** 405,408 **** --- 443,458 ---- $(CXX) -c -o $@ $(WXLUA_DLL_CXXFLAGS) $< + mingw$(WXLIBPOSTFIX)\wxbind_lib_wxlhtmlwin.o: ../../wxbind/src/wxlhtmlwin.cpp + $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< + + mingw$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.o: ../../wxbind/src/wxlprint.cpp + $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< + + mingw$(WXLIBPOSTFIX)\wxbind_dll_wxlhtmlwin.o: ../../wxbind/src/wxlhtmlwin.cpp + $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< + + mingw$(WXLIBPOSTFIX)\wxbind_dll_wxlprint.o: ../../wxbind/src/wxlprint.cpp + $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< + mingw$(WXLIBPOSTFIX)\wxluadebug_lib_debug.o: ../../wxluadebug/src/debug.cpp $(CXX) -c -o $@ $(WXLUADEBUG_LIB_CXXFLAGS) $< |
|
From: Francesco <fr...@us...> - 2005-06-19 19:11:17
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7921/modules/build/bakefiles Modified Files: modules.bkl sources.bkl Log Message: Updated makefiles Index: sources.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/sources.bkl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sources.bkl 12 Jun 2005 22:09:12 -0000 1.2 --- sources.bkl 19 Jun 2005 19:11:07 -0000 1.3 *************** *** 48,51 **** --- 48,65 ---- <!-- --> + <!-- wxbind module --> + <!-- --> + <set var="wxbind_src"> + wxbind/src/wxlhtmlwin.cpp + wxbind/src/wxlprint.cpp + </set> + + <set var="wxbind_hdr"> + wxbind/include/wxlhtmlwin.h + wxbind/include/wxlprint.h + </set> + + + <!-- --> <!-- wxlua module --> <!-- --> Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** modules.bkl 14 Jun 2005 21:44:41 -0000 1.4 --- modules.bkl 19 Jun 2005 19:11:07 -0000 1.5 *************** *** 202,205 **** --- 202,213 ---- </wxlua_dll> + <!-- the wxBind lib & dll --> + <wxlua_lib id="wxbind_lib" template="wxlua-lib" cond="WX_SHARED=='0'"> + <module-name>WXBIND</module-name> + </wxlua_lib> + <wxlua_dll id="wxbind_dll" template="wxlua" cond="WX_SHARED=='1'"> + <module-name>WXBIND</module-name> + </wxlua_dll> + <!-- the wxLuaDebug lib & dll --> <wxlua_lib id="wxluadebug_lib" template="wxlua-lib" cond="WX_SHARED=='0'"> |
|
From: Francesco <fr...@us...> - 2005-06-19 19:11:17
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7921/modules Modified Files: Makefile.in Log Message: Updated makefiles Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.in 14 Jun 2005 21:44:41 -0000 1.2 --- Makefile.in 19 Jun 2005 19:11:07 -0000 1.3 *************** *** 82,85 **** --- 82,94 ---- wxlua_dll_interp.o \ wxlua_dll_library.o + WXBIND_LIB_CXXFLAGS = -I./../modules $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) + WXBIND_LIB_OBJECTS = \ + wxbind_lib_wxlhtmlwin.o \ + wxbind_lib_wxlprint.o + WXBIND_DLL_CXXFLAGS = -I./../modules -DA2DWXBINDMAKINGDLL $(PIC_FLAG) \ + $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) + WXBIND_DLL_OBJECTS = \ + wxbind_dll_wxlhtmlwin.o \ + wxbind_dll_wxlprint.o WXLUADEBUG_LIB_CXXFLAGS = -I./../modules $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_LIB_OBJECTS = \ *************** *** 119,133 **** @COND_WX_SHARED_0@ ./../lib/$(LIBPREFIX)wxlua$(LIBEXT) @COND_WX_SHARED_1@__wxlua_dll___depname = \ ! @COND_WX_SHARED_1@ ./../lib/$(DLLPREFIX)wxlua_dll$(__wxlua_2) @COND_USE_SOVERLINUX_1@__wxlua_dll___soname_flags = \ ! @COND_USE_SOVERLINUX_1@ $(SONAME_FLAG)$(DLLPREFIX)wxlua_dll$(__wxlua) @COND_USE_SOVERSOLARIS_1@__wxlua_dll___soname_flags \ ! @COND_USE_SOVERSOLARIS_1@ = \ ! @COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)wxlua_dll$(__wxlua_2) COND_USE_SOSYMLINKS_1___wxlua_dll___so_symlinks_cmd = (cd ./../lib/; rm -f \ ! $(LIBPREFIX)wxlua.$(DLLIMP_SUFFIX) $(DLLPREFIX)wxlua_dll$(__wxlua); \ ! $(LN_S) $(DLLPREFIX)wxlua_dll$(__wxlua_2) $(DLLPREFIX)wxlua_dll$(__wxlua); \ ! $(LN_S) $(DLLPREFIX)wxlua_dll$(__wxlua) \ ! $(LIBPREFIX)wxlua.$(DLLIMP_SUFFIX)) @COND_USE_SOSYMLINKS_1@__wxlua_dll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___wxlua_dll___so_symlinks_cmd) @COND_PLATFORM_OS2_1@__wxlua_dll___importlib = -import \ --- 128,140 ---- @COND_WX_SHARED_0@ ./../lib/$(LIBPREFIX)wxlua$(LIBEXT) @COND_WX_SHARED_1@__wxlua_dll___depname = \ ! @COND_WX_SHARED_1@ ./../lib/$(DLLPREFIX)wxlua_dll$(__wx_4) @COND_USE_SOVERLINUX_1@__wxlua_dll___soname_flags = \ ! @COND_USE_SOVERLINUX_1@ $(SONAME_FLAG)$(DLLPREFIX)wxlua_dll$(__wx) @COND_USE_SOVERSOLARIS_1@__wxlua_dll___soname_flags \ ! @COND_USE_SOVERSOLARIS_1@ = $(SONAME_FLAG)$(DLLPREFIX)wxlua_dll$(__wx_4) COND_USE_SOSYMLINKS_1___wxlua_dll___so_symlinks_cmd = (cd ./../lib/; rm -f \ ! $(LIBPREFIX)wxlua.$(DLLIMP_SUFFIX) $(DLLPREFIX)wxlua_dll$(__wx); $(LN_S) \ ! $(DLLPREFIX)wxlua_dll$(__wx_4) $(DLLPREFIX)wxlua_dll$(__wx); $(LN_S) \ ! $(DLLPREFIX)wxlua_dll$(__wx) $(LIBPREFIX)wxlua.$(DLLIMP_SUFFIX)) @COND_USE_SOSYMLINKS_1@__wxlua_dll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___wxlua_dll___so_symlinks_cmd) @COND_PLATFORM_OS2_1@__wxlua_dll___importlib = -import \ *************** *** 135,154 **** @COND_PLATFORM_WIN32_1@__wxlua_dll___importlib = \ @COND_PLATFORM_WIN32_1@ -Wl,--out-implib,./../lib/$(LIBPREFIX)wxlua.$(DLLIMP_SUFFIX) @COND_WX_SHARED_0@__wxluadebug_lib___depname = \ @COND_WX_SHARED_0@ ./../lib/$(LIBPREFIX)wxluadebug$(LIBEXT) @COND_WX_SHARED_1@__wxluadebug_dll___depname = \ ! @COND_WX_SHARED_1@ ./../lib/$(DLLPREFIX)wxluadebug_dll$(__wxlua_2) @COND_USE_SOVERLINUX_1@__wxluadebug_dll___soname_flags \ ! @COND_USE_SOVERLINUX_1@ = \ ! @COND_USE_SOVERLINUX_1@ $(SONAME_FLAG)$(DLLPREFIX)wxluadebug_dll$(__wxlua) @COND_USE_SOVERSOLARIS_1@__wxluadebug_dll___soname_flags \ @COND_USE_SOVERSOLARIS_1@ = \ ! @COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)wxluadebug_dll$(__wxlua_2) COND_USE_SOSYMLINKS_1___wxluadebug_dll___so_symlinks_cmd = (cd ./../lib/; rm -f \ $(LIBPREFIX)wxluadebug.$(DLLIMP_SUFFIX) \ ! $(DLLPREFIX)wxluadebug_dll$(__wxlua); $(LN_S) \ ! $(DLLPREFIX)wxluadebug_dll$(__wxlua_2) \ ! $(DLLPREFIX)wxluadebug_dll$(__wxlua); $(LN_S) \ ! $(DLLPREFIX)wxluadebug_dll$(__wxlua) \ $(LIBPREFIX)wxluadebug.$(DLLIMP_SUFFIX)) @COND_USE_SOSYMLINKS_1@__wxluadebug_dll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___wxluadebug_dll___so_symlinks_cmd) --- 142,176 ---- @COND_PLATFORM_WIN32_1@__wxlua_dll___importlib = \ @COND_PLATFORM_WIN32_1@ -Wl,--out-implib,./../lib/$(LIBPREFIX)wxlua.$(DLLIMP_SUFFIX) + @COND_WX_SHARED_0@__wxbind_lib___depname = \ + @COND_WX_SHARED_0@ ./../lib/$(LIBPREFIX)wxbind$(LIBEXT) + @COND_WX_SHARED_1@__wxbind_dll___depname = \ + @COND_WX_SHARED_1@ ./../lib/$(DLLPREFIX)wxbind_dll$(__wx_4) + @COND_USE_SOVERLINUX_1@__wxbind_dll___soname_flags = \ + @COND_USE_SOVERLINUX_1@ $(SONAME_FLAG)$(DLLPREFIX)wxbind_dll$(__wx) + @COND_USE_SOVERSOLARIS_1@__wxbind_dll___soname_flags \ + @COND_USE_SOVERSOLARIS_1@ = $(SONAME_FLAG)$(DLLPREFIX)wxbind_dll$(__wx_4) + COND_USE_SOSYMLINKS_1___wxbind_dll___so_symlinks_cmd = (cd ./../lib/; rm -f \ + $(LIBPREFIX)wxbind.$(DLLIMP_SUFFIX) $(DLLPREFIX)wxbind_dll$(__wx); $(LN_S) \ + $(DLLPREFIX)wxbind_dll$(__wx_4) $(DLLPREFIX)wxbind_dll$(__wx); $(LN_S) \ + $(DLLPREFIX)wxbind_dll$(__wx) $(LIBPREFIX)wxbind.$(DLLIMP_SUFFIX)) + @COND_USE_SOSYMLINKS_1@__wxbind_dll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___wxbind_dll___so_symlinks_cmd) + @COND_PLATFORM_OS2_1@__wxbind_dll___importlib = -import \ + @COND_PLATFORM_OS2_1@ ./../lib/$(LIBPREFIX)wxbind.$(DLLIMP_SUFFIX) + @COND_PLATFORM_WIN32_1@__wxbind_dll___importlib = \ + @COND_PLATFORM_WIN32_1@ -Wl,--out-implib,./../lib/$(LIBPREFIX)wxbind.$(DLLIMP_SUFFIX) @COND_WX_SHARED_0@__wxluadebug_lib___depname = \ @COND_WX_SHARED_0@ ./../lib/$(LIBPREFIX)wxluadebug$(LIBEXT) @COND_WX_SHARED_1@__wxluadebug_dll___depname = \ ! @COND_WX_SHARED_1@ ./../lib/$(DLLPREFIX)wxluadebug_dll$(__wx_4) @COND_USE_SOVERLINUX_1@__wxluadebug_dll___soname_flags \ ! @COND_USE_SOVERLINUX_1@ = $(SONAME_FLAG)$(DLLPREFIX)wxluadebug_dll$(__wx) @COND_USE_SOVERSOLARIS_1@__wxluadebug_dll___soname_flags \ @COND_USE_SOVERSOLARIS_1@ = \ ! @COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)wxluadebug_dll$(__wx_4) COND_USE_SOSYMLINKS_1___wxluadebug_dll___so_symlinks_cmd = (cd ./../lib/; rm -f \ $(LIBPREFIX)wxluadebug.$(DLLIMP_SUFFIX) \ ! $(DLLPREFIX)wxluadebug_dll$(__wx); $(LN_S) \ ! $(DLLPREFIX)wxluadebug_dll$(__wx_4) $(DLLPREFIX)wxluadebug_dll$(__wx); \ ! $(LN_S) $(DLLPREFIX)wxluadebug_dll$(__wx) \ $(LIBPREFIX)wxluadebug.$(DLLIMP_SUFFIX)) @COND_USE_SOSYMLINKS_1@__wxluadebug_dll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___wxluadebug_dll___so_symlinks_cmd) *************** *** 162,178 **** @COND_WX_SHARED_0@ ./../lib/$(LIBPREFIX)wxluasocket$(LIBEXT) @COND_WX_SHARED_1@__wxluasocket_dll___depname = \ ! @COND_WX_SHARED_1@ ./../lib/$(DLLPREFIX)wxluasocket_dll$(__wxlua_2) @COND_USE_SOVERLINUX_1@__wxluasocket_dll___soname_flags \ ! @COND_USE_SOVERLINUX_1@ = \ ! @COND_USE_SOVERLINUX_1@ $(SONAME_FLAG)$(DLLPREFIX)wxluasocket_dll$(__wxlua) @COND_USE_SOVERSOLARIS_1@__wxluasocket_dll___soname_flags \ @COND_USE_SOVERSOLARIS_1@ = \ ! @COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)wxluasocket_dll$(__wxlua_2) COND_USE_SOSYMLINKS_1___wxluasocket_dll___so_symlinks_cmd = (cd ./../lib/; rm \ -f $(LIBPREFIX)wxluasocket.$(DLLIMP_SUFFIX) \ ! $(DLLPREFIX)wxluasocket_dll$(__wxlua); $(LN_S) \ ! $(DLLPREFIX)wxluasocket_dll$(__wxlua_2) \ ! $(DLLPREFIX)wxluasocket_dll$(__wxlua); $(LN_S) \ ! $(DLLPREFIX)wxluasocket_dll$(__wxlua) \ $(LIBPREFIX)wxluasocket.$(DLLIMP_SUFFIX)) @COND_USE_SOSYMLINKS_1@__wxluasocket_dll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___wxluasocket_dll___so_symlinks_cmd) --- 184,198 ---- @COND_WX_SHARED_0@ ./../lib/$(LIBPREFIX)wxluasocket$(LIBEXT) @COND_WX_SHARED_1@__wxluasocket_dll___depname = \ ! @COND_WX_SHARED_1@ ./../lib/$(DLLPREFIX)wxluasocket_dll$(__wx_4) @COND_USE_SOVERLINUX_1@__wxluasocket_dll___soname_flags \ ! @COND_USE_SOVERLINUX_1@ = $(SONAME_FLAG)$(DLLPREFIX)wxluasocket_dll$(__wx) @COND_USE_SOVERSOLARIS_1@__wxluasocket_dll___soname_flags \ @COND_USE_SOVERSOLARIS_1@ = \ ! @COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)wxluasocket_dll$(__wx_4) COND_USE_SOSYMLINKS_1___wxluasocket_dll___so_symlinks_cmd = (cd ./../lib/; rm \ -f $(LIBPREFIX)wxluasocket.$(DLLIMP_SUFFIX) \ ! $(DLLPREFIX)wxluasocket_dll$(__wx); $(LN_S) \ ! $(DLLPREFIX)wxluasocket_dll$(__wx_4) $(DLLPREFIX)wxluasocket_dll$(__wx); \ ! $(LN_S) $(DLLPREFIX)wxluasocket_dll$(__wx) \ $(LIBPREFIX)wxluasocket.$(DLLIMP_SUFFIX)) @COND_USE_SOSYMLINKS_1@__wxluasocket_dll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___wxluasocket_dll___so_symlinks_cmd) *************** *** 183,198 **** @COND_PLATFORM_WIN32_1@ = \ @COND_PLATFORM_WIN32_1@ -Wl,--out-implib,./../lib/$(LIBPREFIX)wxluasocket.$(DLLIMP_SUFFIX) ! @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__wxlua = .$(SO_SUFFIX).0 ! @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__wxlua = .0.$(SO_SUFFIX) ! @COND_USE_SOVERSION_0@__wxlua = .$(SO_SUFFIX) ! @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__wxlua_2 = .$(SO_SUFFIX).0.0.0 ! @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__wxlua_2 = .0.0.0.$(SO_SUFFIX) ! @COND_USE_SOVERSION_0@__wxlua_2 = .$(SO_SUFFIX) ! @COND_PLATFORM_MACOSX_1@__wxlua_3 = \ @COND_PLATFORM_MACOSX_1@ -compatibility_version 0 -current_version 0 ### Targets: ### ! all: ./../lib/$(LIBPREFIX)lua$(LIBEXT) ./../bin/lua$(EXEEXT) $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) install: all --- 203,218 ---- @COND_PLATFORM_WIN32_1@ = \ @COND_PLATFORM_WIN32_1@ -Wl,--out-implib,./../lib/$(LIBPREFIX)wxluasocket.$(DLLIMP_SUFFIX) ! @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__wx = .$(SO_SUFFIX).0 ! @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__wx = .0.$(SO_SUFFIX) ! @COND_USE_SOVERSION_0@__wx = .$(SO_SUFFIX) ! @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__wx_4 = .$(SO_SUFFIX).0.0.0 ! @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__wx_4 = .0.0.0.$(SO_SUFFIX) ! @COND_USE_SOVERSION_0@__wx_4 = .$(SO_SUFFIX) ! @COND_PLATFORM_MACOSX_1@__wx_5 = \ @COND_PLATFORM_MACOSX_1@ -compatibility_version 0 -current_version 0 ### Targets: ### ! all: ./../lib/$(LIBPREFIX)lua$(LIBEXT) ./../bin/lua$(EXEEXT) $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxbind_lib___depname) $(__wxbind_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) install: all *************** *** 208,222 **** rm -f ./../bin/lua$(EXEEXT) rm -f ./../lib/$(LIBPREFIX)wxlua$(LIBEXT) ! rm -f ./../lib/$(DLLPREFIX)wxlua_dll$(__wxlua_2) rm -f ./../lib/$(LIBPREFIX)wxlua.$(DLLIMP_SUFFIX) ! rm -f ./../lib/$(LIBPREFIX)wxlua.$(DLLIMP_SUFFIX) ./../lib/$(DLLPREFIX)wxlua_dll$(__wxlua) rm -f ./../lib/$(LIBPREFIX)wxluadebug$(LIBEXT) ! rm -f ./../lib/$(DLLPREFIX)wxluadebug_dll$(__wxlua_2) rm -f ./../lib/$(LIBPREFIX)wxluadebug.$(DLLIMP_SUFFIX) ! rm -f ./../lib/$(LIBPREFIX)wxluadebug.$(DLLIMP_SUFFIX) ./../lib/$(DLLPREFIX)wxluadebug_dll$(__wxlua) rm -f ./../lib/$(LIBPREFIX)wxluasocket$(LIBEXT) ! rm -f ./../lib/$(DLLPREFIX)wxluasocket_dll$(__wxlua_2) rm -f ./../lib/$(LIBPREFIX)wxluasocket.$(DLLIMP_SUFFIX) ! rm -f ./../lib/$(LIBPREFIX)wxluasocket.$(DLLIMP_SUFFIX) ./../lib/$(DLLPREFIX)wxluasocket_dll$(__wxlua) distclean: clean --- 228,246 ---- rm -f ./../bin/lua$(EXEEXT) rm -f ./../lib/$(LIBPREFIX)wxlua$(LIBEXT) ! rm -f ./../lib/$(DLLPREFIX)wxlua_dll$(__wx_4) rm -f ./../lib/$(LIBPREFIX)wxlua.$(DLLIMP_SUFFIX) ! rm -f ./../lib/$(LIBPREFIX)wxlua.$(DLLIMP_SUFFIX) ./../lib/$(DLLPREFIX)wxlua_dll$(__wx) ! rm -f ./../lib/$(LIBPREFIX)wxbind$(LIBEXT) ! rm -f ./../lib/$(DLLPREFIX)wxbind_dll$(__wx_4) ! rm -f ./../lib/$(LIBPREFIX)wxbind.$(DLLIMP_SUFFIX) ! rm -f ./../lib/$(LIBPREFIX)wxbind.$(DLLIMP_SUFFIX) ./../lib/$(DLLPREFIX)wxbind_dll$(__wx) rm -f ./../lib/$(LIBPREFIX)wxluadebug$(LIBEXT) ! rm -f ./../lib/$(DLLPREFIX)wxluadebug_dll$(__wx_4) rm -f ./../lib/$(LIBPREFIX)wxluadebug.$(DLLIMP_SUFFIX) ! rm -f ./../lib/$(LIBPREFIX)wxluadebug.$(DLLIMP_SUFFIX) ./../lib/$(DLLPREFIX)wxluadebug_dll$(__wx) rm -f ./../lib/$(LIBPREFIX)wxluasocket$(LIBEXT) ! rm -f ./../lib/$(DLLPREFIX)wxluasocket_dll$(__wx_4) rm -f ./../lib/$(LIBPREFIX)wxluasocket.$(DLLIMP_SUFFIX) ! rm -f ./../lib/$(LIBPREFIX)wxluasocket.$(DLLIMP_SUFFIX) ./../lib/$(DLLPREFIX)wxluasocket_dll$(__wx) distclean: clean *************** *** 238,246 **** @COND_WX_SHARED_0@ $(RANLIB) $@ ! @COND_WX_SHARED_1@./../lib/$(DLLPREFIX)wxlua_dll$(__wxlua_2): $(WXLUA_DLL_OBJECTS) ! @COND_WX_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXLUA_DLL_OBJECTS) $(LDFLAGS) $(__wxlua_dll___soname_flags) $(__wxlua_3) -L./../lib $(__wxlua_dll___importlib) $(WX_LIBS) @COND_WX_SHARED_1@ @COND_WX_SHARED_1@ $(__wxlua_dll___so_symlinks_cmd) @COND_WX_SHARED_0@./../lib/$(LIBPREFIX)wxluadebug$(LIBEXT): $(WXLUADEBUG_LIB_OBJECTS) @COND_WX_SHARED_0@ rm -f $@ --- 262,280 ---- @COND_WX_SHARED_0@ $(RANLIB) $@ ! @COND_WX_SHARED_1@./../lib/$(DLLPREFIX)wxlua_dll$(__wx_4): $(WXLUA_DLL_OBJECTS) ! @COND_WX_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXLUA_DLL_OBJECTS) $(LDFLAGS) $(__wxlua_dll___soname_flags) $(__wx_5) -L./../lib $(__wxlua_dll___importlib) $(WX_LIBS) @COND_WX_SHARED_1@ @COND_WX_SHARED_1@ $(__wxlua_dll___so_symlinks_cmd) + @COND_WX_SHARED_0@./../lib/$(LIBPREFIX)wxbind$(LIBEXT): $(WXBIND_LIB_OBJECTS) + @COND_WX_SHARED_0@ rm -f $@ + @COND_WX_SHARED_0@ $(AR) rcu $@ $(WXBIND_LIB_OBJECTS) + @COND_WX_SHARED_0@ $(RANLIB) $@ + + @COND_WX_SHARED_1@./../lib/$(DLLPREFIX)wxbind_dll$(__wx_4): $(WXBIND_DLL_OBJECTS) + @COND_WX_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXBIND_DLL_OBJECTS) $(LDFLAGS) $(__wxbind_dll___soname_flags) $(__wx_5) -L./../lib $(__wxbind_dll___importlib) $(WX_LIBS) + @COND_WX_SHARED_1@ + @COND_WX_SHARED_1@ $(__wxbind_dll___so_symlinks_cmd) + @COND_WX_SHARED_0@./../lib/$(LIBPREFIX)wxluadebug$(LIBEXT): $(WXLUADEBUG_LIB_OBJECTS) @COND_WX_SHARED_0@ rm -f $@ *************** *** 248,253 **** @COND_WX_SHARED_0@ $(RANLIB) $@ ! @COND_WX_SHARED_1@./../lib/$(DLLPREFIX)wxluadebug_dll$(__wxlua_2): $(WXLUADEBUG_DLL_OBJECTS) ! @COND_WX_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXLUADEBUG_DLL_OBJECTS) $(LDFLAGS) $(__wxluadebug_dll___soname_flags) $(__wxlua_3) -L./../lib $(__wxluadebug_dll___importlib) $(WX_LIBS) @COND_WX_SHARED_1@ @COND_WX_SHARED_1@ $(__wxluadebug_dll___so_symlinks_cmd) --- 282,287 ---- @COND_WX_SHARED_0@ $(RANLIB) $@ ! @COND_WX_SHARED_1@./../lib/$(DLLPREFIX)wxluadebug_dll$(__wx_4): $(WXLUADEBUG_DLL_OBJECTS) ! @COND_WX_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXLUADEBUG_DLL_OBJECTS) $(LDFLAGS) $(__wxluadebug_dll___soname_flags) $(__wx_5) -L./../lib $(__wxluadebug_dll___importlib) $(WX_LIBS) @COND_WX_SHARED_1@ @COND_WX_SHARED_1@ $(__wxluadebug_dll___so_symlinks_cmd) *************** *** 258,263 **** @COND_WX_SHARED_0@ $(RANLIB) $@ ! @COND_WX_SHARED_1@./../lib/$(DLLPREFIX)wxluasocket_dll$(__wxlua_2): $(WXLUASOCKET_DLL_OBJECTS) ! @COND_WX_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXLUASOCKET_DLL_OBJECTS) $(LDFLAGS) $(__wxluasocket_dll___soname_flags) $(__wxlua_3) -L./../lib $(__wxluasocket_dll___importlib) $(WX_LIBS) @COND_WX_SHARED_1@ @COND_WX_SHARED_1@ $(__wxluasocket_dll___so_symlinks_cmd) --- 292,297 ---- @COND_WX_SHARED_0@ $(RANLIB) $@ ! @COND_WX_SHARED_1@./../lib/$(DLLPREFIX)wxluasocket_dll$(__wx_4): $(WXLUASOCKET_DLL_OBJECTS) ! @COND_WX_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXLUASOCKET_DLL_OBJECTS) $(LDFLAGS) $(__wxluasocket_dll___soname_flags) $(__wx_5) -L./../lib $(__wxluasocket_dll___importlib) $(WX_LIBS) @COND_WX_SHARED_1@ @COND_WX_SHARED_1@ $(__wxluasocket_dll___so_symlinks_cmd) *************** *** 371,374 **** --- 405,420 ---- $(CXXC) -c -o $@ $(WXLUA_DLL_CXXFLAGS) ./wxlua/src/library.cpp + wxbind_lib_wxlhtmlwin.o: ./wxbind/src/wxlhtmlwin.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/wxlhtmlwin.cpp + + wxbind_lib_wxlprint.o: ./wxbind/src/wxlprint.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) ./wxbind/src/wxlprint.cpp + + wxbind_dll_wxlhtmlwin.o: ./wxbind/src/wxlhtmlwin.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/wxlhtmlwin.cpp + + wxbind_dll_wxlprint.o: ./wxbind/src/wxlprint.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/wxlprint.cpp + wxluadebug_lib_debug.o: ./wxluadebug/src/debug.cpp $(CXXC) -c -o $@ $(WXLUADEBUG_LIB_CXXFLAGS) ./wxluadebug/src/debug.cpp |
|
From: Francesco <fr...@us...> - 2005-06-19 19:11:17
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7921/build/msw Modified Files: makefile.vc Log Message: Updated makefiles Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.vc 14 Jun 2005 21:44:40 -0000 1.4 --- makefile.vc 19 Jun 2005 19:11:06 -0000 1.5 *************** *** 59,66 **** !if "$(USE_UTIL)" == "1" ! __utils___depname = utils !endif !if "$(USE_APPS)" == "1" ! __apps___depname = apps !endif --- 59,66 ---- !if "$(USE_UTIL)" == "1" ! __utils___depname = sub_utils !endif !if "$(USE_APPS)" == "1" ! __apps___depname = sub_apps !endif *************** *** 68,72 **** ### Targets: ### ! all: $(__utils___depname) modules $(__apps___depname) clean: --- 68,72 ---- ### Targets: ### ! all: $(__utils___depname) sub_modules $(__apps___depname) clean: *************** *** 85,89 **** !if "$(USE_UTIL)" == "1" ! utils: cd ..\..\util\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) --- 85,89 ---- !if "$(USE_UTIL)" == "1" ! sub_utils: cd ..\..\util\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) *************** *** 91,95 **** !endif ! modules: cd ..\..\modules\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) --- 91,95 ---- !endif ! sub_modules: cd ..\..\modules\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) *************** *** 97,101 **** !if "$(USE_APPS)" == "1" ! apps: cd ..\..\apps\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) --- 97,101 ---- !if "$(USE_APPS)" == "1" ! sub_apps: cd ..\..\apps\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) |
|
From: John L. <jr...@us...> - 2005-06-19 05:47:53
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9054/wxLua/bindings/wxwidgets Modified Files: menutool.i Log Message: Fix wxToolBar::Add/InsertTool, dunno what old version was from, but before 2.4 at least Index: menutool.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/menutool.i,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** menutool.i 18 Jun 2005 20:45:59 -0000 1.2 --- menutool.i 19 Jun 2005 05:47:45 -0000 1.3 *************** *** 86,90 **** %class wxMenuItem, wxObject %include "wx/menuitem.h" ! wxMenuItem(wxMenu *parentMenu = NULL, int id = wxID_SEPARATOR, const wxString& text = wxEmptyString, const wxString& help = wxEmptyString, bool isCheckable = FALSE, wxMenu *subMenu = NULL) void Check(bool check) void Enable(bool enable) --- 86,90 ---- %class wxMenuItem, wxObject %include "wx/menuitem.h" ! wxMenuItem(wxMenu *parentMenu = NULL, int id = wxID_SEPARATOR, const wxString& text = "", const wxString& help = "", bool isCheckable = FALSE, wxMenu *subMenu = NULL) void Check(bool check) void Enable(bool enable) *************** *** 177,182 **** wxToolBarToolBase *AddControl(wxControl *control) wxToolBarToolBase *AddSeparator() ! wxToolBarToolBase *AddTool(int id, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap, bool isToggle = FALSE, wxObject *clientData = NULL, const wxString& longHelpString = "") ! wxToolBarToolBase *InsertTool(size_t pos, int id, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap, bool isToggle = FALSE, wxObject *clientData = NULL, const wxString& shortHelpString = "", const wxString& longHelpString = "") wxToolBarToolBase *InsertControl(size_t pos, wxControl *control) wxToolBarToolBase *InsertSeparator(size_t pos) --- 177,187 ---- wxToolBarToolBase *AddControl(wxControl *control) wxToolBarToolBase *AddSeparator() ! !%wxchkver24 wxToolBarToolBase *AddTool(int id, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap, bool isToggle = FALSE, wxObject *clientData = NULL, const wxString& longHelpString = "") ! %wxchkver24 %rename AddToolSimple wxToolBarToolBase *AddTool(int toolid, const wxString& label, const wxBitmap& bitmap, const wxString& shortHelp = "", wxItemKind kind = wxITEM_NORMAL) ! %wxchkver24 wxToolBarToolBase *AddTool(int toolid, const wxString& label, const wxBitmap& bitmap, const wxBitmap& bmpDisabled, wxItemKind kind = wxITEM_NORMAL, const wxString& shortHelp = "", const wxString& longHelp = "", wxObject *data = NULL) ! %wxchkver24 wxToolBarToolBase *AddCheckTool(int toolid, const wxString& label, const wxBitmap& bitmap, const wxBitmap& bmpDisabled = wxNullBitmap, const wxString& shortHelp = "", const wxString& longHelp = "", wxObject *data = NULL) ! %wxchkver24 wxToolBarToolBase *AddRadioTool(int toolid, const wxString& label, const wxBitmap& bitmap, const wxBitmap& bmpDisabled = wxNullBitmap, const wxString& shortHelp = "", const wxString& longHelp = "", wxObject *data = NULL) ! !%wxchkver24 wxToolBarToolBase *InsertTool(size_t pos, int id, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap, bool isToggle = FALSE, wxObject *clientData = NULL, const wxString& shortHelpString = "", const wxString& longHelpString = "") ! %wxchkver24 virtual wxToolBarToolBase *InsertTool(size_t pos, int toolid, const wxString& label, const wxBitmap& bitmap, const wxBitmap& bmpDisabled = wxNullBitmap, wxItemKind kind = wxITEM_NORMAL, const wxString& shortHelp = "", const wxString& longHelp = "", wxObject *clientData = NULL) wxToolBarToolBase *InsertControl(size_t pos, wxControl *control) wxToolBarToolBase *InsertSeparator(size_t pos) |
|
From: John L. <jr...@us...> - 2005-06-18 21:08:03
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13083/wxLua/modules/wxbind/src Added Files: luasetup.h Log Message: Update to wxIDE's wrappers --- NEW FILE: luasetup.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_wxLuaApp 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__ |
|
From: John L. <jr...@us...> - 2005-06-18 20:53:51
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6010/wxLua/bindings/wxwidgets Added Files: wx.rules Log Message: Converted to wxIDE's wrapper files --- NEW FILE: wx.rules --- -- rules to build wxLua binding for parts/debuggermsw wxidepath="../" --cdluapath=wxidepath.."/parts/cdlua/" interfacedir=wxidepath.."/bindings/wxwidgets" outputdir=wxidepath.."/modules/wxbind/src" outputheaderdir=wxidepath.."/modules/wxbind/include" hook_namespace="wx" hook_precmp_header="wx/wxprec.h" hook_binding_class=hook_namespace.."_Binding" hook_define_file=hook_namespace.."_define" hook_define_fn="GetDefineList_"..hook_namespace hook_object_file=hook_namespace.."_object" hook_object_fn="GetObjectList_"..hook_namespace hook_event_file=hook_namespace.."_event" hook_event_fn="GetEventList_"..hook_namespace hook_class_file=hook_namespace.."_class" hook_class_fn="GetClassList_"..hook_namespace hook_header_file="wxbind/include/wxbind.h" override_file="override.hpp" -- generate comments into code comment = true -- list of interface files interfaceFileList = { "geometry.i", "appframe.i", "clipdrag.i", "config.i", "controls.i", "data.i", "datetime.i", "defsutil.i", "dialogs.i", "event.i", "file.i", "fl.i", "gdi.i", "grid.i", "help.i", "html.i", "image.i", "wxlua.i", "mdi.i", "menutool.i", "plot.i", "print.i", "regex.i", "sizer.i", "socket.i", "stc.i", "thread.i", "wave.i", "windows.i", "xml.i", } -- wxLuaBinding OnRegister body -- -- can load extra lua bindings here onregister = { " GET_LUASTATEVARS_RET(L)\n", "\n", " // register wxNull\n", " if (registerTypes)\n", " {\n", " stateVars->m_wxNull = tnewtag(L);\n", " }\n", "\n", " tpushliteralstring(L, \"wxNull\");\n", " tpushusertag(L, NULL, stateVars->m_wxNull);\n", " lua_rawset(L, luaTable);\n", } -- additional bind conditions conditions["DOXYGEN_INCLUDE"] = "defined(DOXYGEN_INCLUDE)" conditions["pmSUPPORT_OLD_FORMAT"] = "pmSUPPORT_OLD_FORMAT" conditions["wxLUA_USE_CODEDRAGON_COMPONENT"] = "wxLUA_USE_CODEDRAGON_COMPONENT" conditions["wxLUA_USE_CODEDRAGON_DEBUGGER"] = "wxLUA_USE_CODEDRAGON_DEBUGGER" conditions["wxLUA_USE_CODEDRAGON_DEBUGGERMSW"] = "wxLUA_USE_CODEDRAGON_DEBUGGERMSW" conditions["wxLUA_USE_CODEDRAGON_EXEC"] = "wxLUA_USE_CODEDRAGON_EXEC" conditions["wxLUA_USE_CODEDRAGON_GUIDE"] = "wxLUA_USE_CODEDRAGON_GUIDE" conditions["wxLUA_USE_CODEDRAGON_IDE"] = "wxLUA_USE_CODEDRAGON_IDE" conditions["wxLUA_USE_CODEDRAGON_WIZARD"] = "wxLUA_USE_CODEDRAGON_WIZARD" |
|
From: John L. <jr...@us...> - 2005-06-18 20:53:51
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6010/wxLua/modules/wxbind/src Added Files: wxlhtmlwin.cpp wxlprint.cpp wxluabind_wx26.dsp Log Message: Converted to wxIDE's wrapper files --- NEW FILE: wxlprint.cpp --- ///////////////////////////////////////////////////////////////////////////// // Name: wxLuaPrinting.cpp // Purpose: Provide an interface to wxPrintout for wxLua. // Author: J. Winwood. // Created: July 2002. // Copyright: (c) 2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "wxlprint.h" #endif #include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wx/datetime.h" #include "wxlua/include/callback.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxlprint.h" // forward reference class wxLuaObject; // This lua tag is defined in wxLuaWrap.cpp extern int s_wxLuaPrintout; // ---------------------------------------------------------------------------- // wxLuaPrintout // ---------------------------------------------------------------------------- IMPLEMENT_CLASS(wxLuaPrintout, wxPrintout) wxLuaPrintout::wxLuaPrintout(const wxString& title, wxLuaObject *pObject) : wxPrintout(title), m_pObject(pObject), m_minPage(0), m_maxPage(0), m_pageFrom(0), m_pageTo(0) { } void wxLuaPrintout::SetPageInfo(int minPage, int maxPage, int pageFrom, int pageTo) { m_minPage = minPage; m_maxPage = maxPage; m_pageFrom = pageFrom; m_pageTo = pageTo; } void wxLuaPrintout::GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) { lua_State *luaState = getDerivedMethod(this, "GetPageInfo"); if (luaState != NULL) { int nOldTop = lua_gettop(luaState); tpushusertag(luaState, this, s_wxLuaPrintout); LuaCall(luaState, 1, false); *minPage = (int) lua_tonumber(luaState, -4); *maxPage = (int) lua_tonumber(luaState, -3); *pageFrom = (int) lua_tonumber(luaState, -2); *pageTo = (int) lua_tonumber(luaState, -1); lua_settop(luaState, nOldTop); } else { *minPage = m_minPage; *maxPage = m_maxPage; *pageFrom = m_pageFrom; *pageTo = m_pageTo; } } bool wxLuaPrintout::HasPage(int pageNum) { bool fResult = false; lua_State *luaState = getDerivedMethod(this, "HasPage"); if (luaState != NULL) { int nOldTop = lua_gettop(luaState); tpushusertag(luaState, this, s_wxLuaPrintout); lua_pushnumber(luaState, pageNum); LuaCall(luaState, 2, false); fResult = (lua_toboolean(luaState, -1) != false); lua_settop(luaState, nOldTop); } else fResult = wxPrintout::HasPage(pageNum); return fResult; } bool wxLuaPrintout::OnBeginDocument(int startPage, int endPage) { bool fResult = true; lua_State *luaState = getDerivedMethod(this, "OnBeginDocument"); if (luaState != NULL) { int nOldTop = lua_gettop(luaState); tpushusertag(luaState, this, s_wxLuaPrintout); lua_pushnumber(luaState, startPage); lua_pushnumber(luaState, endPage); LuaCall(luaState, 3, false); fResult = (lua_toboolean(luaState, -1) != false); lua_pop(luaState, 1); lua_settop(luaState, nOldTop); } else fResult = wxPrintout::OnBeginDocument(startPage, endPage); return fResult; } void wxLuaPrintout::OnEndDocument() { lua_State *luaState = getDerivedMethod(this, "OnEndDocument"); if (luaState != NULL) { int nOldTop = lua_gettop(luaState); tpushusertag(luaState, this, s_wxLuaPrintout); LuaCall(luaState, 1, true); lua_settop(luaState, nOldTop); } else wxPrintout::OnEndDocument(); } void wxLuaPrintout::OnBeginPrinting() { lua_State *luaState = getDerivedMethod(this, "OnBeginPrinting"); if (luaState != NULL) { int nOldTop = lua_gettop(luaState); tpushusertag(luaState, this, s_wxLuaPrintout); LuaCall(luaState, 1, true); lua_settop(luaState, nOldTop); } else wxPrintout::OnBeginPrinting(); } void wxLuaPrintout::OnEndPrinting() { lua_State *luaState = getDerivedMethod(this, "OnEndPrinting"); if (luaState != NULL) { int nOldTop = lua_gettop(luaState); tpushusertag(luaState, this, s_wxLuaPrintout); LuaCall(luaState, 1, true); lua_settop(luaState, nOldTop); } else wxPrintout::OnEndPrinting(); } void wxLuaPrintout::OnPreparePrinting() { lua_State *luaState = getDerivedMethod(this, "OnPreparePrinting"); if (luaState != NULL) { int nOldTop = lua_gettop(luaState); tpushusertag(luaState, this, s_wxLuaPrintout); LuaCall(luaState, 1, true); lua_settop(luaState, nOldTop); } else wxPrintout::OnPreparePrinting(); } bool wxLuaPrintout::OnPrintPage(int pageNum) { bool fResult = false; lua_State *luaState = getDerivedMethod(this, "OnPrintPage"); if (luaState != NULL) { int nOldTop = lua_gettop(luaState); tpushusertag(luaState, this, s_wxLuaPrintout); lua_pushnumber(luaState, pageNum); LuaCall(luaState, 2, false); fResult = (lua_toboolean(luaState, -1) != false); lua_settop(luaState, nOldTop); } return fResult; } --- NEW FILE: wxluabind_wx26.dsp --- # Microsoft Developer Studio Project File - Name="wxLuaBindLib_wx26" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 # TARGTYPE "Win32 (x86) Static Library" 0x0104 CFG=wxLuaBindLib_wx26 - Win32 Debug !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 "wxLuaBindLib_wx26.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 "wxLuaBindLib_wx26.mak" CFG="wxLuaBindLib_wx26 - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "wxLuaBindLib_wx26 - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "wxLuaBindLib_wx26 - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe RSC=rc.exe !IF "$(CFG)" == "wxLuaBindLib_wx26 - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "vc_msw_wx26" # PROP BASE Intermediate_Dir "vc_msw_wx26" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "vc_msw_wx26" # PROP Intermediate_Dir "vc_msw_wx26" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /W4 /Fdvc_msw_wx26\wxluabind_wx26.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WX__" /c # ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "$(WXWIN)\include" /I "$(WXWIN)\lib\vc_lib\msw" /I "../../" /I "$(WXWIN)\contrib\include" /W4 /Fdvc_msw_wx26\wxluabind_wx26.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WX__" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\lib\wxluabind_wx26.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\wxluabind_wx26.lib" !ELSEIF "$(CFG)" == "wxLuaBindLib_wx26 - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "vc_mswd_wx26" # PROP BASE Intermediate_Dir "vc_mswd_wx26" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "vc_mswd_wx26" # PROP Intermediate_Dir "vc_mswd_wx26" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /W4 /Zi /Gm /GZ /Fdvc_mswd_wx26\wxluabindd_wx26.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WX__" /c # ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "$(WXWIN)\include" /I "$(WXWIN)\lib\vc_lib\mswd" /I "../../" /I "$(WXWIN)\contrib\include" /W4 /Zi /Gm /GZ /Fdvc_mswd_wx26\wxluabindd_wx26.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WX__" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\lib\wxluabindd_wx26.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\wxluabindd_wx26.lib" !ENDIF # Begin Target # Name "wxLuaBindLib_wx26 - Win32 Release" # Name "wxLuaBindLib_wx26 - Win32 Debug" # PROP Default_Filter "" # Begin Source File SOURCE=..\include\wxlprint.h # End Source File # Begin Source File SOURCE=..\include\wxlhtmlwin.h # End Source File # Begin Source File SOURCE=.\wxlprint.cpp # End Source File # Begin Source File SOURCE=.\wxlhtmlwin.cpp # End Source File # Begin Source File SOURCE=..\include\wxbind.h # End Source File # Begin Source File SOURCE=.\appframe.cpp # End Source File # Begin Source File SOURCE=.\clipdrag.cpp # End Source File # Begin Source File SOURCE=.\config.cpp # End Source File # Begin Source File SOURCE=.\controls.cpp # End Source File # Begin Source File SOURCE=.\data.cpp # End Source File # Begin Source File SOURCE=.\datetime.cpp # End Source File # Begin Source File SOURCE=.\defsutil.cpp # End Source File # Begin Source File SOURCE=.\dialogs.cpp # End Source File # Begin Source File SOURCE=.\event.cpp # End Source File # Begin Source File SOURCE=.\file.cpp # End Source File # Begin Source File SOURCE=.\fl.cpp # End Source File # Begin Source File SOURCE=.\gdi.cpp # End Source File # Begin Source File SOURCE=.\geometry.cpp # End Source File # Begin Source File SOURCE=.\grid.cpp # End Source File # Begin Source File SOURCE=.\help.cpp # End Source File # Begin Source File SOURCE=.\html.cpp # End Source File # Begin Source File SOURCE=.\image.cpp # End Source File # Begin Source File SOURCE=.\mdi.cpp # End Source File # Begin Source File SOURCE=.\menutool.cpp # End Source File # Begin Source File SOURCE=.\plot.cpp # End Source File # Begin Source File SOURCE=.\print.cpp # End Source File # Begin Source File SOURCE=.\regex.cpp # End Source File # Begin Source File SOURCE=.\sizer.cpp # End Source File # Begin Source File SOURCE=.\socket.cpp # End Source File # Begin Source File SOURCE=.\stc.cpp # End Source File # Begin Source File SOURCE=.\thread.cpp # End Source File # Begin Source File SOURCE=.\wave.cpp # End Source File # Begin Source File SOURCE=.\windows.cpp # End Source File # Begin Source File SOURCE=.\wx_class.cpp # End Source File # Begin Source File SOURCE=.\wx_define.cpp # End Source File # Begin Source File SOURCE=.\wx_event.cpp # End Source File # Begin Source File SOURCE=.\wx_object.cpp # End Source File # Begin Source File SOURCE=.\wxlua.cpp # End Source File # Begin Source File SOURCE=.\xml.cpp # End Source File # End Target # End Project --- NEW FILE: wxlhtmlwin.cpp --- ///////////////////////////////////////////////////////////////////////////// // Name: wxLuaHtmlWindow.cpp // Purpose: Provide an interface to wxHtmlWindow for wxLua. // Author: J. Winwood. // Created: June 2002. // Copyright: (c) 2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "wxlhtmlwin.h" #endif #include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wx/datetime.h" #include "wxbind/include/wxlhtmlwin.h" #include "wxlua/include/callback.h" #include "wxlua/include/internal.h" // These are the wxLua tags defined in wxLuaWrap.cpp extern int s_wxLuaHtmlWindow; extern int s_wxHtmlCell; extern int s_wxMouseEvent; extern int s_wxHtmlLinkInfo; DEFINE_EVENT_TYPE(wxEVT_HTML_TAG_HANDLER) // ---------------------------------------------------------------------------- // wxLuaHtmlWindow // ---------------------------------------------------------------------------- IMPLEMENT_CLASS(wxLuaHtmlWindow, wxHtmlWindow) BEGIN_EVENT_TABLE(wxLuaHtmlWindow, wxHtmlWindow) END_EVENT_TABLE() wxLuaHtmlWindow::wxLuaHtmlWindow() : wxHtmlWindow() { } wxLuaHtmlWindow::~wxLuaHtmlWindow() { } wxLuaHtmlWindow::wxLuaHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name) : wxHtmlWindow(parent, id, pos, size, style, name) { } void wxLuaHtmlWindow::OnCellClicked(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& event) { bool fResult = false; lua_State *luaState = getDerivedMethod(this, "OnCellClicked"); if (luaState != NULL) { int nOldTop = lua_gettop(luaState); tpushusertag(luaState, this, s_wxLuaHtmlWindow); tpushusertag(luaState, cell, s_wxHtmlCell); lua_pushnumber(luaState, x); lua_pushnumber(luaState, y); tpushusertag(luaState, (void *) &event, s_wxMouseEvent); LuaCall(luaState, 5, false); fResult = (lua_tonumber(luaState, -1) != 0); lua_settop(luaState, nOldTop); if (fResult) wxHtmlWindow::OnCellClicked(cell, x, y, event); } else wxHtmlWindow::OnCellClicked(cell, x, y, event); } void wxLuaHtmlWindow::OnCellMouseHover(wxHtmlCell *cell, wxCoord x, wxCoord y) { lua_State *luaState = getDerivedMethod(this, "OnCellMouseHover"); if (luaState != NULL) { int nOldTop = lua_gettop(luaState); tpushusertag(luaState, this, s_wxLuaHtmlWindow); tpushusertag(luaState, cell, s_wxHtmlCell); lua_pushnumber(luaState, x); lua_pushnumber(luaState, y); LuaCall(luaState, 4, true); lua_settop(luaState, nOldTop); } else wxHtmlWindow::OnCellMouseHover(cell, x, y); } void wxLuaHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) { lua_State *luaState = getDerivedMethod(this, "OnLinkClicked"); if (luaState != NULL) { int nOldTop = lua_gettop(luaState); tpushusertag(luaState, this, s_wxLuaHtmlWindow); tpushusertag(luaState, (void *) &link, s_wxHtmlLinkInfo); LuaCall(luaState, 2, true); lua_settop(luaState, nOldTop); } else wxHtmlWindow::OnLinkClicked(link); } void wxLuaHtmlWindow::OnSetTitle(const wxString& title) { lua_State *luaState = getDerivedMethod(this, "OnSetTitle"); if (luaState != NULL) { int nOldTop = lua_gettop(luaState); tpushusertag(luaState, this, s_wxLuaHtmlWindow); lua_pushstring(luaState, wx2lua(title)); LuaCall(luaState, 2, true); lua_settop(luaState, nOldTop); } else wxHtmlWindow::OnSetTitle(title); } // ---------------------------------------------------------------------------- // wxLuaHtmlWinTagHandler // ---------------------------------------------------------------------------- class wxLuaHtmlWinTagHandler : public wxHtmlWinTagHandler { public: wxLuaHtmlWinTagHandler() { } wxString GetSupportedTags() { return wxString(wxT("LUA")); } bool HandleTag(const wxHtmlTag& tag) { wxLuaHtmlWinTagEvent htmlEvent(wxEVT_HTML_TAG_HANDLER); htmlEvent.SetTagInfo(&tag, m_WParser); if (wxTheApp->ProcessEvent(htmlEvent)) return htmlEvent.GetParseInnerCalled(); return FALSE; } }; class wxLuaHtmlTagsModule : public wxHtmlTagsModule { DECLARE_DYNAMIC_CLASS(wxLuaHtmlTagsModule) public: void FillHandlersTable(wxHtmlWinParser *parser) { parser->AddTagHandler(new wxLuaHtmlWinTagHandler); } }; IMPLEMENT_DYNAMIC_CLASS(wxLuaHtmlTagsModule, wxHtmlTagsModule) // ---------------------------------------------------------------------------- // wxLuaHtmlWinTagEvent // ---------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxLuaHtmlWinTagEvent, wxEvent) wxLuaHtmlWinTagEvent::wxLuaHtmlWinTagEvent() : m_pHtmlTag(NULL), m_pHtmlParser(NULL), m_fParseInnerCalled(false) { } wxLuaHtmlWinTagEvent::wxLuaHtmlWinTagEvent(int eventType) : m_pHtmlTag(NULL), m_pHtmlParser(NULL), m_fParseInnerCalled(false) { SetEventType(eventType); } wxLuaHtmlWinTagEvent::~wxLuaHtmlWinTagEvent() { } void wxLuaHtmlWinTagEvent::SetTagInfo(const wxHtmlTag *pHtmlTag, wxHtmlWinParser *pParser) { m_pHtmlTag = pHtmlTag; m_pHtmlParser = pParser; } wxEvent* wxLuaHtmlWinTagEvent::Clone() const { wxLuaHtmlWinTagEvent *pEvent = new wxLuaHtmlWinTagEvent(GetEventType()); if (pEvent != NULL) { pEvent->m_pHtmlTag = m_pHtmlTag; pEvent->m_pHtmlParser = m_pHtmlParser; pEvent->m_fParseInnerCalled = m_fParseInnerCalled; } return pEvent; } const wxHtmlTag *wxLuaHtmlWinTagEvent::GetHtmlTag() const { return m_pHtmlTag; } wxHtmlWinParser *wxLuaHtmlWinTagEvent::GetHtmlParser() const { return m_pHtmlParser; } bool wxLuaHtmlWinTagEvent::GetParseInnerCalled() const { return m_fParseInnerCalled; } void wxLuaHtmlWinTagEvent::SetParseInnerCalled(bool fParseInnerCalled) { m_fParseInnerCalled = fParseInnerCalled; } |
|
From: John L. <jr...@us...> - 2005-06-18 20:53:51
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6010/wxLua/modules/wxbind/include Added Files: wxlhtmlwin.h wxlprint.h Log Message: Converted to wxIDE's wrapper files --- NEW FILE: wxlhtmlwin.h --- ///////////////////////////////////////////////////////////////////////////// // Purpose: A wrapper around wxHtmlWindow for wxLua // Author: J. Winwood // Created: June 2002 // Copyright: (c) 2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #ifndef WX_LUA_HTML_WINDOW_H #define WX_LUA_HTML_WINDOW_H #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "wxlhtmlwin.h" #endif #include "wxlua/include/defs.h" #include "wx/print.h" #include "wx/html/htmlwin.h" #include "wx/html/htmlcell.h" // ---------------------------------------------------------------------------- // wxLuaHtmlWindow // ---------------------------------------------------------------------------- class wxLuaHtmlWindow : public wxHtmlWindow { public: wxLuaHtmlWindow(); virtual ~wxLuaHtmlWindow(); wxLuaHtmlWindow(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxHW_SCROLLBAR_AUTO, const wxString& name = wxT("wxLuaHtmlWindow")); virtual void OnCellClicked(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& event); virtual void OnCellMouseHover(wxHtmlCell *cell, wxCoord x, wxCoord y); virtual void OnLinkClicked(const wxHtmlLinkInfo& link); virtual void OnSetTitle(const wxString& title); private: DECLARE_EVENT_TABLE() DECLARE_CLASS (wxLuaHtmlWindow) }; // ---------------------------------------------------------------------------- // wxLuaHtmlWinTagEvent // ---------------------------------------------------------------------------- class wxLuaHtmlWinTagEvent : public wxEvent { public: wxLuaHtmlWinTagEvent(); wxLuaHtmlWinTagEvent(int eventType); virtual ~wxLuaHtmlWinTagEvent(); void SetTagInfo(const wxHtmlTag *pHtmlTag, wxHtmlWinParser *pParser); const wxHtmlTag *GetHtmlTag() const; wxHtmlWinParser *GetHtmlParser() const; void SetParseInnerCalled(bool fParseInnerCalled); bool GetParseInnerCalled() const; protected: virtual wxEvent* Clone() const; private: const wxHtmlTag *m_pHtmlTag; wxHtmlWinParser *m_pHtmlParser; bool m_fParseInnerCalled; DECLARE_DYNAMIC_CLASS(wxLuaHtmlWinTagEvent) }; typedef void (wxEvtHandler::*wxLuaHtmlWinTagEventFunction)(wxLuaHtmlWinTagEvent&); BEGIN_DECLARE_EVENT_TYPES() DECLARE_LOCAL_EVENT_TYPE(wxEVT_HTML_TAG_HANDLER, 2520) END_DECLARE_EVENT_TYPES() #define EVT_HTML_TAG_HANDLER(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_HTML_TAG_HANDLER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaHtmlWinTagEventFunction) & fn, (wxObject *) NULL), #endif //WX_LUA_HTML_WINDOW_H --- NEW FILE: wxlprint.h --- ///////////////////////////////////////////////////////////////////////////// // Purpose: A wrapper around wxPrintout for wxLua // Author: J. Winwood // Created: July 2002 // Copyright: (c) 2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #ifndef WX_LUA_PRINTING_H #define WX_LUA_PRINTING_H #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "wxlprint.h" #endif #include "wxlua/include/defs.h" #include "wx/print.h" // ---------------------------------------------------------------------------- // wxLuaPrintout // ---------------------------------------------------------------------------- class wxLuaPrintout : public wxPrintout { public: wxLuaPrintout(const wxString& title = _("Printout"), wxLuaObject *pObject = NULL); void SetPageInfo(int minPage, int maxPage, int pageFrom, int pageTo); // overrides virtual void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo); virtual bool HasPage(int pageNum); virtual bool OnBeginDocument(int startPage, int endPage); virtual void OnEndDocument(); virtual void OnBeginPrinting(); virtual void OnEndPrinting(); virtual void OnPreparePrinting(); virtual bool OnPrintPage(int pageNumber); wxLuaObject *GetID() const { return m_pObject; } private: wxLuaObject *m_pObject; int m_minPage; int m_maxPage; int m_pageFrom; int m_pageTo; DECLARE_CLASS(wxLuaPrintout) }; #endif //WX_LUA_PRINTING_H |
|
From: John L. <jr...@us...> - 2005-06-18 20:53:51
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6010/wxLua/bindings Added Files: genwxbind.bat genwxbind.lua Log Message: Converted to wxIDE's wrapper files --- NEW FILE: genwxbind.bat --- @echo off REM This batch generates codedragon wxbind c++ source files from interface files REM @echo on SET LUA=..\bin\lua.exe echo Generating wxWidgets Binding %LUA% -e"rulesFilename=\"wxwidgets\wx.rules\"" genwxbind.lua > wxwidgets\error.txt echo Done. --- NEW FILE: genwxbind.lua --- ---------------------------------------------------------------------------------- -- Name: genwxbind.lua -- Purpose: This script generates wrapper files from the table interfaceFileList (see below) -- Author: Ray Gilbert -- Created: 19/05/2004 -- Copyright: Ray Gilbert -- Licence: wxWindows licence ---------------------------------------------------------------------------------- -- code generated is compatible with wxWrapLua.lua, J Winwood's work from wxLua -- -- There were a few shortcomings of the code generated by wxWrapLua -- * it generated 1 huge header file, which caused some compilers to barf -- * it generated an different wrapper file for each version and platform of wxWidgets -- -- This generator creates -- * seperate c files for each interface file -- * each wrapper file uses c-preprocessor defines, and leaves it -- up to the compiler to add correct wrapper functions. This also haves -- the advantage of being able to distribute pre-generated wrapper interface files [...4248 lines suppressed...] local cache = loadfile(dataTypeCacheFilename) cache() print("loaded cache: "..dataTypeCacheFilename) end InitKeywords() -- BuildConditionsTable(); InitDataTypes() readOverrideFile() generateWrapperFiles() SerializeDataTypes() print("Done\n") end main() |
|
From: John L. <jr...@us...> - 2005-06-18 20:52:22
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5546/modules/wxbind/include Log Message: Directory /cvsroot/wxlua/wxLua/modules/wxbind/include added to the repository |
|
From: John L. <jr...@us...> - 2005-06-18 20:52:22
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5546/modules/wxbind/src Log Message: Directory /cvsroot/wxlua/wxLua/modules/wxbind/src added to the repository |
|
From: John L. <jr...@us...> - 2005-06-18 20:52:02
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5485/modules/wxbind Log Message: Directory /cvsroot/wxlua/wxLua/modules/wxbind added to the repository |
