Menu
▾
▴
[Wxlua-commit] wxLua/apps/build/msw apps.dsw,1.9,1.10 makefile.bcc,1.49,1.50 makefile.gcc,1.50,1.51 makefile.vc,1.49,1.50 makefile.wat,1.50,1.51
|
From: Francesco M. <fr...@us...> - 2006-05-20 13:12:49
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8798/apps/build/msw Modified Files: apps.dsw makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: updated all build system trying to fix SHARED builds Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** makefile.vc 8 May 2006 15:50:47 -0000 1.49 --- makefile.vc 20 May 2006 13:12:34 -0000 1.50 *************** *** 11,17 **** --- 11,23 ---- # ------------------------------------------------------------------------- + # C compiler + CC = cl + # C++ compiler CXX = cl + # Standard flags for CC + CFLAGS = + # Standard flags for C++ CXXFLAGS = *************** *** 80,99 **** ### Variables: ### ! APP_WXLUA_CXXFLAGS = /MD$(____BUILD_9) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_4) $(____BUILD_7) \ ! $(______BUILD) /Fd..\..\..\bin\wxlua.pdb /I..\..\..\modules /I.\..\..\.. \ ! /D_WINDOWS /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj \ msvc$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj \ msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res ! APP_WXLUAEDIT_CXXFLAGS = /MD$(____BUILD_9) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_4) $(____BUILD_7) \ ! $(______BUILD) /Fd..\..\..\bin\wxluaedit.pdb /I..\..\..\modules \ ! /I.\..\..\.. /D_WINDOWS /I$(WXSTEDIT_DIR)\include \ /I$(WX_DIR)\contrib\include /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ --- 86,123 ---- ### Variables: ### ! APP_LUA_CFLAGS = /MD$(____BUILD_17) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_14) \ ! $(____BUILD_15) $(______BUILD) /Fd..\..\..\bin\wxlua-lua.pdb \ ! /I..\..\..\modules /I.\..\..\.. /D_CONSOLE /I..\..\..\modules\lua\include \ ! $(CPPFLAGS) $(CFLAGS) ! APP_LUA_OBJECTS = \ ! msvc$(WXLIBPOSTFIX)\app_lua_lua.obj ! APP_LUAVERBATIM_CFLAGS = /MD$(____BUILD_17) /DWIN32 $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ ! /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_14) \ ! $(____BUILD_15) $(______BUILD) /Fd..\..\..\bin\lua5.1.pdb \ ! /I..\..\..\modules /I.\..\..\.. /D_CONSOLE /I..\..\..\modules\lua\include \ ! $(CPPFLAGS) $(CFLAGS) ! APP_LUAVERBATIM_OBJECTS = \ ! msvc$(WXLIBPOSTFIX)\app_luaverbatim_lua.obj ! APP_WXLUA_CXXFLAGS = /MD$(____BUILD_17) /DWIN32 $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ ! /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_14) \ ! $(____BUILD_15) $(______BUILD) /Fd..\..\..\bin\wxlua.pdb /I..\..\..\modules \ ! /I.\..\..\.. /D_WINDOWS /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj \ msvc$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj \ msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res ! APP_WXLUAEDIT_CXXFLAGS = /MD$(____BUILD_17) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_14) \ ! $(____BUILD_15) $(______BUILD) /Fd..\..\..\bin\wxluaedit.pdb \ ! /I..\..\..\modules /I.\..\..\.. /D_WINDOWS /I$(WXSTEDIT_DIR)\include \ /I$(WX_DIR)\contrib\include /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ *************** *** 101,110 **** msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.obj \ msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res ! APP_WXLUACAN_CXXFLAGS = /MD$(____BUILD_9) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_4) $(____BUILD_7) \ ! $(______BUILD) /Fd..\..\..\bin\wxluacan.pdb /I..\..\..\modules /I.\..\..\.. \ ! /D_WINDOWS /I..\..\..\modules\wxbind\setup /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.obj \ --- 125,135 ---- msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.obj \ msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res ! APP_WXLUACAN_CXXFLAGS = /MD$(____BUILD_17) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_14) \ ! $(____BUILD_15) $(______BUILD) /Fd..\..\..\bin\wxluacan.pdb \ ! /I..\..\..\modules /I.\..\..\.. /D_WINDOWS /I..\..\..\modules\wxbind\setup \ ! /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.obj \ *************** *** 114,123 **** msvc$(WXLIBPOSTFIX)\app_wxluacan_canlua.obj \ msvc$(WXLIBPOSTFIX)\app_wxluacan_cansim.res ! APP_WXLUAFREEZE_CXXFLAGS = /MD$(____BUILD_9) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_4) $(____BUILD_7) \ ! $(______BUILD) /Fd..\..\..\bin\wxluafreeze.pdb /I..\..\..\modules \ ! /I.\..\..\.. /D_WINDOWS /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ msvc$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.obj \ --- 139,148 ---- msvc$(WXLIBPOSTFIX)\app_wxluacan_canlua.obj \ msvc$(WXLIBPOSTFIX)\app_wxluacan_cansim.res ! APP_WXLUAFREEZE_CXXFLAGS = /MD$(____BUILD_17) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_14) \ ! $(____BUILD_15) $(______BUILD) /Fd..\..\..\bin\wxluafreeze.pdb \ ! /I..\..\..\modules /I.\..\..\.. /D_WINDOWS /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ msvc$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.obj \ *************** *** 145,149 **** !endif !if "$(UNICODE)" == "1" ! __WXUNICODE_DEFINE_p_9 = /d _UNICODE !endif !if "$(BUILD)" == "debug" --- 170,174 ---- !endif !if "$(UNICODE)" == "1" ! __WXUNICODE_DEFINE_p_1 = /d _UNICODE !endif !if "$(BUILD)" == "debug" *************** *** 151,155 **** !endif !if "$(BUILD)" == "debug" ! __WXDEBUG_DEFINE_p_9 = /d __WXDEBUG__ !endif !if "$(SHARED)" == "0" --- 176,180 ---- !endif !if "$(BUILD)" == "debug" ! __WXDEBUG_DEFINE_p_1 = /d __WXDEBUG__ !endif !if "$(SHARED)" == "0" *************** *** 172,191 **** !endif !if "$(BUILD)" == "debug" ! ____BUILD_4 = /Od !endif !if "$(BUILD)" == "release" ! ____BUILD_4 = /O2 !endif !if "$(BUILD)" == "debug" ! ____BUILD_7 = /Zi !endif !if "$(BUILD)" == "release" ! ____BUILD_7 = !endif !if "$(BUILD)" == "debug" ! ____BUILD_8 = /DEBUG !endif !if "$(BUILD)" == "release" ! ____BUILD_8 = !endif !if "$(BUILD)" == "debug" --- 197,216 ---- !endif !if "$(BUILD)" == "debug" ! ____BUILD_14 = /Od !endif !if "$(BUILD)" == "release" ! ____BUILD_14 = /O2 !endif !if "$(BUILD)" == "debug" ! ____BUILD_15 = /Zi !endif !if "$(BUILD)" == "release" ! ____BUILD_15 = !endif !if "$(BUILD)" == "debug" ! ____BUILD_16 = /DEBUG !endif !if "$(BUILD)" == "release" ! ____BUILD_16 = !endif !if "$(BUILD)" == "debug" *************** *** 202,209 **** !endif !if "$(BUILD)" == "debug" ! ____BUILD_9 = d !endif !if "$(BUILD)" == "release" ! ____BUILD_9 = !endif !if "$(SHARED)" == "0" --- 227,234 ---- !endif !if "$(BUILD)" == "debug" ! ____BUILD_17 = d !endif !if "$(BUILD)" == "release" ! ____BUILD_17 = !endif !if "$(SHARED)" == "0" *************** *** 332,336 **** ### Targets: ### ! all: $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: --- 357,361 ---- ### Targets: ### ! all: ..\..\..\bin\wxlua-lua.exe ..\..\..\bin\lua5.1.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: *************** *** 338,341 **** --- 363,372 ---- -if exist msvc$(WXLIBPOSTFIX)\*.res del msvc$(WXLIBPOSTFIX)\*.res -if exist msvc$(WXLIBPOSTFIX)\*.pch del msvc$(WXLIBPOSTFIX)\*.pch + -if exist ..\..\..\bin\wxlua-lua.exe del ..\..\..\bin\wxlua-lua.exe + -if exist ..\..\..\bin\wxlua-lua.ilk del ..\..\..\bin\wxlua-lua.ilk + -if exist ..\..\..\bin\wxlua-lua.pdb del ..\..\..\bin\wxlua-lua.pdb + -if exist ..\..\..\bin\lua5.1.exe del ..\..\..\bin\lua5.1.exe + -if exist ..\..\..\bin\lua5.1.ilk del ..\..\..\bin\lua5.1.ilk + -if exist ..\..\..\bin\lua5.1.pdb del ..\..\..\bin\lua5.1.pdb -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe -if exist ..\..\..\bin\wxlua.ilk del ..\..\..\bin\wxlua.ilk *************** *** 351,357 **** -if exist ..\..\..\bin\wxluafreeze.pdb del ..\..\..\bin\wxluafreeze.pdb !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_8) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /SUBSYSTEM:WINDOWS @<< $(APP_WXLUA_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << --- 382,398 ---- -if exist ..\..\..\bin\wxluafreeze.pdb del ..\..\..\bin\wxluafreeze.pdb + ..\..\..\bin\wxlua-lua.exe: $(APP_LUA_OBJECTS) + link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_16) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /SUBSYSTEM:CONSOLE @<< + $(APP_LUA_OBJECTS) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib + << + + ..\..\..\bin\lua5.1.exe: $(APP_LUAVERBATIM_OBJECTS) + link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_16) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /SUBSYSTEM:CONSOLE @<< + $(APP_LUAVERBATIM_OBJECTS) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib lua5.1.lib + << + !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_16) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /SUBSYSTEM:WINDOWS @<< $(APP_WXLUA_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << *************** *** 360,364 **** !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_8) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /SUBSYSTEM:WINDOWS /LIBPATH:$(WXSTEDIT_DIR)\lib @<< $(APP_WXLUAEDIT_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << --- 401,405 ---- !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_16) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /SUBSYSTEM:WINDOWS /LIBPATH:$(WXSTEDIT_DIR)\lib @<< $(APP_WXLUAEDIT_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << *************** *** 367,371 **** !if "$(USE_WXLUACANAPP)" == "1" ..\..\..\bin\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxluacan_cansim.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_8) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /SUBSYSTEM:WINDOWS @<< $(APP_WXLUACAN_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.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 << --- 408,412 ---- !if "$(USE_WXLUACANAPP)" == "1" ..\..\..\bin\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxluacan_cansim.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_16) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /SUBSYSTEM:WINDOWS @<< $(APP_WXLUACAN_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.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 << *************** *** 374,382 **** !if "$(USE_WXLUAFREEZEAPP)" == "1" ..\..\..\bin\wxluafreeze.exe: $(APP_WXLUAFREEZE_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_8) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /SUBSYSTEM:WINDOWS @<< $(APP_WXLUAFREEZE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.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 << !endif msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUA_CXXFLAGS) $** --- 415,429 ---- !if "$(USE_WXLUAFREEZEAPP)" == "1" ..\..\..\bin\wxluafreeze.exe: $(APP_WXLUAFREEZE_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_16) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /SUBSYSTEM:WINDOWS @<< $(APP_WXLUAFREEZE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.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 << !endif + msvc$(WXLIBPOSTFIX)\app_lua_lua.obj: ..\..\..\modules\lua\src\lua.c + $(CC) /c /nologo /TC /Fo$@ $(APP_LUA_CFLAGS) $** + + msvc$(WXLIBPOSTFIX)\app_luaverbatim_lua.obj: ..\..\..\modules\lua\src\lua.c + $(CC) /c /nologo /TC /Fo$@ $(APP_LUAVERBATIM_CFLAGS) $** + msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUA_CXXFLAGS) $** *************** *** 386,390 **** msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_9) $(__WXDEBUG_DEFINE_p_9) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS $** msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp --- 433,437 ---- msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS $** msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp *************** *** 395,399 **** msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_9) $(__WXDEBUG_DEFINE_p_9) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS $** msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp --- 442,446 ---- msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS $** msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp *************** *** 413,417 **** msvc$(WXLIBPOSTFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_9) $(__WXDEBUG_DEFINE_p_9) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS $** msvc$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp --- 460,464 ---- msvc$(WXLIBPOSTFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS $** msvc$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp *************** *** 419,422 **** msvc$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_9) $(__WXDEBUG_DEFINE_p_9) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS $** --- 466,469 ---- msvc$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS $** Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** makefile.bcc 8 May 2006 15:50:47 -0000 1.49 --- makefile.bcc 20 May 2006 13:12:34 -0000 1.50 *************** *** 20,23 **** --- 20,28 ---- # ------------------------------------------------------------------------- + # C compiler + !ifndef CC + CC = bcc32 + !endif + # C++ compiler !ifndef CXX *************** *** 25,28 **** --- 30,38 ---- !endif + # Standard flags for CC + !ifndef CFLAGS + CFLAGS = + !endif + # Standard flags for C++ !ifndef CXXFLAGS *************** *** 118,125 **** ### Variables: ### APP_WXLUA_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_3) \ -I..\..\..\modules -I.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ --- 128,151 ---- ### Variables: ### + APP_LUA_CFLAGS = -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_7) \ + -I..\..\..\modules -I.\..\..\.. -I..\..\..\modules\lua\include $(CPPFLAGS) \ + $(CFLAGS) + APP_LUA_OBJECTS = \ + borland$(WXLIBPOSTFIX)\app_lua_lua.obj + APP_LUAVERBATIM_CFLAGS = -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_7) \ + -I..\..\..\modules -I.\..\..\.. -I..\..\..\modules\lua\include $(CPPFLAGS) \ + $(CFLAGS) + APP_LUAVERBATIM_OBJECTS = \ + borland$(WXLIBPOSTFIX)\app_luaverbatim_lua.obj APP_WXLUA_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_7) \ -I..\..\..\modules -I.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ *************** *** 129,133 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_3) \ -I..\..\..\modules -I.\..\..\.. -I$(WXSTEDIT_DIR)\include \ -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) --- 155,159 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_7) \ -I..\..\..\modules -I.\..\..\.. -I$(WXSTEDIT_DIR)\include \ -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) *************** *** 138,142 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_3) \ -I..\..\..\modules -I.\..\..\.. -I..\..\..\modules\wxbind\setup $(CPPFLAGS) \ $(CXXFLAGS) --- 164,168 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_7) \ -I..\..\..\modules -I.\..\..\.. -I..\..\..\modules\wxbind\setup $(CPPFLAGS) \ $(CXXFLAGS) *************** *** 150,154 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_3) \ -I..\..\..\modules -I.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ --- 176,180 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_7) \ -I..\..\..\modules -I.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ *************** *** 176,180 **** !endif !if "$(UNICODE)" == "1" ! __WXUNICODE_DEFINE_p_9 = -d_UNICODE !endif !if "$(BUILD)" == "debug" --- 202,206 ---- !endif !if "$(UNICODE)" == "1" ! __WXUNICODE_DEFINE_p_1 = -d_UNICODE !endif !if "$(BUILD)" == "debug" *************** *** 182,186 **** !endif !if "$(BUILD)" == "debug" ! __WXDEBUG_DEFINE_p_9 = -d__WXDEBUG__ !endif !if "$(SHARED)" == "0" --- 208,212 ---- !endif !if "$(BUILD)" == "debug" ! __WXDEBUG_DEFINE_p_1 = -d__WXDEBUG__ !endif !if "$(SHARED)" == "0" *************** *** 320,327 **** !endif !if "$(BUILD)" == "debug" ! ____BUILD_3 = -v !endif !if "$(BUILD)" == "release" ! ____BUILD_3 = -v- !endif --- 346,353 ---- !endif !if "$(BUILD)" == "debug" ! ____BUILD_7 = -v !endif !if "$(BUILD)" == "release" ! ____BUILD_7 = -v- !endif *************** *** 333,337 **** ### Targets: ### ! all: $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: --- 359,363 ---- ### Targets: ### ! all: ..\..\..\bin\wxlua-lua.exe ..\..\..\bin\lua5.1.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: *************** *** 339,342 **** --- 365,380 ---- -if exist borland$(WXLIBPOSTFIX)\*.res del borland$(WXLIBPOSTFIX)\*.res -if exist borland$(WXLIBPOSTFIX)\*.csm del borland$(WXLIBPOSTFIX)\*.csm + -if exist ..\..\..\bin\wxlua-lua.exe del ..\..\..\bin\wxlua-lua.exe + -if exist ..\..\..\bin\wxlua-lua.tds del ..\..\..\bin\wxlua-lua.tds + -if exist ..\..\..\bin\wxlua-lua.ilc del ..\..\..\bin\wxlua-lua.ilc + -if exist ..\..\..\bin\wxlua-lua.ild del ..\..\..\bin\wxlua-lua.ild + -if exist ..\..\..\bin\wxlua-lua.ilf del ..\..\..\bin\wxlua-lua.ilf + -if exist ..\..\..\bin\wxlua-lua.ils del ..\..\..\bin\wxlua-lua.ils + -if exist ..\..\..\bin\lua5.1.exe del ..\..\..\bin\lua5.1.exe + -if exist ..\..\..\bin\lua5.1.tds del ..\..\..\bin\lua5.1.tds + -if exist ..\..\..\bin\lua5.1.ilc del ..\..\..\bin\lua5.1.ilc + -if exist ..\..\..\bin\lua5.1.ild del ..\..\..\bin\lua5.1.ild + -if exist ..\..\..\bin\lua5.1.ilf del ..\..\..\bin\lua5.1.ilf + -if exist ..\..\..\bin\lua5.1.ils del ..\..\..\bin\lua5.1.ils -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe -if exist ..\..\..\bin\wxlua.tds del ..\..\..\bin\wxlua.tds *************** *** 364,370 **** -if exist ..\..\..\bin\wxluafreeze.ils del ..\..\..\bin\wxluafreeze.ils !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res | --- 402,418 ---- -if exist ..\..\..\bin\wxluafreeze.ils del ..\..\..\bin\wxluafreeze.ils + ..\..\..\bin\wxlua-lua.exe: $(APP_LUA_OBJECTS) + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -ap @&&| + c0x32.obj $(APP_LUA_OBJECTS),$@,, wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib import32.lib cw32.lib,, + | + + ..\..\..\bin\lua5.1.exe: $(APP_LUAVERBATIM_OBJECTS) + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -ap @&&| + c0x32.obj $(APP_LUAVERBATIM_OBJECTS),$@,, wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib lua5.1.lib import32.lib cw32.lib,, + | + !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res | *************** *** 373,377 **** !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa -L$(WXSTEDIT_DIR)\lib @&&| c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res | --- 421,425 ---- !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa -L$(WXSTEDIT_DIR)\lib @&&| c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res | *************** *** 380,384 **** !if "$(USE_WXLUACANAPP)" == "1" ..\..\..\bin\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxluacan_cansim.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| c0w32.obj $(APP_WXLUACAN_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.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,, borland$(WXLIBPOSTFIX)\app_wxluacan_cansim.res | --- 428,432 ---- !if "$(USE_WXLUACANAPP)" == "1" ..\..\..\bin\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxluacan_cansim.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| c0w32.obj $(APP_WXLUACAN_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.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,, borland$(WXLIBPOSTFIX)\app_wxluacan_cansim.res | *************** *** 387,395 **** !if "$(USE_WXLUAFREEZEAPP)" == "1" ..\..\..\bin\wxluafreeze.exe: $(APP_WXLUAFREEZE_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| c0w32.obj $(APP_WXLUAFREEZE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.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,, borland$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.res | !endif borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** --- 435,449 ---- !if "$(USE_WXLUAFREEZEAPP)" == "1" ..\..\..\bin\wxluafreeze.exe: $(APP_WXLUAFREEZE_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| c0w32.obj $(APP_WXLUAFREEZE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.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,, borland$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.res | !endif + borland$(WXLIBPOSTFIX)\app_lua_lua.obj: ..\..\..\modules\lua\src\lua.c + $(CC) -q -c -P- -o$@ $(APP_LUA_CFLAGS) $** + + borland$(WXLIBPOSTFIX)\app_luaverbatim_lua.obj: ..\..\..\modules\lua\src\lua.c + $(CC) -q -c -P- -o$@ $(APP_LUAVERBATIM_CFLAGS) $** + borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** *************** *** 399,403 **** borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_9) $(__WXDEBUG_DEFINE_p_9) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp --- 453,457 ---- borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp *************** *** 408,412 **** borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_9) $(__WXDEBUG_DEFINE_p_9) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp --- 462,466 ---- borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp *************** *** 426,430 **** borland$(WXLIBPOSTFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_9) $(__WXDEBUG_DEFINE_p_9) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** borland$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp --- 480,484 ---- borland$(WXLIBPOSTFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** borland$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp *************** *** 432,435 **** borland$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_9) $(__WXDEBUG_DEFINE_p_9) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** --- 486,489 ---- borland$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** Index: apps.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/apps.dsw,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** apps.dsw 12 Apr 2006 18:04:05 -0000 1.9 --- apps.dsw 20 May 2006 13:12:34 -0000 1.10 *************** *** 3,6 **** --- 3,30 ---- ############################################################################### + Project: "app_lua"=apps_app_lua.dsp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + }}} + + ############################################################################### + + Project: "app_luaverbatim"=apps_app_luaverbatim.dsp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + }}} + + ############################################################################### + Project: "app_wxlua"=apps_app_wxlua.dsp - Package Owner=<4> Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** makefile.wat 8 May 2006 15:50:47 -0000 1.50 --- makefile.wat 20 May 2006 13:12:34 -0000 1.51 *************** *** 11,17 **** --- 11,23 ---- # ------------------------------------------------------------------------- + # C compiler + CC = wcc386 + # C++ compiler CXX = wpp386 + # Standard flags for CC + CFLAGS = + # Standard flags for C++ CXXFLAGS = *************** *** 121,130 **** __app_wxluafreeze___depname = ..\..\..\bin\wxluafreeze.exe !endif ! ____BUILD_4 = !ifeq BUILD debug ! ____BUILD_4 = -wx !endif !ifeq BUILD release ! ____BUILD_4 = !endif ____BUILD = --- 127,136 ---- __app_wxluafreeze___depname = ..\..\..\bin\wxluafreeze.exe !endif ! ____BUILD_9 = !ifeq BUILD debug ! ____BUILD_9 = -wx !endif !ifeq BUILD release ! ____BUILD_9 = !endif ____BUILD = *************** *** 135,151 **** ____BUILD = -ot -ox !endif ! ____BUILD_3 = !ifeq BUILD debug ! ____BUILD_3 = -d2 !endif !ifeq BUILD release ! ____BUILD_3 = -d0 !endif ! ____BUILD_5 = !ifeq BUILD debug ! ____BUILD_5 = debug all !endif !ifeq BUILD release ! ____BUILD_5 = !endif __WXLUA_OUTPUT_FOLDER_FILENAMES = --- 141,157 ---- ____BUILD = -ot -ox !endif ! ____BUILD_10 = !ifeq BUILD debug ! ____BUILD_10 = -d2 !endif !ifeq BUILD release ! ____BUILD_10 = -d0 !endif ! ____BUILD_11 = !ifeq BUILD debug ! ____BUILD_11 = debug all !endif !ifeq BUILD release ! ____BUILD_11 = !endif __WXLUA_OUTPUT_FOLDER_FILENAMES = *************** *** 428,435 **** ### Variables: ### APP_WXLUA_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_4) $(____BUILD) & ! $(____BUILD_3) -i=..\..\..\modules -i=.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj & --- 434,455 ---- ### Variables: ### + APP_LUA_CFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & + -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & + -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_9) $(____BUILD) & + $(____BUILD_10) -i=..\..\..\modules -i=.\..\..\.. & + -i=..\..\..\modules\lua\include $(CPPFLAGS) $(CFLAGS) + APP_LUA_OBJECTS = & + watcom$(WXLIBPOSTFIX)\app_lua_lua.obj + APP_LUAVERBATIM_CFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & + -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & + -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_9) $(____BUILD) & + $(____BUILD_10) -i=..\..\..\modules -i=.\..\..\.. & + -i=..\..\..\modules\lua\include $(CPPFLAGS) $(CFLAGS) + APP_LUAVERBATIM_OBJECTS = & + watcom$(WXLIBPOSTFIX)\app_luaverbatim_lua.obj APP_WXLUA_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_9) $(____BUILD) & ! $(____BUILD_10) -i=..\..\..\modules -i=.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj & *************** *** 437,443 **** APP_WXLUAEDIT_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_4) $(____BUILD) & ! $(____BUILD_3) -i=..\..\..\modules -i=.\..\..\.. -i=$(WXSTEDIT_DIR)\include & ! -i=$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj & --- 457,464 ---- APP_WXLUAEDIT_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_9) $(____BUILD) & ! $(____BUILD_10) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(WXSTEDIT_DIR)\include -i=$(WX_DIR)\contrib\include $(CPPFLAGS) & ! $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj & *************** *** 445,450 **** APP_WXLUACAN_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_4) $(____BUILD) & ! $(____BUILD_3) -i=..\..\..\modules -i=.\..\..\.. & -i=..\..\..\modules\wxbind\setup $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = & --- 466,471 ---- APP_WXLUACAN_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_9) $(____BUILD) & ! $(____BUILD_10) -i=..\..\..\modules -i=.\..\..\.. & -i=..\..\..\modules\wxbind\setup $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = & *************** *** 456,461 **** APP_WXLUAFREEZE_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_4) $(____BUILD) & ! $(____BUILD_3) -i=..\..\..\modules -i=.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.obj --- 477,482 ---- APP_WXLUAFREEZE_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_9) $(____BUILD) & ! $(____BUILD_10) -i=..\..\..\modules -i=.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.obj *************** *** 468,472 **** ### Targets: ### ! all : .SYMBOLIC $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean : .SYMBOLIC --- 489,493 ---- ### Targets: ### ! all : .SYMBOLIC ..\..\..\bin\wxlua-lua.exe ..\..\..\bin\lua5.1.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean : .SYMBOLIC *************** *** 476,479 **** --- 497,502 ---- -if exist watcom$(WXLIBPOSTFIX)\*.ilk del watcom$(WXLIBPOSTFIX)\*.ilk -if exist watcom$(WXLIBPOSTFIX)\*.pch del watcom$(WXLIBPOSTFIX)\*.pch + -if exist ..\..\..\bin\wxlua-lua.exe del ..\..\..\bin\wxlua-lua.exe + -if exist ..\..\..\bin\lua5.1.exe del ..\..\..\bin\lua5.1.exe -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe -if exist ..\..\..\bin\wxluaedit.exe del ..\..\..\bin\wxluaedit.exe *************** *** 481,484 **** --- 504,529 ---- -if exist ..\..\..\bin\wxluafreeze.exe del ..\..\..\bin\wxluafreeze.exe + ..\..\..\bin\wxlua-lua.exe : $(APP_LUA_OBJECTS) + @%create watcom$(WXLIBPOSTFIX)\app_lua.lbc + @%append watcom$(WXLIBPOSTFIX)\app_lua.lbc option quiet + @%append watcom$(WXLIBPOSTFIX)\app_lua.lbc name $^@ + @%append watcom$(WXLIBPOSTFIX)\app_lua.lbc option caseexact + @%append watcom$(WXLIBPOSTFIX)\app_lua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_11) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) system nt ref 'main_' + @for %i in ($(APP_LUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_lua.lbc file %i + @for %i in ( wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib) do @%append watcom$(WXLIBPOSTFIX)\app_lua.lbc library %i + @%append watcom$(WXLIBPOSTFIX)\app_lua.lbc + wlink @watcom$(WXLIBPOSTFIX)\app_lua.lbc + + ..\..\..\bin\lua5.1.exe : $(APP_LUAVERBATIM_OBJECTS) + @%create watcom$(WXLIBPOSTFIX)\app_luaverbatim.lbc + @%append watcom$(WXLIBPOSTFIX)\app_luaverbatim.lbc option quiet + @%append watcom$(WXLIBPOSTFIX)\app_luaverbatim.lbc name $^@ + @%append watcom$(WXLIBPOSTFIX)\app_luaverbatim.lbc option caseexact + @%append watcom$(WXLIBPOSTFIX)\app_luaverbatim.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_11) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) system nt ref 'main_' + @for %i in ($(APP_LUAVERBATIM_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_luaverbatim.lbc file %i + @for %i in ( wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib) do @%append watcom$(WXLIBPOSTFIX)\app_luaverbatim.lbc library %i + @%append watcom$(WXLIBPOSTFIX)\app_luaverbatim.lbc + wlink @watcom$(WXLIBPOSTFIX)\app_luaverbatim.lbc + !ifeq USE_WXBINDSTC 1 !ifeq USE_WXLUAAPP 1 *************** *** 489,493 **** @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_5) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc file %i @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc library %i --- 534,538 ---- @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_11) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc file %i @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc library %i *************** *** 505,509 **** @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_5) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) system nt_win ref '_WinMain@16' libpath $(WXSTEDIT_DIR)\lib @for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc file %i @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc library %i --- 550,554 ---- @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_11) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) system nt_win ref '_WinMain@16' libpath $(WXSTEDIT_DIR)\lib @for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc file %i @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $... [truncated message content] |
