Menu
▾
▴
wxlua-commit
|
From: John L. <jr...@us...> - 2008-01-16 19:54:56
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21831/wxLua/apps/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Link together the bakefile/makefile USE_WXBINDXXX to the C macro wxLUA_USEBINDING_XXX so that if you specify that binding to not be built -DwxLUA_USEBINDING_XXX=0 so it won't be initialized in the apps and you don't get a linking error from the missing symbol. Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** makefile.vc 16 Jan 2008 16:46:10 -0000 1.76 --- makefile.vc 16 Jan 2008 19:54:22 -0000 1.77 *************** *** 76,79 **** --- 76,118 ---- THREADING = multi + # Do the wxLua bindings for the wxAdv lib need to be compiled ? [0,1] + USE_WXBINDADV = 1 + + # Do the wxLua bindings for the wxAUI lib need to be compiled ? [0,1] + USE_WXBINDAUI = 1 + + # Do the wxLua bindings for the wxBase lib need to be compiled ? [0,1] + USE_WXBINDBASE = 1 + + # Do the wxLua bindings for the wxCore lib need to be compiled ? [0,1] + USE_WXBINDCORE = 1 + + # Do the wxLua bindings for the wxGL lib need to be compiled ? [0,1] + USE_WXBINDGL = 1 + + # Do the wxLua bindings for the wxHTML lib need to be compiled ? [0,1] + USE_WXBINDHTML = 1 + + # Do the wxLua bindings for the wxMedia lib need to be compiled ? [0,1] + USE_WXBINDMEDIA = 1 + + # Do the wxLua bindings for the wxNet lib need to be compiled ? [0,1] + USE_WXBINDNET = 1 + + # Do the wxLua bindings for the wxRichText lib need to be compiled ? [0,1] + USE_WXBINDRICHTEXT = 0 + + # Do the wxLua bindings for wxSTC need to be compiled ? [0,1] + USE_WXBINDSTC = 1 + + # Do the wxLua bindings for wxXML need to be compiled ? [0,1] + USE_WXBINDXML = 1 + + # Do the wxLua bindings for wxXRC need to be compiled ? [0,1] + USE_WXBINDXRC = 1 + + # Does the wxLua debug support need to be compiled ? [0,1] + USE_WXLUADEBUG = 1 + # Compile the wxLua app ? [0,1] USE_WXLUAAPP = 1 *************** *** 91,100 **** USE_WXLUAFREEZEAPP = 1 - # Do the wxLua bindings for wxSTC need to be compiled ? [0,1] - USE_WXBINDSTC = 1 - - # Does the wxLua debug support need to be compiled ? [0,1] - USE_WXLUADEBUG = 1 - --- 130,133 ---- *************** *** 109,114 **** /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\lua.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) /D_CONSOLE $(CPPFLAGS) \ ! $(CFLAGS) APP_LUA_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.obj --- 142,153 ---- /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\lua.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ ! /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ ! /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ ! /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ ! /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ ! /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ ! /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC /D_CONSOLE \ ! $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.obj *************** *** 117,122 **** /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\luac.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) /D_CONSOLE $(CPPFLAGS) \ ! $(CFLAGS) APP_LUAC_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.obj \ --- 156,167 ---- /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\luac.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ ! /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ ! /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ ! /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ ! /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ ! /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ ! /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC /D_CONSOLE \ ! $(CPPFLAGS) $(CFLAGS) APP_LUAC_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.obj \ *************** *** 126,131 **** /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\wxlua.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) /D_WINDOWS /GR /EHsc \ ! $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj \ --- 171,182 ---- /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\wxlua.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ ! /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ ! /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ ! /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ ! /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ ! /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ ! /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC /D_WINDOWS /GR \ ! /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj \ *************** *** 136,140 **** /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\wxluaedit.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) /D_WINDOWS \ /I$(WXSTEDIT_DIR)\include /I$(WX_DIR)\contrib\include /GR /EHsc $(CPPFLAGS) \ $(CXXFLAGS) --- 187,197 ---- /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\wxluaedit.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ ! /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ ! /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ ! /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ ! /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ ! /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ ! /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC /D_WINDOWS \ /I$(WXSTEDIT_DIR)\include /I$(WX_DIR)\contrib\include /GR /EHsc $(CPPFLAGS) \ $(CXXFLAGS) *************** *** 147,151 **** /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\wxluacan.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) /D_WINDOWS \ /I..\..\..\modules\wxbind\setup /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ --- 204,214 ---- /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\wxluacan.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ ! /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ ! /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ ! /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ ! /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ ! /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ ! /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC /D_WINDOWS \ /I..\..\..\modules\wxbind\setup /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ *************** *** 161,165 **** $(____app_19) $(______app) \ /Fd..\..\..\bin\vc_$(____app_27)\wxluafreeze.pdb /I..\..\..\modules \ ! /I.\..\..\.. /I$(LUA_INCLUDE_DIR) /D_WINDOWS /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj \ --- 224,234 ---- $(____app_19) $(______app) \ /Fd..\..\..\bin\vc_$(____app_27)\wxluafreeze.pdb /I..\..\..\modules \ ! /I.\..\..\.. /I$(LUA_INCLUDE_DIR) /DDEF_wxLUA_USEBINDING_WXADV \ ! /DDEF_wxLUA_USEBINDING_WXAUI /DDEF_wxLUA_USEBINDING_WXBASE \ ! /DDEF_wxLUA_USEBINDING_WXCORE /DDEF_wxLUA_USEBINDING_WXGL \ ! /DDEF_wxLUA_USEBINDING_WXHTML /DDEF_wxLUA_USEBINDING_WXMEDIA \ ! /DDEF_wxLUA_USEBINDING_WXNET /DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! /DDEF_wxLUA_USEBINDING_WXSTC /DDEF_wxLUA_USEBINDING_WXXML \ ! /DDEF_wxLUA_USEBINDING_WXXRC /D_WINDOWS /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj \ *************** *** 571,575 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_INCLUDE_DIR) /d _WINDOWS ..\..\wxlua\src\wxlua.rc vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp --- 640,644 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_INCLUDE_DIR) /d DEF_wxLUA_USEBINDING_WXADV /d DEF_wxLUA_USEBINDING_WXAUI /d DEF_wxLUA_USEBINDING_WXBASE /d DEF_wxLUA_USEBINDING_WXCORE /d DEF_wxLUA_USEBINDING_WXGL /d DEF_wxLUA_USEBINDING_WXHTML /d DEF_wxLUA_USEBINDING_WXMEDIA /d DEF_wxLUA_USEBINDING_WXNET /d DEF_wxLUA_USEBINDING_WXRICHTEXT /d DEF_wxLUA_USEBINDING_WXSTC /d DEF_wxLUA_USEBINDING_WXXML /d DEF_wxLUA_USEBINDING_WXXRC /d _WINDOWS ..\..\wxlua\src\wxlua.rc vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp *************** *** 580,584 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_INCLUDE_DIR) /d _WINDOWS /i $(WXSTEDIT_DIR)\include /i $(WX_DIR)\contrib\include ..\..\wxluaedit\src\wxluaedit.rc vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp --- 649,653 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_INCLUDE_DIR) /d DEF_wxLUA_USEBINDING_WXADV /d DEF_wxLUA_USEBINDING_WXAUI /d DEF_wxLUA_USEBINDING_WXBASE /d DEF_wxLUA_USEBINDING_WXCORE /d DEF_wxLUA_USEBINDING_WXGL /d DEF_wxLUA_USEBINDING_WXHTML /d DEF_wxLUA_USEBINDING_WXMEDIA /d DEF_wxLUA_USEBINDING_WXNET /d DEF_wxLUA_USEBINDING_WXRICHTEXT /d DEF_wxLUA_USEBINDING_WXSTC /d DEF_wxLUA_USEBINDING_WXXML /d DEF_wxLUA_USEBINDING_WXXRC /d _WINDOWS /i $(WXSTEDIT_DIR)\include /i $(WX_DIR)\contrib\include ..\..\wxluaedit\src\wxluaedit.rc vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp *************** *** 598,602 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_INCLUDE_DIR) /d _WINDOWS /i ..\..\..\modules\wxbind\setup ..\..\wxluacan\src\cansim.rc vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp --- 667,671 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_INCLUDE_DIR) /d DEF_wxLUA_USEBINDING_WXADV /d DEF_wxLUA_USEBINDING_WXAUI /d DEF_wxLUA_USEBINDING_WXBASE /d DEF_wxLUA_USEBINDING_WXCORE /d DEF_wxLUA_USEBINDING_WXGL /d DEF_wxLUA_USEBINDING_WXHTML /d DEF_wxLUA_USEBINDING_WXMEDIA /d DEF_wxLUA_USEBINDING_WXNET /d DEF_wxLUA_USEBINDING_WXRICHTEXT /d DEF_wxLUA_USEBINDING_WXSTC /d DEF_wxLUA_USEBINDING_WXXML /d DEF_wxLUA_USEBINDING_WXXRC /d _WINDOWS /i ..\..\..\modules\wxbind\setup ..\..\wxluacan\src\cansim.rc vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp *************** *** 604,607 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_INCLUDE_DIR) /d _WINDOWS ..\..\wxluafreeze\src\wxluafreeze.rc --- 673,676 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_INCLUDE_DIR) /d DEF_wxLUA_USEBINDING_WXADV /d DEF_wxLUA_USEBINDING_WXAUI /d DEF_wxLUA_USEBINDING_WXBASE /d DEF_wxLUA_USEBINDING_WXCORE /d DEF_wxLUA_USEBINDING_WXGL /d DEF_wxLUA_USEBINDING_WXHTML /d DEF_wxLUA_USEBINDING_WXMEDIA /d DEF_wxLUA_USEBINDING_WXNET /d DEF_wxLUA_USEBINDING_WXRICHTEXT /d DEF_wxLUA_USEBINDING_WXSTC /d DEF_wxLUA_USEBINDING_WXXML /d DEF_wxLUA_USEBINDING_WXXRC /d _WINDOWS ..\..\wxluafreeze\src\wxluafreeze.rc Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** makefile.bcc 16 Jan 2008 16:46:10 -0000 1.76 --- makefile.bcc 16 Jan 2008 19:54:21 -0000 1.77 *************** *** 115,118 **** --- 115,183 ---- !endif + # Do the wxLua bindings for the wxAdv lib need to be compiled ? [0,1] + !ifndef USE_WXBINDADV + USE_WXBINDADV = 1 + !endif + + # Do the wxLua bindings for the wxAUI lib need to be compiled ? [0,1] + !ifndef USE_WXBINDAUI + USE_WXBINDAUI = 1 + !endif + + # Do the wxLua bindings for the wxBase lib need to be compiled ? [0,1] + !ifndef USE_WXBINDBASE + USE_WXBINDBASE = 1 + !endif + + # Do the wxLua bindings for the wxCore lib need to be compiled ? [0,1] + !ifndef USE_WXBINDCORE + USE_WXBINDCORE = 1 + !endif + + # Do the wxLua bindings for the wxGL lib need to be compiled ? [0,1] + !ifndef USE_WXBINDGL + USE_WXBINDGL = 1 + !endif + + # Do the wxLua bindings for the wxHTML lib need to be compiled ? [0,1] + !ifndef USE_WXBINDHTML + USE_WXBINDHTML = 1 + !endif + + # Do the wxLua bindings for the wxMedia lib need to be compiled ? [0,1] + !ifndef USE_WXBINDMEDIA + USE_WXBINDMEDIA = 1 + !endif + + # Do the wxLua bindings for the wxNet lib need to be compiled ? [0,1] + !ifndef USE_WXBINDNET + USE_WXBINDNET = 1 + !endif + + # Do the wxLua bindings for the wxRichText lib need to be compiled ? [0,1] + !ifndef USE_WXBINDRICHTEXT + USE_WXBINDRICHTEXT = 0 + !endif + + # Do the wxLua bindings for wxSTC need to be compiled ? [0,1] + !ifndef USE_WXBINDSTC + USE_WXBINDSTC = 1 + !endif + + # Do the wxLua bindings for wxXML need to be compiled ? [0,1] + !ifndef USE_WXBINDXML + USE_WXBINDXML = 1 + !endif + + # Do the wxLua bindings for wxXRC need to be compiled ? [0,1] + !ifndef USE_WXBINDXRC + USE_WXBINDXRC = 1 + !endif + + # Does the wxLua debug support need to be compiled ? [0,1] + !ifndef USE_WXLUADEBUG + USE_WXLUADEBUG = 1 + !endif + # Compile the wxLua app ? [0,1] !ifndef USE_WXLUAAPP *************** *** 140,153 **** !endif - # Do the wxLua bindings for wxSTC need to be compiled ? [0,1] - !ifndef USE_WXBINDSTC - USE_WXBINDSTC = 1 - !endif - - # Does the wxLua debug support need to be compiled ? [0,1] - !ifndef USE_WXLUADEBUG - USE_WXLUADEBUG = 1 - !endif - --- 205,208 ---- *************** *** 162,166 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.obj --- 217,227 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.obj *************** *** 169,173 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) $(CPPFLAGS) $(CFLAGS) APP_LUAC_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.obj \ --- 230,240 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) $(CFLAGS) APP_LUAC_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.obj \ *************** *** 177,181 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj \ --- 244,254 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj \ *************** *** 185,190 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WXSTEDIT_DIR)\include -I$(WX_DIR)\contrib\include \ ! $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj \ --- 258,269 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WXSTEDIT_DIR)\include \ ! -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj \ *************** *** 194,198 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I..\..\..\modules\wxbind\setup $(CPPFLAGS) \ $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ --- 273,283 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I..\..\..\modules\wxbind\setup $(CPPFLAGS) \ $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ *************** *** 206,210 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj --- 291,301 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj *************** *** 591,595 **** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_INCLUDE_DIR) ..\..\wxlua\src\wxlua.rc bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp --- 682,686 ---- bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC ..\..\wxlua\src\wxlua.rc bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp *************** *** 600,604 **** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_INCLUDE_DIR) -i$(WXSTEDIT_DIR)\include -i$(WX_DIR)\contrib\include ..\..\wxluaedit\src\wxluaedit.rc bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp --- 691,695 ---- bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC -i$(WXSTEDIT_DIR)\include -i$(WX_DIR)\contrib\include ..\..\wxluaedit\src\wxluaedit.rc bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp *************** *** 618,622 **** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_INCLUDE_DIR) -i..\..\..\modules\wxbind\setup ..\..\wxluacan\src\cansim.rc bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp --- 709,713 ---- bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC -i..\..\..\modules\wxbind\setup ..\..\wxluacan\src\cansim.rc bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp *************** *** 624,627 **** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_INCLUDE_DIR) ..\..\wxluafreeze\src\wxluafreeze.rc --- 715,718 ---- bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC ..\..\wxluafreeze\src\wxluafreeze.rc Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** makefile.wat 16 Jan 2008 16:46:11 -0000 1.77 --- makefile.wat 16 Jan 2008 19:54:22 -0000 1.78 *************** *** 76,79 **** --- 76,118 ---- THREADING = multi + # Do the wxLua bindings for the wxAdv lib need to be compiled ? [0,1] + USE_WXBINDADV = 1 + + # Do the wxLua bindings for the wxAUI lib need to be compiled ? [0,1] + USE_WXBINDAUI = 1 + + # Do the wxLua bindings for the wxBase lib need to be compiled ? [0,1] + USE_WXBINDBASE = 1 + + # Do the wxLua bindings for the wxCore lib need to be compiled ? [0,1] + USE_WXBINDCORE = 1 + + # Do the wxLua bindings for the wxGL lib need to be compiled ? [0,1] + USE_WXBINDGL = 1 + + # Do the wxLua bindings for the wxHTML lib need to be compiled ? [0,1] + USE_WXBINDHTML = 1 + + # Do the wxLua bindings for the wxMedia lib need to be compiled ? [0,1] + USE_WXBINDMEDIA = 1 + + # Do the wxLua bindings for the wxNet lib need to be compiled ? [0,1] + USE_WXBINDNET = 1 + + # Do the wxLua bindings for the wxRichText lib need to be compiled ? [0,1] + USE_WXBINDRICHTEXT = 0 + + # Do the wxLua bindings for wxSTC need to be compiled ? [0,1] + USE_WXBINDSTC = 1 + + # Do the wxLua bindings for wxXML need to be compiled ? [0,1] + USE_WXBINDXML = 1 + + # Do the wxLua bindings for wxXRC need to be compiled ? [0,1] + USE_WXBINDXRC = 1 + + # Does the wxLua debug support need to be compiled ? [0,1] + USE_WXLUADEBUG = 1 + # Compile the wxLua app ? [0,1] USE_WXLUAAPP = 1 *************** *** 91,100 **** USE_WXLUAFREEZEAPP = 1 - # Do the wxLua bindings for wxSTC need to be compiled ? [0,1] - USE_WXBINDSTC = 1 - - # Does the wxLua debug support need to be compiled ? [0,1] - USE_WXLUADEBUG = 1 - --- 130,133 ---- *************** *** 552,556 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include & $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & ! -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) $(CPPFLAGS) & $(CFLAGS) APP_LUA_OBJECTS = & --- 585,595 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include & $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & ! -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) & ! -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI & ! -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE & ! -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML & ! -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET & ! -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC & ! -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) & $(CFLAGS) APP_LUA_OBJECTS = & *************** *** 560,564 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include & $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & ! -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) $(CPPFLAGS) & $(CFLAGS) APP_LUAC_OBJECTS = & --- 599,609 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include & $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & ! -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) & ! -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI & ! -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE & ! -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML & ! -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET & ! -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC & ! -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) & $(CFLAGS) APP_LUAC_OBJECTS = & *************** *** 569,573 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include & $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & ! -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) $(CPPFLAGS) & $(CXXFLAGS) APP_WXLUA_OBJECTS = & --- 614,624 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include & $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & ! -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) & ! -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI & ! -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE & ! -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML & ! -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET & ! -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC & ! -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) & $(CXXFLAGS) APP_WXLUA_OBJECTS = & *************** *** 579,582 **** --- 630,639 ---- $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) & + -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI & + -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE & + -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML & + -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET & + -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC & + -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC & -i=$(WXSTEDIT_DIR)\include -i=$(WX_DIR)\contrib\include $(CPPFLAGS) & $(CXXFLAGS) *************** *** 589,592 **** --- 646,655 ---- $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) & + -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI & + -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE & + -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML & + -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET & + -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC & + -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC & -i=..\..\..\modules\wxbind\setup $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = & *************** *** 600,604 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include & $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & ! -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) $(CPPFLAGS) & $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = & --- 663,673 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include & $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & ! -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) & ! -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI & ! -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE & ! -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML & ! -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET & ! -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC & ! -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) & $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = & *************** *** 765,769 **** watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res : .AUTODEPEND ..\..\wxlua\src\wxlua.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) $< watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj : .AUTODEPEND ..\..\wxluaedit\src\wxledit.cpp --- 834,838 ---- watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res : .AUTODEPEND ..\..\wxlua\src\wxlua.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC $< watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj : .AUTODEPEND ..\..\wxluaedit\src\wxledit.cpp *************** *** 774,778 **** watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res : .AUTODEPEND ..\..\wxluaedit\src\wxluaedit.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WXSTEDIT_DIR)\include -i=$(WX_DIR)\contrib\include $< watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj : .AUTODEPEND ..\..\wxluacan\src\cancom.cpp --- 843,847 ---- watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res : .AUTODEPEND ..\..\wxluaedit\src\wxluaedit.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WXSTEDIT_DIR)\include -i=$(WX_DIR)\contrib\include $< watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj : .AUTODEPEND ..\..\wxluacan\src\cancom.cpp *************** *** 792,796 **** watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res : .AUTODEPEND ..\..\wxluacan\src\cansim.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=..\..\..\modules\wxbind\setup $< watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj : .AUTODEPEND ..\..\wxluafreeze\src\wxluafreeze.cpp --- 861,865 ---- watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res : .AUTODEPEND ..\..\wxluacan\src\cansim.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC -i=..\..\..\modules\wxbind\setup $< watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj : .AUTODEPEND ..\..\wxluafreeze\src\wxluafreeze.cpp *************** *** 798,801 **** watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res : .AUTODEPEND ..\..\wxluafreeze\src\wxluafreeze.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) $< --- 867,870 ---- watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res : .AUTODEPEND ..\..\wxluafreeze\src\wxluafreeze.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC $< Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** makefile.gcc 16 Jan 2008 16:46:10 -0000 1.76 --- makefile.gcc 16 Jan 2008 19:54:21 -0000 1.77 *************** *** 64,67 **** --- 64,106 ---- THREADING := multi + # Do the wxLua bindings for the wxAdv lib need to be compiled ? [0,1] + USE_WXBINDADV := 1 + + # Do the wxLua bindings for the wxAUI lib need to be compiled ? [0,1] + USE_WXBINDAUI := 1 + + # Do the wxLua bindings for the wxBase lib need to be compiled ? [0,1] + USE_WXBINDBASE := 1 + + # Do the wxLua bindings for the wxCore lib need to be compiled ? [0,1] + USE_WXBINDCORE := 1 + + # Do the wxLua bindings for the wxGL lib need to be compiled ? [0,1] + USE_WXBINDGL := 1 + + # Do the wxLua bindings for the wxHTML lib need to be compiled ? [0,1] + USE_WXBINDHTML := 1 + + # Do the wxLua bindings for the wxMedia lib need to be compiled ? [0,1] + USE_WXBINDMEDIA := 1 + + # Do the wxLua bindings for the wxNet lib need to be compiled ? [0,1] + USE_WXBINDNET := 1 + + # Do the wxLua bindings for the wxRichText lib need to be compiled ? [0,1] + USE_WXBINDRICHTEXT := 0 + + # Do the wxLua bindings for wxSTC need to be compiled ? [0,1] + USE_WXBINDSTC := 1 + + # Do the wxLua bindings for wxXML need to be compiled ? [0,1] + USE_WXBINDXML := 1 + + # Do the wxLua bindings for wxXRC need to be compiled ? [0,1] + USE_WXBINDXRC := 1 + + # Does the wxLua debug support need to be compiled ? [0,1] + USE_WXLUADEBUG := 1 + # Compile the wxLua app ? [0,1] USE_WXLUAAPP := 1 *************** *** 79,88 **** USE_WXLUAFREEZEAPP := 1 - # Do the wxLua bindings for wxSTC need to be compiled ? [0,1] - USE_WXBINDSTC := 1 - - # Does the wxLua debug support need to be compiled ? [0,1] - USE_WXLUADEBUG := 1 - --- 118,121 ---- *************** *** 98,102 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.o --- 131,141 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.o *************** *** 105,109 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) $(CPPFLAGS) $(CFLAGS) APP_LUAC_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.o \ --- 144,154 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) $(CFLAGS) APP_LUAC_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.o \ *************** *** 113,117 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.o \ --- 158,168 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.o \ *************** *** 122,127 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WXSTEDIT_DIR)\include -I$(WX_DIR)\contrib\include \ ! $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.o \ --- 173,184 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WXSTEDIT_DIR)\include \ ! -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.o \ *************** *** 132,136 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I..\..\..\modules\wxbind\setup $(CPPFLAGS) \ $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ --- 189,199 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I..\..\..\modules\wxbind\setup $(CPPFLAGS) \ $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ *************** *** 145,149 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.o \ --- 208,218 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.o \ *************** *** 652,656 **** gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua_rc.o: ../../wxlua/src/wxlua.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ../../../modules --include-dir ./../../.. --include-dir $(LUA_INCLUDE_DIR) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.o: ../../wxluaedit/src/wxledit.cpp --- 721,725 ---- gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua_rc.o: ../../wxlua/src/wxlua.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ../../../modules --include-dir ./../../.. --include-dir $(LUA_INCLUDE_DIR) --define DEF_wxLUA_USEBINDING_WXADV --define DEF_wxLUA_USEBINDING_WXAUI --define DEF_wxLUA_USEBINDING_WXBASE --define DEF_wxLUA_USEBINDING_WXCORE --define DEF_wxLUA_USEBINDING_WXGL --define DEF_wxLUA_USEBINDING_WXHTML --define DEF_wxLUA_USEBINDING_WXMEDIA --define DEF_wxLUA_USEBINDING_WXNET --define DEF_wxLUA_USEBINDING_WXRICHTEXT --define DEF_wxLUA_USEBINDING_WXSTC --define DEF_wxLUA_USEBINDING_WXXML --define DEF_wxLUA_USEBINDING_WXXRC gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.o: ../../wxluaedit/src/wxledit.cpp *************** *** 661,665 **** gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit_rc.o: ../../wxluaedit/src/wxluaedit.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ../../../modules --include-dir ./../../.. --include-dir $(LUA_INCLUDE_DIR) --include-dir $(WXSTEDIT_DIR)/include --include-dir $(WX_DIR)/contrib/include gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.o: ../../wxluacan/src/cancom.cpp --- 730,734 ---- gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit_rc.o: ../../wxluaedit/src/wxluaedit.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ../../../modules --include-dir ./../../.. --include-dir $(LUA_INCLUDE_DIR) --define DEF_wxLUA_USEBINDING_WXADV --define DEF_wxLUA_USEBINDING_WXAUI --define DEF_wxLUA_USEBINDING_WXBASE --define DEF_wxLUA_USEBINDING_WXCORE --define DEF_wxLUA_USEBINDING_WXGL --define DEF_wxLUA_USEBINDING_WXHTML --define DEF_wxLUA_USEBINDING_WXMEDIA --define DEF_wxLUA_USEBINDING_WXNET --define DEF_wxLUA_USEBINDING_WXRICHTEXT --define DEF_wxLUA_USEBINDING_WXSTC --define DEF_wxLUA_USEBINDING_WXXML --define DEF_wxLUA_USEBINDING_WXXRC --include-dir $(WXSTEDIT_DIR)/include --include-dir $(WX_DIR)/contrib/include gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.o: ../../wxluacan/src/cancom.cpp *************** *** 679,683 **** gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim_rc.o: ../../wxluacan/src/cansim.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ../../../modules --include-dir ./../../.. --include-dir $(LUA_INCLUDE_DIR) --include-dir ../../../modules/wxbind/setup gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.o: ../../wxluafreeze/src/wxluafreeze.cpp --- 748,752 ---- gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim_rc.o: ../../wxluacan/src/cansim.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ../../../modules --include-dir ./../../.. --include-dir $(LUA_INCLUDE_DIR) --define DEF_wxLUA_USEBINDING_WXADV --define DEF_wxLUA_USEBINDING_WXAUI --define DEF_wxLUA_USEBINDING_WXBASE --define DEF_wxLUA_USEBINDING_WXCORE --define DEF_wxLUA_USEBINDING_WXGL --define DEF_wxLUA_USEBINDING_WXHTML --define DEF_wxLUA_USEBINDING_WXMEDIA --define DEF_wxLUA_USEBINDING_WXNET --define DEF_wxLUA_USEBINDING_WXRICHTEXT --define DEF_wxLUA_USEBINDING_WXSTC --define DEF_wxLUA_USEBINDING_WXXML --define DEF_wxLUA_USEBINDING_WXXRC --include-dir ../../../modules/wxbind/setup gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.o: ../../wxluafreeze/src/wxluafreeze.cpp *************** *** 685,689 **** gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze_rc.o: ../../wxluafreeze/src/wxluafreeze.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ../../../modules --include-dir ./../../.. --include-dir $(LUA_INCLUDE_DIR) .PHONY: all clean --- 754,758 ---- gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze_rc.o: ../../wxluafreeze/src/wxluafreeze.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ../../../modules --include-dir ./../../.. --include-dir $(LUA_INCLUDE_DIR) --define DEF_wxLUA_USEBINDING_WXADV --define DEF_wxLUA_USEBINDING_WXAUI --define DEF_wxLUA_USEBINDING_WXBASE --define DEF_wxLUA_USEBINDING_WXCORE --define DEF_wxLUA_USEBINDING_WXGL --define DEF_wxLUA_USEBINDING_WXHTML --define DEF_wxLUA_USEBINDING_WXMEDIA --define DEF_wxLUA_USEBINDING_WXNET --define DEF_wxLUA_USEBINDING_WXRICHTEXT --define DEF_wxLUA_USEBINDING_WXSTC --define DEF_wxLUA_USEBINDING_WXXML --define DEF_wxLUA_USEBINDING_WXXRC .PHONY: all clean |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X