Menu
▾
▴
wxlua-commit
|
From: Francesco M. <fr...@us...> - 2007-05-06 10:01:59
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31657/apps/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: added LUAC target Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** makefile.vc 4 May 2007 20:22:25 -0000 1.64 --- makefile.vc 6 May 2007 10:01:55 -0000 1.65 *************** *** 107,111 **** APP_LUA_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.obj ! APP_WXLUA_CXXFLAGS = /M$(__RUNTIME_LIBS_25)$(____app_21) /DWIN32 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ --- 107,120 ---- APP_LUA_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.obj ! APP_LUAC_CFLAGS = /M$(__RUNTIME_LIBS_25)$(____app_21) /DWIN32 $(____WX_SHARED) \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ ! /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_DIR)\include /D_CONSOLE \ ! /I..\..\..\modules\lua\include $(CPPFLAGS) $(CFLAGS) ! APP_LUAC_OBJECTS = \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_print.obj ! APP_WXLUA_CXXFLAGS = /M$(__RUNTIME_LIBS_39)$(____app_21) /DWIN32 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ *************** *** 117,121 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res ! APP_WXLUAEDIT_CXXFLAGS = /M$(__RUNTIME_LIBS_39)$(____app_21) /DWIN32 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ --- 126,130 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res ! APP_WXLUAEDIT_CXXFLAGS = /M$(__RUNTIME_LIBS_53)$(____app_21) /DWIN32 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ *************** *** 128,132 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ! APP_WXLUACAN_CXXFLAGS = /M$(__RUNTIME_LIBS_53)$(____app_21) /DWIN32 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ --- 137,141 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ! APP_WXLUACAN_CXXFLAGS = /M$(__RUNTIME_LIBS_67)$(____app_21) /DWIN32 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ *************** *** 141,145 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res ! APP_WXLUAFREEZE_CXXFLAGS = /M$(__RUNTIME_LIBS_67)$(____app_21) /DWIN32 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ --- 150,154 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res ! APP_WXLUAFREEZE_CXXFLAGS = /M$(__RUNTIME_LIBS_81)$(____app_21) /DWIN32 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ *************** *** 168,179 **** __RUNTIME_LIBS_11 = $(__THREADING) !endif !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" __app_wxlua___depname = ..\..\..\bin\vc_$(____app_27)\wxlua.exe !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_25 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_25 = $(__THREADING) !endif !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" --- 177,194 ---- __RUNTIME_LIBS_11 = $(__THREADING) !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_25 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_25 = $(__THREADING) + !endif !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" __app_wxlua___depname = ..\..\..\bin\vc_$(____app_27)\wxlua.exe !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_39 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_39 = $(__THREADING) !endif !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" *************** *** 181,188 **** !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_39 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_39 = $(__THREADING) !endif !if "$(USE_WXLUACANAPP)" == "1" --- 196,203 ---- !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_53 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_53 = $(__THREADING) !endif !if "$(USE_WXLUACANAPP)" == "1" *************** *** 190,197 **** !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_53 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_53 = $(__THREADING) !endif !if "$(USE_WXLUAFREEZEAPP)" == "1" --- 205,212 ---- !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_67 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_67 = $(__THREADING) !endif !if "$(USE_WXLUAFREEZEAPP)" == "1" *************** *** 199,206 **** !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_67 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_67 = $(__THREADING) !endif !if "$(WX_SHARED)" == "0" --- 214,221 ---- !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_81 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_81 = $(__THREADING) !endif !if "$(WX_SHARED)" == "0" *************** *** 220,224 **** !endif !if "$(UNICODE)" == "1" ! __WXUNICODE_DEFINE_p_10 = /d _UNICODE !endif !if "$(BUILD)" == "debug" --- 235,239 ---- !endif !if "$(UNICODE)" == "1" ! __WXUNICODE_DEFINE_p_1 = /d _UNICODE !endif !if "$(BUILD)" == "debug" *************** *** 226,230 **** !endif !if "$(BUILD)" == "debug" ! __WXDEBUG_DEFINE_p_10 = /d __WXDEBUG__ !endif !if "$(BUILD)" == "debug" --- 241,245 ---- !endif !if "$(BUILD)" == "debug" ! __WXDEBUG_DEFINE_p_1 = /d __WXDEBUG__ !endif !if "$(BUILD)" == "debug" *************** *** 419,423 **** ### Targets: ### ! all: test_for_selected_wxbuild ..\..\..\bin\vc_$(____app_27)\lua.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: --- 434,438 ---- ### Targets: ### ! all: test_for_selected_wxbuild ..\..\..\bin\vc_$(____app_27)\lua.exe ..\..\..\bin\vc_$(____app_27)\luac.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: *************** *** 428,431 **** --- 443,449 ---- -if exist ..\..\..\bin\vc_$(____app_27)\lua.ilk del ..\..\..\bin\vc_$(____app_27)\lua.ilk -if exist ..\..\..\bin\vc_$(____app_27)\lua.pdb del ..\..\..\bin\vc_$(____app_27)\lua.pdb + -if exist ..\..\..\bin\vc_$(____app_27)\luac.exe del ..\..\..\bin\vc_$(____app_27)\luac.exe + -if exist ..\..\..\bin\vc_$(____app_27)\luac.ilk del ..\..\..\bin\vc_$(____app_27)\luac.ilk + -if exist ..\..\..\bin\vc_$(____app_27)\luac.pdb del ..\..\..\bin\vc_$(____app_27)\luac.pdb -if exist ..\..\..\bin\vc_$(____app_27)\wxlua.exe del ..\..\..\bin\vc_$(____app_27)\wxlua.exe -if exist ..\..\..\bin\vc_$(____app_27)\wxlua.ilk del ..\..\..\bin\vc_$(____app_27)\wxlua.ilk *************** *** 461,468 **** if not exist ..\..\..\bin\vc_$(____app_27) mkdir ..\..\..\bin\vc_$(____app_27) !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\bin\vc_$(____app_27)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< ! $(APP_WXLUA_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << !endif --- 479,494 ---- if not exist ..\..\..\bin\vc_$(____app_27) mkdir ..\..\..\bin\vc_$(____app_27) + ..\..\..\bin\vc_$(____app_27)\luac.exe: make_dir_app_luac $(APP_LUAC_OBJECTS) + link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:CONSOLE @<< + $(APP_LUAC_OBJECTS) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib lua5.1.lib + << + + make_dir_app_luac: + if not exist ..\..\..\bin\vc_$(____app_27) mkdir ..\..\..\bin\vc_$(____app_27) + !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\bin\vc_$(____app_27)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< ! $(APP_WXLUA_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << !endif *************** *** 474,478 **** ..\..\..\bin\vc_$(____app_27)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS /LIBPATH:$(WXSTEDIT_DIR)$(WXLIBPATH) @<< ! $(APP_WXLUAEDIT_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << !endif --- 500,504 ---- ..\..\..\bin\vc_$(____app_27)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS /LIBPATH:$(WXSTEDIT_DIR)$(WXLIBPATH) @<< ! $(APP_WXLUAEDIT_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << !endif *************** *** 484,488 **** ..\..\..\bin\vc_$(____app_27)\wxluacan.exe: make_dir_app_wxluacan $(APP_WXLUACAN_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< ! $(APP_WXLUACAN_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << !endif --- 510,514 ---- ..\..\..\bin\vc_$(____app_27)\wxluacan.exe: make_dir_app_wxluacan $(APP_WXLUACAN_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< ! $(APP_WXLUACAN_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << !endif *************** *** 494,498 **** ..\..\..\bin\vc_$(____app_27)\wxluafreeze.exe: make_dir_app_wxluafreeze $(APP_WXLUAFREEZE_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< ! $(APP_WXLUAFREEZE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << !endif --- 520,524 ---- ..\..\..\bin\vc_$(____app_27)\wxluafreeze.exe: make_dir_app_wxluafreeze $(APP_WXLUAFREEZE_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< ! $(APP_WXLUAFREEZE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << !endif *************** *** 504,507 **** --- 530,539 ---- $(CC) /c /nologo /TC /Fo$@ $(APP_LUA_CFLAGS) $** + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.obj: ..\..\..\modules\lua\src\luac.c + $(CC) /c /nologo /TC /Fo$@ $(APP_LUAC_CFLAGS) $** + + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_print.obj: ..\..\..\modules\lua\src\print.c + $(CC) /c /nologo /TC /Fo$@ $(APP_LUAC_CFLAGS) $** + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUA_CXXFLAGS) $** *************** *** 511,515 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS $** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp --- 543,547 ---- 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_DIR)\include /d _WINDOWS $** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp *************** *** 520,524 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS /i $(WXSTEDIT_DIR)\include /i $(WX_DIR)\contrib\include $** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp --- 552,556 ---- 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_DIR)\include /d _WINDOWS /i $(WXSTEDIT_DIR)\include /i $(WX_DIR)\contrib\include $** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp *************** *** 538,542 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS /i ..\..\..\modules\wxbind\setup $** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp --- 570,574 ---- 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_DIR)\include /d _WINDOWS /i ..\..\..\modules\wxbind\setup $** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp *************** *** 544,547 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS $** --- 576,579 ---- 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_DIR)\include /d _WINDOWS $** Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** makefile.bcc 4 May 2007 20:22:25 -0000 1.64 --- makefile.bcc 6 May 2007 10:01:54 -0000 1.65 *************** *** 151,162 **** $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ ! $(____app_21) $(__THREADING_3) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I..\..\..\modules\lua\include $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.obj APP_WXLUA_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(____WX_SHARED) \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ ! $(____app_21) $(__THREADING_3) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ --- 151,170 ---- $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ ! $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I..\..\..\modules\lua\include $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.obj + APP_LUAC_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(____WX_SHARED) \ + $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ + -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ + $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ + -I$(LUA_DIR)\include -I..\..\..\modules\lua\include $(CPPFLAGS) $(CFLAGS) + APP_LUAC_OBJECTS = \ + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.obj \ + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_print.obj APP_WXLUA_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(____WX_SHARED) \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ ! $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ *************** *** 166,170 **** $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ ! $(____app_21) $(__THREADING_3) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I$(WXSTEDIT_DIR)\include -I$(WX_DIR)\contrib\include \ $(CPPFLAGS) $(CXXFLAGS) --- 174,178 ---- $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ ! $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I$(WXSTEDIT_DIR)\include -I$(WX_DIR)\contrib\include \ $(CPPFLAGS) $(CXXFLAGS) *************** *** 175,179 **** $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ ! $(____app_21) $(__THREADING_3) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I..\..\..\modules\wxbind\setup $(CPPFLAGS) \ $(CXXFLAGS) --- 183,187 ---- $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ ! $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I..\..\..\modules\wxbind\setup $(CPPFLAGS) \ $(CXXFLAGS) *************** *** 187,191 **** $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ ! $(____app_21) $(__THREADING_3) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ --- 195,199 ---- $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ ! $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ *************** *** 231,235 **** !endif !if "$(UNICODE)" == "1" ! __WXUNICODE_DEFINE_p_10 = -d_UNICODE !endif !if "$(BUILD)" == "debug" --- 239,243 ---- !endif !if "$(UNICODE)" == "1" ! __WXUNICODE_DEFINE_p_1 = -d_UNICODE !endif !if "$(BUILD)" == "debug" *************** *** 237,241 **** !endif !if "$(BUILD)" == "debug" ! __WXDEBUG_DEFINE_p_10 = -d__WXDEBUG__ !endif !if "$(BUILD)" == "debug" --- 245,249 ---- !endif !if "$(BUILD)" == "debug" ! __WXDEBUG_DEFINE_p_1 = -d__WXDEBUG__ !endif !if "$(BUILD)" == "debug" *************** *** 252,259 **** !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_3 = i !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_3 = !endif !if "$(THREADING)" == "multi" --- 260,267 ---- !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_6 = i !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_6 = !endif !if "$(THREADING)" == "multi" *************** *** 264,271 **** !endif !if "$(THREADING)" == "multi" ! __THREADING_3 = -tWM !endif !if "$(THREADING)" == "single" ! __THREADING_3 = !endif !if "$(SHARED)" == "0" --- 272,279 ---- !endif !if "$(THREADING)" == "multi" ! __THREADING_4 = -tWM !endif !if "$(THREADING)" == "single" ! __THREADING_4 = !endif !if "$(SHARED)" == "0" *************** *** 424,428 **** ### Targets: ### ! all: test_for_selected_wxbuild ..\..\..\bin\bcc_$(____app_23)\lua.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: --- 432,436 ---- ### Targets: ### ! all: test_for_selected_wxbuild ..\..\..\bin\bcc_$(____app_23)\lua.exe ..\..\..\bin\bcc_$(____app_23)\luac.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: *************** *** 436,439 **** --- 444,453 ---- -if exist ..\..\..\bin\bcc_$(____app_23)\lua.ilf del ..\..\..\bin\bcc_$(____app_23)\lua.ilf -if exist ..\..\..\bin\bcc_$(____app_23)\lua.ils del ..\..\..\bin\bcc_$(____app_23)\lua.ils + -if exist ..\..\..\bin\bcc_$(____app_23)\luac.exe del ..\..\..\bin\bcc_$(____app_23)\luac.exe + -if exist ..\..\..\bin\bcc_$(____app_23)\luac.tds del ..\..\..\bin\bcc_$(____app_23)\luac.tds + -if exist ..\..\..\bin\bcc_$(____app_23)\luac.ilc del ..\..\..\bin\bcc_$(____app_23)\luac.ilc + -if exist ..\..\..\bin\bcc_$(____app_23)\luac.ild del ..\..\..\bin\bcc_$(____app_23)\luac.ild + -if exist ..\..\..\bin\bcc_$(____app_23)\luac.ilf del ..\..\..\bin\bcc_$(____app_23)\luac.ilf + -if exist ..\..\..\bin\bcc_$(____app_23)\luac.ils del ..\..\..\bin\bcc_$(____app_23)\luac.ils -if exist ..\..\..\bin\bcc_$(____app_23)\wxlua.exe del ..\..\..\bin\bcc_$(____app_23)\wxlua.exe -if exist ..\..\..\bin\bcc_$(____app_23)\wxlua.tds del ..\..\..\bin\bcc_$(____app_23)\wxlua.tds *************** *** 475,479 **** ..\..\..\bin\bcc_$(____app_23)\lua.exe: make_dir_app_lua $(APP_LUA_OBJECTS) ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -ap @&&| ! c0x32.obj $(APP_LUA_OBJECTS),$@,, wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib lua5.1.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_3).lib,, | --- 489,493 ---- ..\..\..\bin\bcc_$(____app_23)\lua.exe: make_dir_app_lua $(APP_LUA_OBJECTS) ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -ap @&&| ! c0x32.obj $(APP_LUA_OBJECTS),$@,, wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib lua5.1.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_6).lib,, | *************** *** 481,488 **** if not exist ..\..\..\bin\bcc_$(____app_23) mkdir ..\..\..\bin\bcc_$(____app_23) !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\bin\bcc_$(____app_23)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_3).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res | !endif --- 495,510 ---- if not exist ..\..\..\bin\bcc_$(____app_23) mkdir ..\..\..\bin\bcc_$(____app_23) + ..\..\..\bin\bcc_$(____app_23)\luac.exe: make_dir_app_luac $(APP_LUAC_OBJECTS) + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -ap @&&| + c0x32.obj $(APP_LUAC_OBJECTS),$@,, wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib lua5.1.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_6).lib,, + | + + make_dir_app_luac: + if not exist ..\..\..\bin\bcc_$(____app_23) mkdir ..\..\..\bin\bcc_$(____app_23) + !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\bin\bcc_$(____app_23)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res | !endif *************** *** 494,498 **** ..\..\..\bin\bcc_$(____app_23)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa -L$(WXSTEDIT_DIR)$(WXLIBPATH) @&&| ! c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_3).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res | !endif --- 516,520 ---- ..\..\..\bin\bcc_$(____app_23)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa -L$(WXSTEDIT_DIR)$(WXLIBPATH) @&&| ! c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res | !endif *************** *** 504,508 **** ..\..\..\bin\bcc_$(____app_23)\wxluacan.exe: make_dir_app_wxluacan $(APP_WXLUACAN_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUACAN_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_3).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res | !endif --- 526,530 ---- ..\..\..\bin\bcc_$(____app_23)\wxluacan.exe: make_dir_app_wxluacan $(APP_WXLUACAN_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUACAN_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res | !endif *************** *** 514,518 **** ..\..\..\bin\bcc_$(____app_23)\wxluafreeze.exe: make_dir_app_wxluafreeze $(APP_WXLUAFREEZE_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUAFREEZE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_3).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res | !endif --- 536,540 ---- ..\..\..\bin\bcc_$(____app_23)\wxluafreeze.exe: make_dir_app_wxluafreeze $(APP_WXLUAFREEZE_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUAFREEZE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res | !endif *************** *** 524,527 **** --- 546,555 ---- $(CC) -q -c -P- -o$@ $(APP_LUA_CFLAGS) $** + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.obj: ..\..\..\modules\lua\src\luac.c + $(CC) -q -c -P- -o$@ $(APP_LUAC_CFLAGS) $** + + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_print.obj: ..\..\..\modules\lua\src\print.c + $(CC) -q -c -P- -o$@ $(APP_LUAC_CFLAGS) $** + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** *************** *** 531,535 **** 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_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_DIR)\include $** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp --- 559,563 ---- 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_DIR)\include $** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp *************** *** 540,544 **** 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_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_DIR)\include -i$(WXSTEDIT_DIR)\include -i$(WX_DIR)\contrib\include $** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp --- 568,572 ---- 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_DIR)\include -i$(WXSTEDIT_DIR)\include -i$(WX_DIR)\contrib\include $** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp *************** *** 558,562 **** 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_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_DIR)\include -i..\..\..\modules\wxbind\setup $** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp --- 586,590 ---- 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_DIR)\include -i..\..\..\modules\wxbind\setup $** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp *************** *** 564,567 **** 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_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_DIR)\include $** --- 592,595 ---- 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_DIR)\include $** Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** makefile.wat 4 May 2007 20:22:25 -0000 1.65 --- makefile.wat 6 May 2007 10:01:55 -0000 1.66 *************** *** 511,514 **** --- 511,523 ---- APP_LUA_OBJECTS = & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.obj + APP_LUAC_CFLAGS = $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) & + $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & + -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include & + $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & + -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_DIR)\include & + -i=..\..\..\modules\lua\include $(CPPFLAGS) $(CFLAGS) + APP_LUAC_OBJECTS = & + watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.obj & + watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_print.obj APP_WXLUA_CXXFLAGS = $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) & $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & *************** *** 558,562 **** ### Targets: ### ! all : .SYMBOLIC test_for_selected_wxbuild ..\..\..\bin\wat_$(____app_23)\lua.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean : .SYMBOLIC --- 567,571 ---- ### Targets: ### ! all : .SYMBOLIC test_for_selected_wxbuild ..\..\..\bin\wat_$(____app_23)\lua.exe ..\..\..\bin\wat_$(____app_23)\luac.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean : .SYMBOLIC *************** *** 567,570 **** --- 576,580 ---- -if exist watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.pch del watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.pch -if exist ..\..\..\bin\wat_$(____app_23)\lua.exe del ..\..\..\bin\wat_$(____app_23)\lua.exe + -if exist ..\..\..\bin\wat_$(____app_23)\luac.exe del ..\..\..\bin\wat_$(____app_23)\luac.exe -if exist ..\..\..\bin\wat_$(____app_23)\wxlua.exe del ..\..\..\bin\wat_$(____app_23)\wxlua.exe -if exist ..\..\..\bin\wat_$(____app_23)\wxluaedit.exe del ..\..\..\bin\wat_$(____app_23)\wxluaedit.exe *************** *** 599,602 **** --- 609,627 ---- if not exist ..\..\..\bin\wat_$(____app_23) mkdir ..\..\..\bin\wat_$(____app_23) + ..\..\..\bin\wat_$(____app_23)\luac.exe : make_dir_app_luac $(APP_LUAC_OBJECTS) + @%create watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac.lbc + @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac.lbc option quiet + @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac.lbc name $^@ + @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac.lbc option caseexact + @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt ref 'main_' + @for %i in ($(APP_LUAC_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac.lbc file %i + @for %i in ( wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac.lbc library %i + @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac.lbc + @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac.lbc option stack=%i + wlink @watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac.lbc + + make_dir_app_luac : + if not exist ..\..\..\bin\wat_$(____app_23) mkdir ..\..\..\bin\wat_$(____app_23) + !ifeq USE_WXBINDSTC 1 !ifeq USE_WXLUAAPP 1 *************** *** 609,613 **** @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc option stack=%i --- 634,638 ---- @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc option stack=%i *************** *** 629,633 **** @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' libpath $(WXSTEDIT_DIR)$(WXLIBPATH) @for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc option stack=%i --- 654,658 ---- @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' libpath $(WXSTEDIT_DIR)$(WXLIBPATH) @for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc option stack=%i *************** *** 647,651 **** @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUACAN_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc option stack=%i --- 672,676 ---- @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUACAN_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VER... [truncated message content] |
×
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