Menu
▾
▴
[Wxlua-commit] wxLua/modules/build/msw makefile.bcc, 1.60, 1.61 makefile.vc, 1.59, 1.60 makefile.wat, 1.59, 1.60
|
From: Francesco M. <fr...@us...> - 2007-02-03 19:12:25
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32395/modules/build/msw Modified Files: makefile.bcc makefile.vc makefile.wat Log Message: added the RUNTIME_LIBS option to the bakefile build system Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** makefile.vc 20 Dec 2006 16:39:44 -0000 1.59 --- makefile.vc 3 Feb 2007 19:12:22 -0000 1.60 *************** *** 63,66 **** --- 63,72 ---- LUA_DIR = ..\..\..\modules\lua + # This is an advanced option. Handle with care. + # Version of C runtime library to use. You can change this to + # static if SHARED=0, but it is highly recommended to not do + # it if SHARED=1 unless you know what you are doing. [dynamic,static] + RUNTIME_LIBS = dynamic + # Does the wxLua bindings for STC need to be compiled ? [0,1] USE_WXBINDSTC = 1 *************** *** 145,154 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\lua_dll_loadlib.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\lua_dll_linit.obj ! WXLUA_LIB_CXXFLAGS = /MD$(____BUILD_1_14) /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_11) \ ! $(____BUILD_1_12) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ --- 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 \ *************** *** 161,170 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_lib_wxlstate.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_lib_dummy.obj ! WXLUA_DLL_CXXFLAGS = /MD$(____BUILD_1_14) /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_11) \ ! $(____BUILD_1_12) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\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 \ *************** *** 177,186 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_wxlstate.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_dummy.obj ! WXBIND_LIB_CXXFLAGS = /MD$(____BUILD_1_14) /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_11) \ ! $(____BUILD_1_12) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.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 \ *************** *** 220,229 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_lib_thread.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_lib_help.obj ! WXBIND_DLL_CXXFLAGS = /MD$(____BUILD_1_14) /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_11) \ ! $(____BUILD_1_12) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\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 \ *************** *** 263,272 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_thread.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_help.obj ! WXBINDSTC_LIB_CXXFLAGS = /MD$(____BUILD_1_14) /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_11) \ ! $(____BUILD_1_12) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.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 \ *************** *** 278,287 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_lib_stc.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_lib_dummy.obj ! WXBINDSTC_DLL_CXXFLAGS = /MD$(____BUILD_1_14) /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_11) \ ! $(____BUILD_1_12) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\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 \ *************** *** 294,303 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_stc.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_dummy.obj ! WXLUADEBUG_LIB_CXXFLAGS = /MD$(____BUILD_1_14) /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_11) \ ! $(____BUILD_1_12) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.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 \ *************** *** 310,319 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_lib_splttree.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_lib_staktree.obj ! WXLUADEBUG_DLL_CXXFLAGS = /MD$(____BUILD_1_14) /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_11) \ ! $(____BUILD_1_12) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\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 \ *************** *** 327,336 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_splttree.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_staktree.obj ! WXLUASOCKET_LIB_CXXFLAGS = /MD$(____BUILD_1_14) /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_11) \ ! $(____BUILD_1_12) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.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 \ *************** *** 346,355 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_lib_dservice.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_lib_wxluasocket.obj ! WXLUASOCKET_DLL_CXXFLAGS = /MD$(____BUILD_1_14) /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_11) \ ! $(____BUILD_1_12) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\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 \ *************** *** 366,374 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_dservice.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_wxluasocket.obj ! MOD_LUAMODULE_CXXFLAGS = /MD$(____BUILD_1_14) /DWIN32 $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_11) \ ! $(____BUILD_1_12) $(______BUILD) /Fd..\..\..\lib\vc_dll\wx.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ /DWXMAKINGDLL_LUAMODULE /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) --- 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) *************** *** 476,495 **** !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_11 = /Od !endif !if "$(BUILD)" == "release" ! ____BUILD_1_11 = /O2 !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_12 = /Zi !endif !if "$(BUILD)" == "release" ! ____BUILD_1_12 = !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_13 = /DEBUG !endif !if "$(BUILD)" == "release" ! ____BUILD_1_13 = !endif !if "$(BUILD)" == "debug" --- 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" *************** *** 500,507 **** !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_14 = d !endif !if "$(BUILD)" == "release" ! ____BUILD_1_14 = !endif !if "$(SHARED)" == "0" --- 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" *************** *** 686,690 **** !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_13) /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 << --- 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 << *************** *** 701,705 **** !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_13) /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 << --- 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 << *************** *** 716,720 **** !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_13) /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 << --- 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 << *************** *** 731,735 **** !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_13) /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 << --- 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 << *************** *** 746,750 **** !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_13) /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 << --- 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 << *************** *** 753,757 **** !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_13) /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 << --- 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 << Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** makefile.bcc 20 Dec 2006 16:39:44 -0000 1.60 --- makefile.bcc 3 Feb 2007 19:12:22 -0000 1.61 *************** *** 95,98 **** --- 95,106 ---- !endif + # This is an advanced option. Handle with care. + # Version of C runtime library to use. You can change this to + # static if SHARED=0, but it is highly recommended to not do + # it if SHARED=1 unless you know what you are doing. [dynamic,static] + !ifndef RUNTIME_LIBS + RUNTIME_LIBS = dynamic + !endif + # Does the wxLua bindings for STC need to be compiled ? [0,1] !ifndef USE_WXBINDSTC *************** *** 185,192 **** bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\lua_dll_loadlib.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\lua_dll_linit.obj ! WXLUA_LIB_CXXFLAGS = -I$(BCCDIR)\include -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_10) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ --- 193,201 ---- bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\lua_dll_loadlib.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\lua_dll_linit.obj ! WXLUA_LIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ ! -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_3) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ *************** *** 198,205 **** bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_lib_wxlstate.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_lib_dummy.obj ! WXLUA_DLL_CXXFLAGS = -I$(BCCDIR)\include -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_10) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUA \ --- 207,215 ---- bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_lib_wxlstate.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_lib_dummy.obj ! WXLUA_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ ! -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_3) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUA \ *************** *** 211,218 **** bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_wxlstate.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_dummy.obj ! WXBIND_LIB_CXXFLAGS = -I$(BCCDIR)\include -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_10) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ --- 221,229 ---- bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_wxlstate.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_dummy.obj ! WXBIND_LIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ ! -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_3) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ *************** *** 251,258 **** bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_lib_thread.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_lib_help.obj ! WXBIND_DLL_CXXFLAGS = -I$(BCCDIR)\include -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_10) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBIND \ --- 262,270 ---- bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_lib_thread.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_lib_help.obj ! WXBIND_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ ! -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_3) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBIND \ *************** *** 291,298 **** bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_thread.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_help.obj ! WXBINDSTC_LIB_CXXFLAGS = -I$(BCCDIR)\include -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_10) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ --- 303,311 ---- bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_thread.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_help.obj ! WXBINDSTC_LIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ ! -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_3) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ *************** *** 303,310 **** bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_lib_stc.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_lib_dummy.obj ! WXBINDSTC_DLL_CXXFLAGS = -I$(BCCDIR)\include -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_10) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDSTC \ --- 316,324 ---- bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_lib_stc.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_lib_dummy.obj ! WXBINDSTC_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ ! -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_3) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDSTC \ *************** *** 315,322 **** bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_stc.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_dummy.obj ! WXLUADEBUG_LIB_CXXFLAGS = -I$(BCCDIR)\include -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_10) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ --- 329,337 ---- bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_stc.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_dummy.obj ! WXLUADEBUG_LIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ ! -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_3) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ *************** *** 328,335 **** bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_lib_splttree.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_lib_staktree.obj ! WXLUADEBUG_DLL_CXXFLAGS = -I$(BCCDIR)\include -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_10) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUADEBUG \ --- 343,351 ---- bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_lib_splttree.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_lib_staktree.obj ! WXLUADEBUG_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ ! -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_3) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUADEBUG \ *************** *** 341,349 **** bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_splttree.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_staktree.obj ! WXLUASOCKET_LIB_CXXFLAGS = -I$(BCCDIR)\include \ -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_10) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ --- 357,365 ---- bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_splttree.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_staktree.obj ! WXLUASOCKET_LIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ -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_3) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ *************** *** 358,366 **** bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_lib_dservice.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_lib_wxluasocket.obj ! WXLUASOCKET_DLL_CXXFLAGS = -I$(BCCDIR)\include \ -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_10) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUASOCKET \ --- 374,382 ---- bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_lib_dservice.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_lib_wxluasocket.obj ! WXLUASOCKET_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ -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_3) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUASOCKET \ *************** *** 375,382 **** bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_dservice.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_wxluasocket.obj ! MOD_LUAMODULE_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -DWXMAKINGDLL_LUAMODULE $(CPPFLAGS) $(CXXFLAGS) --- 391,398 ---- bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_dservice.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_wxluasocket.obj ! MOD_LUAMODULE_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ ! $(__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) *************** *** 483,486 **** --- 499,514 ---- ____BUILD = -O2 !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS = -tWR + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS = + !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_4 = i + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_4 = + !endif !if "$(SHARED)" == "0" __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_lib *************** *** 592,599 **** !endif !if "$(BUILD)" == "debug" ! ____BUILD_10 = -v !endif !if "$(BUILD)" == "release" ! ____BUILD_10 = -v- !endif --- 620,627 ---- !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_3 = -v !endif !if "$(BUILD)" == "release" ! ____BUILD_1_3 = -v- !endif *************** *** 692,697 **** !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_10) -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.lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua $@ --- 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 $@ *************** *** 708,713 **** !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_10) -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.lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind $@ --- 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 $@ *************** *** 724,729 **** !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_10) -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.lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc $@ --- 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 $@ *************** *** 740,745 **** !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_10) -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.lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug $@ --- 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 $@ *************** *** 756,761 **** !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_10) -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.lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket $@ --- 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 $@ *************** *** 764,769 **** !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_10) -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.lib,, | !endif --- 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 Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** makefile.wat 20 Dec 2006 16:39:45 -0000 1.59 --- makefile.wat 3 Feb 2007 19:12:22 -0000 1.60 *************** *** 63,66 **** --- 63,72 ---- LUA_DIR = ..\..\..\modules\lua + # This is an advanced option. Handle with care. + # Version of C runtime library to use. You can change this to + # static if SHARED=0, but it is highly recommended to not do + # it if SHARED=1 unless you know what you are doing. [dynamic,static] + RUNTIME_LIBS = dynamic + # Does the wxLua bindings for STC need to be compiled ? [0,1] USE_WXBINDSTC = 1 *************** *** 256,279 **** ____BUILD = !endif ! ____BUILD_21 = !ifeq BUILD debug ! ____BUILD_21 = -od !endif !ifeq BUILD release ! ____BUILD_21 = -ot -ox !endif ! ____BUILD_22 = !ifeq BUILD debug ! ____BUILD_22 = -d2 !endif !ifeq BUILD release ! ____BUILD_22 = -d0 !endif ! ____BUILD_23 = !ifeq BUILD debug ! ____BUILD_23 = debug all !endif !ifeq BUILD release ! ____BUILD_23 = !endif __WXLUA_OUTPUT_FOLDER_FILENAMES = --- 262,292 ---- ____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 = ! !ifeq RUNTIME_LIBS dynamic ! __RUNTIME_LIBS = -br ! !endif ! !ifeq RUNTIME_LIBS static ! __RUNTIME_LIBS = !endif __WXLUA_OUTPUT_FOLDER_FILENAMES = *************** *** 590,596 **** $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_21) & ! $(____BUILD_22) -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 & --- 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 & *************** *** 601,607 **** $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_21) & ! $(____BUILD_22) -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 & --- 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 & *************** *** 612,618 **** $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_21) & ! $(____BUILD_22) -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_DIR)\include & ! -i=$(WX_DIR)\contrib\include /fh $(CPPFLAGS) $(CXXFLAGS) WXBIND_LIB_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_lib_wxlua.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) $(__RUNTIME_... [truncated message content] |
