Menu
▾
▴
[Wxlua-commit] wxLua/modules/build/msw makefile.bcc, 1.61, 1.62 makefile.gcc, 1.60, 1.61 makefile.vc, 1.60, 1.61 makefile.wat, 1.60, 1.61
|
From: Francesco M. <fr...@us...> - 2007-02-13 18:43:17
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27490/modules/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/modules/build/msw/makefile.vc,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** makefile.vc 3 Feb 2007 19:12:22 -0000 1.60 --- makefile.vc 13 Feb 2007 18:43:12 -0000 1.61 *************** *** 69,72 **** --- 69,77 ---- 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 + # Does the wxLua bindings for STC need to be compiled ? [0,1] USE_WXBINDSTC = 1 *************** *** 151,160 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\lua_dll_loadlib.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\lua_dll_linit.obj ! WXLUA_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ --- 156,165 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\lua_dll_loadlib.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\lua_dll_linit.obj ! WXLUA_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS_23)$(____BUILD_1_18) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_15) \ ! $(____BUILD_1_16) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ *************** *** 167,176 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_lib_wxlstate.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_lib_dummy.obj ! WXLUA_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ --- 172,181 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_lib_wxlstate.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_lib_dummy.obj ! WXLUA_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS_41)$(____BUILD_1_18) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_15) \ ! $(____BUILD_1_16) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ *************** *** 183,192 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_wxlstate.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_dummy.obj ! WXBIND_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ --- 188,197 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_wxlstate.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_dummy.obj ! WXBIND_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS_58)$(____BUILD_1_18) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_15) \ ! $(____BUILD_1_16) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ *************** *** 226,235 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_lib_thread.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_lib_help.obj ! WXBIND_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ --- 231,240 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_lib_thread.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_lib_help.obj ! WXBIND_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS_76)$(____BUILD_1_18) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_15) \ ! $(____BUILD_1_16) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ *************** *** 269,278 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_thread.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_help.obj ! WXBINDSTC_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ --- 274,283 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_thread.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_help.obj ! WXBINDSTC_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS_93)$(____BUILD_1_18) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_15) \ ! $(____BUILD_1_16) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ *************** *** 284,293 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_lib_stc.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_lib_dummy.obj ! WXBINDSTC_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ --- 289,298 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_lib_stc.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_lib_dummy.obj ! WXBINDSTC_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS_111)$(____BUILD_1_18) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_15) \ ! $(____BUILD_1_16) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ *************** *** 300,309 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_stc.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_dummy.obj ! WXLUADEBUG_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ --- 305,314 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_stc.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_dummy.obj ! WXLUADEBUG_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS_128)$(____BUILD_1_18) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_15) \ ! $(____BUILD_1_16) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ *************** *** 316,325 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_lib_splttree.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_lib_staktree.obj ! WXLUADEBUG_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ --- 321,330 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_lib_splttree.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_lib_staktree.obj ! WXLUADEBUG_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS_146)$(____BUILD_1_18) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_15) \ ! $(____BUILD_1_16) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ *************** *** 333,342 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_splttree.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_staktree.obj ! WXLUASOCKET_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ --- 338,347 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_splttree.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_staktree.obj ! WXLUASOCKET_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS_163)$(____BUILD_1_18) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_15) \ ! $(____BUILD_1_16) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ *************** *** 352,361 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_lib_dservice.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_lib_wxluasocket.obj ! WXLUASOCKET_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ --- 357,366 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_lib_dservice.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_lib_wxluasocket.obj ! WXLUASOCKET_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS_181)$(____BUILD_1_18) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_15) \ ! $(____BUILD_1_16) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ *************** *** 372,380 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_dservice.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_wxluasocket.obj ! MOD_LUAMODULE_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) /Fd..\..\..\lib\vc_dll\wx.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ /DWXMAKINGDLL_LUAMODULE /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) --- 377,385 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_dservice.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_wxluasocket.obj ! MOD_LUAMODULE_CXXFLAGS = /M$(__RUNTIME_LIBS_199)$(____BUILD_1_18) /DWIN32 \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_15) \ ! $(____BUILD_1_16) $(______BUILD) /Fd..\..\..\lib\vc_dll\wx.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ /DWXMAKINGDLL_LUAMODULE /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) *************** *** 403,445 **** --- 408,516 ---- ..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_23 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_23 = $(__THREADING) + !endif !if "$(SHARED)" == "1" __wxlua_dll___depname = \ ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_41 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_41 = $(__THREADING) + !endif !if "$(SHARED)" == "0" __wxbind_lib___depname = \ ..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_58 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_58 = $(__THREADING) + !endif !if "$(SHARED)" == "1" __wxbind_dll___depname = \ ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.dll !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_76 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_76 = $(__THREADING) + !endif !if "$(SHARED)" == "0" && "$(USE_WXBINDSTC)" == "1" __wxbindstc_lib___depname = \ ..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_93 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_93 = $(__THREADING) + !endif !if "$(SHARED)" == "1" && "$(USE_WXBINDSTC)" == "1" __wxbindstc_dll___depname = \ ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_111 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_111 = $(__THREADING) + !endif !if "$(SHARED)" == "0" && "$(USE_WXLUADEBUG)" == "1" __wxluadebug_lib___depname = \ ..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_128 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_128 = $(__THREADING) + !endif !if "$(SHARED)" == "1" && "$(USE_WXLUADEBUG)" == "1" __wxluadebug_dll___depname = \ ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.dll !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_146 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_146 = $(__THREADING) + !endif !if "$(SHARED)" == "0" && "$(USE_WXLUASOCKET)" == "1" __wxluasocket_lib___depname = \ ..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_163 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_163 = $(__THREADING) + !endif !if "$(SHARED)" == "1" && "$(USE_WXLUASOCKET)" == "1" __wxluasocket_dll___depname = \ ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_181 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_181 = $(__THREADING) + !endif !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" __mod_luamodule___depname = ..\..\..\lib\vc_dll\wx.dll !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_199 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_199 = $(__THREADING) + !endif !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)d_media.lib *************** *** 482,501 **** !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_13 = /Od !endif !if "$(BUILD)" == "release" ! ____BUILD_1_13 = /O2 !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_14 = /Zi !endif !if "$(BUILD)" == "release" ! ____BUILD_1_14 = !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_15 = /DEBUG !endif !if "$(BUILD)" == "release" ! ____BUILD_1_15 = !endif !if "$(BUILD)" == "debug" --- 553,572 ---- !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_15 = /Od !endif !if "$(BUILD)" == "release" ! ____BUILD_1_15 = /O2 !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_16 = /Zi !endif !if "$(BUILD)" == "release" ! ____BUILD_1_16 = !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_17 = /DEBUG !endif !if "$(BUILD)" == "release" ! ____BUILD_1_17 = !endif !if "$(BUILD)" == "debug" *************** *** 506,519 **** !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_16 = d !endif !if "$(BUILD)" == "release" ! ____BUILD_1_16 = !endif ! !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS = D !endif ! !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS = L !endif !if "$(SHARED)" == "0" --- 577,590 ---- !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_18 = d !endif !if "$(BUILD)" == "release" ! ____BUILD_1_18 = !endif ! !if "$(THREADING)" == "multi" ! __THREADING = T !endif ! !if "$(THREADING)" == "single" ! __THREADING = L !endif !if "$(SHARED)" == "0" *************** *** 698,702 **** !if "$(SHARED)" == "1" ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_dummy.obj $(WXLUA_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_15) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(WXLUA_DLL_OBJECTS) lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_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 /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib << --- 769,773 ---- !if "$(SHARED)" == "1" ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_dummy.obj $(WXLUA_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_17) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(WXLUA_DLL_OBJECTS) lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_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 /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib << *************** *** 713,717 **** !if "$(SHARED)" == "1" ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.dll: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_dummy.obj $(WXBIND_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_15) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(WXBIND_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_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 /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib << --- 784,788 ---- !if "$(SHARED)" == "1" ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.dll: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_dummy.obj $(WXBIND_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_17) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(WXBIND_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_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 /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib << *************** *** 728,732 **** !if "$(SHARED)" == "1" && "$(USE_WXBINDSTC)" == "1" ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_dummy.obj $(WXBINDSTC_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_15) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(WXBINDSTC_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib << --- 799,803 ---- !if "$(SHARED)" == "1" && "$(USE_WXBINDSTC)" == "1" ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_dummy.obj $(WXBINDSTC_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_17) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(WXBINDSTC_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib << *************** *** 743,747 **** !if "$(SHARED)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.dll: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_dummy.obj $(WXLUADEBUG_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_15) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(WXLUADEBUG_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_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 /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib << --- 814,818 ---- !if "$(SHARED)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.dll: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_dummy.obj $(WXLUADEBUG_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_17) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(WXLUADEBUG_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_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 /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib << *************** *** 758,762 **** !if "$(SHARED)" == "1" && "$(USE_WXLUASOCKET)" == "1" ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_dummy.obj $(WXLUASOCKET_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_15) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(WXLUASOCKET_DLL_OBJECTS) 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_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_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 /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib << --- 829,833 ---- !if "$(SHARED)" == "1" && "$(USE_WXLUASOCKET)" == "1" ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_dummy.obj $(WXLUASOCKET_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_17) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(WXLUASOCKET_DLL_OBJECTS) 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_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_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 /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib << *************** *** 765,769 **** !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ..\..\..\lib\vc_dll\wx.dll: $(MOD_LUAMODULE_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_15) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(MOD_LUAMODULE_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 << --- 836,840 ---- !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ..\..\..\lib\vc_dll\wx.dll: $(MOD_LUAMODULE_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_17) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(MOD_LUAMODULE_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 << Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** makefile.bcc 3 Feb 2007 19:12:22 -0000 1.61 --- makefile.bcc 13 Feb 2007 18:43:11 -0000 1.62 *************** *** 103,106 **** --- 103,113 ---- !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 + # Does the wxLua bindings for STC need to be compiled ? [0,1] !ifndef USE_WXBINDSTC *************** *** 197,202 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxlua_lib.csm -Hu \ --- 204,209 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_4) \ ! $(__THREADING) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxlua_lib.csm -Hu \ *************** *** 211,216 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUA \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxlua_dll.csm -Hu \ --- 218,223 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_4) \ ! $(__THREADING) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUA \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxlua_dll.csm -Hu \ *************** *** 225,230 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxbind_lib.csm -Hu \ --- 232,237 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_4) \ ! $(__THREADING) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxbind_lib.csm -Hu \ *************** *** 266,271 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBIND \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxbind_dll.csm -Hu \ --- 273,278 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_4) \ ! $(__THREADING) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBIND \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxbind_dll.csm -Hu \ *************** *** 307,312 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxbindstc_lib.csm -Hu \ --- 314,319 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_4) \ ! $(__THREADING) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxbindstc_lib.csm -Hu \ *************** *** 320,325 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDSTC \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxbindstc_dll.csm -Hu \ --- 327,332 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_4) \ ! $(__THREADING) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDSTC \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxbindstc_dll.csm -Hu \ *************** *** 333,338 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxluadebug_lib.csm -Hu \ --- 340,345 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_4) \ ! $(__THREADING) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxluadebug_lib.csm -Hu \ *************** *** 347,352 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUADEBUG \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxluadebug_dll.csm -Hu \ --- 354,359 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_4) \ ! $(__THREADING) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUADEBUG \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxluadebug_dll.csm -Hu \ *************** *** 361,366 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxluasocket_lib.csm -Hu \ --- 368,373 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_4) \ ! $(__THREADING) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxluasocket_lib.csm -Hu \ *************** *** 378,383 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUASOCKET \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxluasocket_dll.csm -Hu \ --- 385,390 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_4) \ ! $(__THREADING) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUASOCKET \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxluasocket_dll.csm -Hu \ *************** *** 394,399 **** $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -DWXMAKINGDLL_LUAMODULE $(CPPFLAGS) $(CXXFLAGS) MOD_LUAMODULE_OBJECTS = \ --- 401,406 ---- $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_4) \ ! $(__THREADING) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -DWXMAKINGDLL_LUAMODULE $(CPPFLAGS) $(CXXFLAGS) MOD_LUAMODULE_OBJECTS = \ *************** *** 506,513 **** !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_4 = i !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_4 = !endif !if "$(SHARED)" == "0" --- 513,532 ---- !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_1 = i !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_1 = ! !endif ! !if "$(THREADING)" == "multi" ! __THREADING_1 = mt ! !endif ! !if "$(THREADING)" == "single" ! __THREADING_1 = ! !endif ! !if "$(THREADING)" == "multi" ! __THREADING = -tWM ! !endif ! !if "$(THREADING)" == "single" ! __THREADING = !endif !if "$(SHARED)" == "0" *************** *** 620,627 **** !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_3 = -v !endif !if "$(BUILD)" == "release" ! ____BUILD_1_3 = -v- !endif --- 639,646 ---- !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_4 = -v !endif !if "$(BUILD)" == "release" ! ____BUILD_1_4 = -v- !endif *************** *** 720,725 **** !if "$(SHARED)" == "1" ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_dummy.obj $(WXLUA_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(WXLUA_DLL_OBJECTS),$@,, lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_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_4).lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua $@ --- 739,744 ---- !if "$(SHARED)" == "1" ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_dummy.obj $(WXLUA_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(WXLUA_DLL_OBJECTS),$@,, lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_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_1)$(__RUNTIME_LIBS_1).lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua $@ *************** *** 736,741 **** !if "$(SHARED)" == "1" ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.dll: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_dummy.obj $(WXBIND_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(WXBIND_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_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_4).lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind $@ --- 755,760 ---- !if "$(SHARED)" == "1" ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.dll: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_dummy.obj $(WXBIND_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(WXBIND_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_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_1)$(__RUNTIME_LIBS_1).lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind $@ *************** *** 752,757 **** !if "$(SHARED)" == "1" && "$(USE_WXBINDSTC)" == "1" ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_dummy.obj $(WXBINDSTC_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(WXBINDSTC_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__RUNTIME_LIBS_4).lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc $@ --- 771,776 ---- !if "$(SHARED)" == "1" && "$(USE_WXBINDSTC)" == "1" ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_dummy.obj $(WXBINDSTC_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(WXBINDSTC_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING_1)$(__RUNTIME_LIBS_1).lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc $@ *************** *** 768,773 **** !if "$(SHARED)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.dll: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_dummy.obj $(WXLUADEBUG_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(WXLUADEBUG_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_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_4).lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug $@ --- 787,792 ---- !if "$(SHARED)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.dll: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_dummy.obj $(WXLUADEBUG_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(WXLUADEBUG_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_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_1)$(__RUNTIME_LIBS_1).lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug $@ *************** *** 784,789 **** !if "$(SHARED)" == "1" && "$(USE_WXLUASOCKET)" == "1" ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_dummy.obj $(WXLUASOCKET_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(WXLUASOCKET_DLL_OBJECTS),$@,, 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_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_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_4).lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket $@ --- 803,808 ---- !if "$(SHARED)" == "1" && "$(USE_WXLUASOCKET)" == "1" ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_dummy.obj $(WXLUASOCKET_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(WXLUASOCKET_DLL_OBJECTS),$@,, 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_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_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_1)$(__RUNTIME_LIBS_1).lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket $@ *************** *** 792,797 **** !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ..\..\..\lib\bcc_dll\wx.dll: $(MOD_LUAMODULE_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(MOD_LUAMODULE_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_4).lib,, | !endif --- 811,816 ---- !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ..\..\..\lib\bcc_dll\wx.dll: $(MOD_LUAMODULE_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(MOD_LUAMODULE_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_1)$(__RUNTIME_LIBS_1).lib,, | !endif Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/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:22 -0000 1.60 --- makefile.wat 13 Feb 2007 18:43:12 -0000 1.61 *************** *** 69,72 **** --- 69,77 ---- 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 + # Does the wxLua bindings for STC need to be compiled ? [0,1] USE_WXBINDSTC = 1 *************** *** 262,285 **** ____BUILD = !endif ! ____BUILD_1_0 = !ifeq BUILD debug ! ____BUILD_1_0 = -od !endif !ifeq BUILD release ! ____BUILD_1_0 = -ot -ox !endif ! ____BUILD_21 = !ifeq BUILD debug ! ____BUILD_21 = -d2 !endif !ifeq BUILD release ! ____BUILD_21 = -d0 !endif ! ____BUILD_1_1 = !ifeq BUILD debug ! ____BUILD_1_1 = debug all !endif !ifeq BUILD release ! ____BUILD_1_1 = !endif __RUNTIME_LIBS = --- 267,290 ---- ____BUILD = !endif ! ____BUILD_1_4 = !ifeq BUILD debug ! ____BUILD_1_4 = -od !endif !ifeq BUILD release ! ____BUILD_1_4 = -ot -ox !endif ! ____BUILD_1_5 = !ifeq BUILD debug ! ____BUILD_1_5 = -d2 !endif !ifeq BUILD release ! ____BUILD_1_5 = -d0 !endif ! ____BUILD_1_6 = !ifeq BUILD debug ! ____BUILD_1_6 = debug all !endif !ifeq BUILD release ! ____BUILD_1_6 = !endif __RUNTIME_LIBS = *************** *** 290,293 **** --- 295,305 ---- __RUNTIME_LIBS = !endif + __THREADING = + !ifeq THREADING multi + __THREADING = -bm + !endif + !ifeq THREADING single + __THREADING = + !endif __WXLUA_OUTPUT_FOLDER_FILENAMES = !ifeq SHARED 0 *************** *** 603,610 **** $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_0) & ! $(____BUILD_21) $(__RUNTIME_LIBS) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(LUA_DIR)\include -i=$(WX_DIR)\contrib\include /fh $(CPPFLAGS) & ! $(CXXFLAGS) WXLUA_LIB_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_lib_wxlcallb.obj & --- 615,622 ---- $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_4) & ! $(____BUILD_1_5) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_DIR)\include -i=$(WX_DIR)\contrib\include /fh & ! $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_lib_wxlcallb.obj & *************** *** 615,622 **** $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_0) & ! $(____BUILD_21) $(__RUNTIME_LIBS) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(LUA_DIR)\include -i=$(WX_DIR)\contrib\include -dWXMAKINGDLL_WXLUA /fh & ! $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_wxlcallb.obj & --- 627,634 ---- $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_4) & ! $(____BUILD_1_5) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_DIR)\include -i=$(WX_DIR)\contrib\include & ! -dWXMAKINGDLL_WXLUA /fh $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_wxlcallb.obj & *************** *** 627,634 **** $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_0) & ! $(____BUILD_21) $(__RUN... [truncated message content] |
