Menu
▾
▴
wxlua-commit
|
From: Francesco M. <fr...@us...> - 2007-02-13 18:43:19
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27490/apps/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: rebaked after THREADING option addition Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** makefile.vc 3 Feb 2007 19:12:21 -0000 1.59 --- makefile.vc 13 Feb 2007 18:43:09 -0000 1.60 *************** *** 66,69 **** --- 66,74 ---- RUNTIME_LIBS = dynamic + # This is an advanced option. Handle with care. + # The thread model to use: use 'multi' default to allow + # multi-threading. [multi,single] + THREADING = multi + # Compile the wxLua app ? [0,1] USE_WXLUAAPP = 1 *************** *** 95,103 **** ### Variables: ### ! APP_LUA_CFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_13) /DWIN32 \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ ! $(____BUILD_11) $(______BUILD) \ /Fd..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\lua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include /D_CONSOLE \ --- 100,108 ---- ### Variables: ### ! APP_LUA_CFLAGS = /M$(__RUNTIME_LIBS_15)$(____BUILD_14) /DWIN32 \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_11) \ ! $(____BUILD_12) $(______BUILD) \ /Fd..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\lua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include /D_CONSOLE \ *************** *** 105,113 **** APP_LUA_OBJECTS = \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua_lua.obj ! APP_WXLUA_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_13) /DWIN32 \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ ! $(____BUILD_11) $(______BUILD) \ /Fd..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include /D_WINDOWS /GR /EHsc \ --- 110,118 ---- APP_LUA_OBJECTS = \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua_lua.obj ! APP_WXLUA_CXXFLAGS = /M$(__RUNTIME_LIBS_33)$(____BUILD_14) /DWIN32 \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_11) \ ! $(____BUILD_12) $(______BUILD) \ /Fd..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include /D_WINDOWS /GR /EHsc \ *************** *** 117,125 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_lconsole.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.res ! APP_WXLUAEDIT_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_13) /DWIN32 \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ ! $(____BUILD_11) $(______BUILD) \ /Fd..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include /D_WINDOWS \ --- 122,130 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_lconsole.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.res ! APP_WXLUAEDIT_CXXFLAGS = /M$(__RUNTIME_LIBS_51)$(____BUILD_14) /DWIN32 \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_11) \ ! $(____BUILD_12) $(______BUILD) \ /Fd..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include /D_WINDOWS \ *************** *** 130,138 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ! APP_WXLUACAN_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_13) /DWIN32 \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ ! $(____BUILD_11) $(______BUILD) \ /Fd..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include /D_WINDOWS \ --- 135,143 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ! APP_WXLUACAN_CXXFLAGS = /M$(__RUNTIME_LIBS_69)$(____BUILD_14) /DWIN32 \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_11) \ ! $(____BUILD_12) $(______BUILD) \ /Fd..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include /D_WINDOWS \ *************** *** 145,153 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_canlua.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.res ! APP_WXLUAFREEZE_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_13) /DWIN32 \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ ! $(____BUILD_11) $(______BUILD) \ /Fd..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include /D_WINDOWS /GR /EHsc \ --- 150,158 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_canlua.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.res ! APP_WXLUAFREEZE_CXXFLAGS = /M$(__RUNTIME_LIBS_87)$(____BUILD_14) /DWIN32 \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_11) \ ! $(____BUILD_12) $(______BUILD) \ /Fd..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include /D_WINDOWS /GR /EHsc \ *************** *** 168,171 **** --- 173,182 ---- SHARED_SUFFIX = dll !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_15 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_15 = $(__THREADING) + !endif !if "$(SHARED)" == "0" __WXLUA_BINOUTPUT_FOLDER_FILENAMES = bin\vc$(WXLIBPOSTFIX)_lib *************** *** 178,181 **** --- 189,198 ---- ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.exe !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_33 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_33 = $(__THREADING) + !endif !if "$(SHARED)" == "0" __WXLUA_BINOUTPUT_FOLDER_FILENAMES_1 = bin\vc$(WXLIBPOSTFIX)_lib *************** *** 188,191 **** --- 205,214 ---- ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.exe !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_51 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_51 = $(__THREADING) + !endif !if "$(SHARED)" == "0" __WXLUA_BINOUTPUT_FOLDER_FILENAMES_2 = bin\vc$(WXLIBPOSTFIX)_lib *************** *** 198,201 **** --- 221,230 ---- ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.exe !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_69 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_69 = $(__THREADING) + !endif !if "$(SHARED)" == "0" __WXLUA_BINOUTPUT_FOLDER_FILENAMES_3 = bin\vc$(WXLIBPOSTFIX)_lib *************** *** 208,211 **** --- 237,246 ---- ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.exe !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_87 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_87 = $(__THREADING) + !endif !if "$(SHARED)" == "0" __WXLUA_BINOUTPUT_FOLDER_FILENAMES_4 = bin\vc$(WXLIBPOSTFIX)_lib *************** *** 233,240 **** !endif !if "$(SHARED)" == "0" ! ____SHARED_2 = !endif !if "$(SHARED)" == "1" ! ____SHARED_2 = /d WXUSINGDLL !endif !if "$(BUILD)" == "debug" --- 268,275 ---- !endif !if "$(SHARED)" == "0" ! ____SHARED_3 = !endif !if "$(SHARED)" == "1" ! ____SHARED_3 = /d WXUSINGDLL !endif !if "$(BUILD)" == "debug" *************** *** 245,264 **** !endif !if "$(BUILD)" == "debug" ! ____BUILD_10 = /Od !endif !if "$(BUILD)" == "release" ! ____BUILD_10 = /O2 !endif !if "$(BUILD)" == "debug" ! ____BUILD_11 = /Zi !endif !if "$(BUILD)" == "release" ! ____BUILD_11 = !endif !if "$(BUILD)" == "debug" ! ____BUILD_12 = /DEBUG !endif !if "$(BUILD)" == "release" ! ____BUILD_12 = !endif !if "$(BUILD)" == "debug" --- 280,299 ---- !endif !if "$(BUILD)" == "debug" ! ____BUILD_11 = /Od !endif !if "$(BUILD)" == "release" ! ____BUILD_11 = /O2 !endif !if "$(BUILD)" == "debug" ! ____BUILD_12 = /Zi !endif !if "$(BUILD)" == "release" ! ____BUILD_12 = !endif !if "$(BUILD)" == "debug" ! ____BUILD_13 = /DEBUG !endif !if "$(BUILD)" == "release" ! ____BUILD_13 = !endif !if "$(BUILD)" == "debug" *************** *** 275,288 **** !endif !if "$(BUILD)" == "debug" ! ____BUILD_13 = d !endif !if "$(BUILD)" == "release" ! ____BUILD_13 = !endif ! !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS = D !endif ! !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS = L !endif !if "$(SHARED)" == "0" --- 310,323 ---- !endif !if "$(BUILD)" == "debug" ! ____BUILD_14 = d !endif !if "$(BUILD)" == "release" ! ____BUILD_14 = !endif ! !if "$(THREADING)" == "multi" ! __THREADING = T !endif ! !if "$(THREADING)" == "single" ! __THREADING = L !endif !if "$(SHARED)" == "0" *************** *** 434,438 **** ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\lua.exe: $(APP_LUA_OBJECTS) ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_12) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:CONSOLE @<< $(APP_LUA_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 << --- 469,473 ---- ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\lua.exe: $(APP_LUA_OBJECTS) ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_13) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:CONSOLE @<< $(APP_LUA_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 << *************** *** 440,444 **** !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.exe: $(APP_WXLUA_OBJECTS) vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_12) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /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_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 << --- 475,479 ---- !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.exe: $(APP_WXLUA_OBJECTS) vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_13) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /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_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 << *************** *** 447,451 **** !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_12) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS /LIBPATH:$(WXSTEDIT_DIR)\lib @<< $(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 wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_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 << --- 482,486 ---- !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_13) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS /LIBPATH:$(WXSTEDIT_DIR)\lib @<< $(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 wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_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 << *************** *** 454,458 **** !if "$(USE_WXLUACANAPP)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_12) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /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_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 << --- 489,493 ---- !if "$(USE_WXLUACANAPP)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_13) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /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_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 << *************** *** 461,465 **** !if "$(USE_WXLUAFREEZEAPP)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.exe: $(APP_WXLUAFREEZE_OBJECTS) vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_12) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /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_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 << --- 496,500 ---- !if "$(USE_WXLUAFREEZEAPP)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.exe: $(APP_WXLUAFREEZE_OBJECTS) vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_13) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /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_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 << *************** *** 476,480 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS $** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp --- 511,515 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_3) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS $** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp *************** *** 485,489 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS /i $(WXSTEDIT_DIR)\include /i $(WX_DIR)\contrib\include $** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp --- 520,524 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_3) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS /i $(WXSTEDIT_DIR)\include /i $(WX_DIR)\contrib\include $** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp *************** *** 503,507 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS /i ..\..\..\modules\wxbind\setup $** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp --- 538,542 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_3) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS /i ..\..\..\modules\wxbind\setup $** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp *************** *** 509,512 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS $** --- 544,547 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_3) $(______BUILD_2) /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.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** makefile.bcc 3 Feb 2007 19:12:21 -0000 1.59 --- makefile.bcc 13 Feb 2007 18:43:09 -0000 1.60 *************** *** 98,101 **** --- 98,108 ---- !endif + # This is an advanced option. Handle with care. + # The thread model to use: use 'multi' default to allow + # multi-threading. [multi,single] + !ifndef THREADING + THREADING = multi + !endif + # Compile the wxLua app ? [0,1] !ifndef USE_WXLUAAPP *************** *** 144,149 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_7) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I..\..\..\modules\lua\include $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ --- 151,156 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_6) \ ! $(__THREADING_3) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I..\..\..\modules\lua\include $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ *************** *** 152,157 **** $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_7) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.obj \ --- 159,165 ---- $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_6) \ ! $(__THREADING_3) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ ! $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.obj \ *************** *** 160,165 **** $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_7) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WXSTEDIT_DIR)\include -I$(WX_DIR)\contrib\include $(CPPFLAGS) \ $(CXXFLAGS) --- 168,173 ---- $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_6) \ ! $(__THREADING_3) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WXSTEDIT_DIR)\include -I$(WX_DIR)\contrib\include $(CPPFLAGS) \ $(CXXFLAGS) *************** *** 170,175 **** $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_7) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I..\..\..\modules\wxbind\setup $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ --- 178,183 ---- $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_6) \ ! $(__THREADING_3) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I..\..\..\modules\wxbind\setup $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ *************** *** 182,187 **** $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_7) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj --- 190,196 ---- $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_6) \ ! $(__THREADING_3) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ ! $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj *************** *** 286,289 **** --- 295,310 ---- __RUNTIME_LIBS_3 = !endif + !if "$(THREADING)" == "multi" + __THREADING = mt + !endif + !if "$(THREADING)" == "single" + __THREADING = + !endif + !if "$(THREADING)" == "multi" + __THREADING_3 = -tWM + !endif + !if "$(THREADING)" == "single" + __THREADING_3 = + !endif !if "$(SHARED)" == "0" __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_lib *************** *** 395,402 **** !endif !if "$(BUILD)" == "debug" ! ____BUILD_7 = -v !endif !if "$(BUILD)" == "release" ! ____BUILD_7 = -v- !endif !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" --- 416,423 ---- !endif !if "$(BUILD)" == "debug" ! ____BUILD_6 = -v !endif !if "$(BUILD)" == "release" ! ____BUILD_6 = -v- !endif !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" *************** *** 455,466 **** ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\lua.exe: $(APP_LUA_OBJECTS) ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -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$(__RUNTIME_LIBS_3).lib,, | !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.exe: $(APP_WXLUA_OBJECTS) bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -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_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$(__RUNTIME_LIBS_3).lib,, bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.res | !endif --- 476,487 ---- ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\lua.exe: $(APP_LUA_OBJECTS) ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_6) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -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,, | !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.exe: $(APP_WXLUA_OBJECTS) bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_6) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -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_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)$(SHARED_SUFFIX)\app_wxlua_wxlua.res | !endif *************** *** 468,473 **** !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib -aa -L$(WXSTEDIT_DIR)\lib @&&| ! 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 wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_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$(__RUNTIME_LIBS_3).lib,, bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res | !endif --- 489,494 ---- !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_6) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib -aa -L$(WXSTEDIT_DIR)\lib @&&| ! 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 wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_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)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res | !endif *************** *** 475,480 **** !if "$(USE_WXLUACANAPP)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -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_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$(__RUNTIME_LIBS_3).lib,, bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.res | !endif --- 496,501 ---- !if "$(USE_WXLUACANAPP)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_6) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -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_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)$(SHARED_SUFFIX)\app_wxluacan_cansim.res | !endif *************** *** 482,487 **** !if "$(USE_WXLUAFREEZEAPP)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.exe: $(APP_WXLUAFREEZE_OBJECTS) bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -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_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$(__RUNTIME_LIBS_3).lib,, bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res | !endif --- 503,508 ---- !if "$(USE_WXLUAFREEZEAPP)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.exe: $(APP_WXLUAFREEZE_OBJECTS) bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_6) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -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_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)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res | !endif Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** makefile.wat 3 Feb 2007 19:12:21 -0000 1.60 --- makefile.wat 13 Feb 2007 18:43:09 -0000 1.61 *************** *** 66,69 **** --- 66,74 ---- RUNTIME_LIBS = dynamic + # This is an advanced option. Handle with care. + # The thread model to use: use 'multi' default to allow + # multi-threading. [multi,single] + THREADING = multi + # Compile the wxLua app ? [0,1] USE_WXLUAAPP = 1 *************** *** 182,191 **** __WXLUA_BINOUTPUT_FOLDER_FILENAMES_4 = bin\wat$(WXLIBPOSTFIX)_dll !endif ! ____BUILD_7 = !ifeq BUILD debug ! ____BUILD_7 = -wx !endif !ifeq BUILD release ! ____BUILD_7 = !endif ____BUILD = --- 187,196 ---- __WXLUA_BINOUTPUT_FOLDER_FILENAMES_4 = bin\wat$(WXLIBPOSTFIX)_dll !endif ! ____BUILD_8 = !ifeq BUILD debug ! ____BUILD_8 = -wx !endif !ifeq BUILD release ! ____BUILD_8 = !endif ____BUILD = *************** *** 196,212 **** ____BUILD = -ot -ox !endif ! ____BUILD_8 = !ifeq BUILD debug ! ____BUILD_8 = -d2 !endif !ifeq BUILD release ! ____BUILD_8 = -d0 !endif ! ____BUILD_9 = !ifeq BUILD debug ! ____BUILD_9 = debug all !endif !ifeq BUILD release ! ____BUILD_9 = !endif __RUNTIME_LIBS = --- 201,217 ---- ____BUILD = -ot -ox !endif ! ____BUILD_9 = !ifeq BUILD debug ! ____BUILD_9 = -d2 !endif !ifeq BUILD release ! ____BUILD_9 = -d0 !endif ! ____BUILD_10 = !ifeq BUILD debug ! ____BUILD_10 = debug all !endif !ifeq BUILD release ! ____BUILD_10 = !endif __RUNTIME_LIBS = *************** *** 217,220 **** --- 222,232 ---- __RUNTIME_LIBS = !endif + __THREADING = + !ifeq THREADING multi + __THREADING = -bm + !endif + !ifeq THREADING single + __THREADING = + !endif __WXLUA_OUTPUT_FOLDER_FILENAMES = !ifeq SHARED 0 *************** *** 498,511 **** APP_LUA_CFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_7) $(____BUILD) & ! $(____BUILD_8) $(__RUNTIME_LIBS) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(LUA_DIR)\include -i=..\..\..\modules\lua\include $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua_lua.obj APP_WXLUA_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_7) $(____BUILD) & ! $(____BUILD_8) $(__RUNTIME_LIBS) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.obj & --- 510,524 ---- APP_LUA_CFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_8) $(____BUILD) & ! $(____BUILD_9) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_DIR)\include -i=..\..\..\modules\lua\include & ! $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua_lua.obj APP_WXLUA_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_8) $(____BUILD) & ! $(____BUILD_9) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.obj & *************** *** 513,519 **** APP_WXLUAEDIT_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_7) $(____BUILD) & ! $(____BUILD_8) $(__RUNTIME_LIBS) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(LUA_DIR)\include -i=$(WXSTEDIT_DIR)\include & -i=$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = & --- 526,532 ---- APP_WXLUAEDIT_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_8) $(____BUILD) & ! $(____BUILD_9) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_DIR)\include -i=$(WXSTEDIT_DIR)\include & -i=$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = & *************** *** 522,529 **** APP_WXLUACAN_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_7) $(____BUILD) & ! $(____BUILD_8) $(__RUNTIME_LIBS) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(LUA_DIR)\include -i=..\..\..\modules\wxbind\setup $(CPPFLAGS) & ! $(CXXFLAGS) APP_WXLUACAN_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_wxluacan.obj & --- 535,542 ---- APP_WXLUACAN_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_8) $(____BUILD) & ! $(____BUILD_9) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_DIR)\include -i=..\..\..\modules\wxbind\setup & ! $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_wxluacan.obj & *************** *** 534,540 **** APP_WXLUAFREEZE_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_7) $(____BUILD) & ! $(____BUILD_8) $(__RUNTIME_LIBS) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj --- 547,553 ---- APP_WXLUAFREEZE_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_8) $(____BUILD) & ! $(____BUILD_9) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj *************** *** 566,570 **** @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua.lbc name $^@ @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua.lbc option caseexact ! @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_9) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) libpath $(LUA_DIR)\lib system nt ref 'main_' @for %i in ($(APP_LUA_OBJECTS)) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua.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)$(SHARED_SUFFIX)\app_lua.lbc library %i --- 579,583 ---- @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua.lbc name $^@ @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua.lbc option caseexact ! @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_10) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) libpath $(LUA_DIR)\lib system nt ref 'main_' @for %i in ($(APP_LUA_OBJECTS)) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua.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)$(SHARED_SUFFIX)\app_lua.lbc library %i *************** *** 581,585 **** @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua.lbc name $^@ @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua.lbc option caseexact ! @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_9) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watmsw_$(WXLIBPOSTFIX)$(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_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)$(SHARED_SUFFIX)\app_wxlua.lbc library %i --- 594,598 ---- @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua.lbc name $^@ @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua.lbc option caseexact ! @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_10) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watmsw_$(WXLIBPOSTFIX)$(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_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)$(SHARED_SUFFIX)\app_wxlua.lbc library %i *************** *** 598,602 **** @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit.lbc name $^@ @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit.lbc option caseexact ! @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_9) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' libpath $(WXSTEDIT_DIR)\lib @for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watmsw_$(WXLIBPOSTFIX)$(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 wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_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)$(SHARED_SUFFIX)\app_wxluaedit.lbc library %i --- 611,615 ---- @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit.lbc name $^@ @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit.lbc option caseexact ! @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_10) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' libpath $(WXSTEDIT_DIR)\lib @for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watmsw_$(WXLIBPOSTFIX)$(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 wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_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)$(SHARED_SUFFIX)\app_wxluaedit.lbc library %i *************** *** 613,617 **** @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan.lbc name $^@ @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan.lbc option caseexact ! @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_9) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUACAN_OBJECTS)) do @%append watmsw_$(WXLIBPOSTFIX)$(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_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)$(SHARED_SUFFIX)\app_wxluacan.lbc library %i --- 626,630 ---- @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan.lbc name $^@ @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan.lbc option caseexact ! @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_10) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUACAN_OBJECTS)) do @%append watmsw_$(WXLIBPOSTFIX)$(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_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)$(SHARED_SUFFIX)\app_wxluacan.lbc library %i *************** *** 627,631 **** @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze.lbc name $^@ @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze.lbc option caseexact ! @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_9) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUAFREEZE_OBJECTS)) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze.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_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPART... [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