Menu
▾
▴
[Wxlua-commit] wxLua/apps/build/msw apps.dsw,1.4,1.5 makefile.bcc,1.20,1.21 makefile.gcc,1.21,1.22 makefile.vc,1.19,1.20 makefile.wat,1.20,1.21
|
From: Francesco M. <fr...@us...> - 2006-02-03 18:41:05
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10289/apps/build/msw Modified Files: apps.dsw makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: added wxluacan sample to build system Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** makefile.vc 3 Feb 2006 16:55:47 -0000 1.19 --- makefile.vc 3 Feb 2006 18:40:50 -0000 1.20 *************** *** 45,48 **** --- 45,51 ---- USE_WXLUAAPP = 1 + # Compile the wxLuaCan app ? [0,1] + USE_WXLUACANAPP = 1 + # Compile the wxLuaEditor app ? [0,1] USE_WXLUAEDITAPP = 0 *************** *** 59,64 **** $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_0) \ ! $(____WX_DEBUG_1) $(______WX_DEBUG) /Fd..\..\..\bin\wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /D_WINDOWS /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ --- 62,67 ---- $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_4) \ ! $(____WX_DEBUG_5) $(______WX_DEBUG) /Fd..\..\..\bin\wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /D_WINDOWS /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ *************** *** 69,74 **** $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_0) \ ! $(____WX_DEBUG_1) $(______WX_DEBUG) /Fd..\..\..\bin\wxluaedit.pdb \ /I..\..\..\modules /I.\..\..\.. /D_WINDOWS /I$(WXSTEDIT)\include \ /I$(WX_DIR)\contrib\include /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) --- 72,77 ---- $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_4) \ ! $(____WX_DEBUG_5) $(______WX_DEBUG) /Fd..\..\..\bin\wxluaedit.pdb \ /I..\..\..\modules /I.\..\..\.. /D_WINDOWS /I$(WXSTEDIT)\include \ /I$(WX_DIR)\contrib\include /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) *************** *** 77,80 **** --- 80,101 ---- msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.obj \ msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res + APP_WXLUACAN_CXXFLAGS = /MD$(____WX_DEBUG_3) /DWIN32 $(__WXUNICODE_DEFINE_p) \ + $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ + /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ + /I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_4) \ + $(____WX_DEBUG_5) $(______WX_DEBUG) /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 \ + msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_class.obj \ + msvc$(WXLIBPOSTFIX)\app_wxluacan_cancom.obj \ + msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_object.obj \ + msvc$(WXLIBPOSTFIX)\app_wxluacan_cansim.obj \ + msvc$(WXLIBPOSTFIX)\app_wxluacan_canlua.obj \ + msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_define.obj \ + msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_builtin.obj \ + msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_event.obj \ + msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.res ### Conditionally set variables: ### *************** *** 101,109 **** __WXLUA_OUTPUT_FOLDER_FILENAMES_1 = lib\vc_dll$(WXLIBPOSTFIX) !endif !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p = /D_UNICODE !endif !if "$(WX_UNICODE)" == "1" ! __WXUNICODE_DEFINE_p_0 = /d _UNICODE !endif !if "$(WX_DEBUG)" == "1" --- 122,139 ---- __WXLUA_OUTPUT_FOLDER_FILENAMES_1 = lib\vc_dll$(WXLIBPOSTFIX) !endif + !if "$(USE_WXLUACANAPP)" == "1" + __app_wxluacan___depname = ..\..\..\bin\wxluacan.exe + !endif + !if "$(WX_SHARED)" == "0" + __WXLUA_OUTPUT_FOLDER_FILENAMES_2 = lib\vc_lib$(WXLIBPOSTFIX) + !endif + !if "$(WX_SHARED)" == "1" + __WXLUA_OUTPUT_FOLDER_FILENAMES_2 = lib\vc_dll$(WXLIBPOSTFIX) + !endif !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p = /D_UNICODE !endif !if "$(WX_UNICODE)" == "1" ! __WXUNICODE_DEFINE_p_6 = /d _UNICODE !endif !if "$(WX_DEBUG)" == "1" *************** *** 111,115 **** !endif !if "$(WX_DEBUG)" == "1" ! __WXDEBUG_DEFINE_p_0 = /d __WXDEBUG__ !endif !if "$(WX_SHARED)" == "0" --- 141,145 ---- !endif !if "$(WX_DEBUG)" == "1" ! __WXDEBUG_DEFINE_p_6 = /d __WXDEBUG__ !endif !if "$(WX_SHARED)" == "0" *************** *** 120,127 **** !endif !if "$(WX_SHARED)" == "0" ! ____WX_SHARED_0 = !endif !if "$(WX_SHARED)" == "1" ! ____WX_SHARED_0 = /d WXUSINGDLL !endif !if "$(WX_DEBUG)" == "0" --- 150,157 ---- !endif !if "$(WX_SHARED)" == "0" ! ____WX_SHARED_1 = !endif !if "$(WX_SHARED)" == "1" ! ____WX_SHARED_1 = /d WXUSINGDLL !endif !if "$(WX_DEBUG)" == "0" *************** *** 132,151 **** !endif !if "$(WX_DEBUG)" == "0" ! ____WX_DEBUG_0 = /O2 !endif !if "$(WX_DEBUG)" == "1" ! ____WX_DEBUG_0 = /Od !endif !if "$(WX_DEBUG)" == "0" ! ____WX_DEBUG_1 = !endif !if "$(WX_DEBUG)" == "1" ! ____WX_DEBUG_1 = /Zi !endif !if "$(WX_DEBUG)" == "0" ! ____WX_DEBUG_2 = !endif !if "$(WX_DEBUG)" == "1" ! ____WX_DEBUG_2 = /DEBUG !endif !if "$(WX_DEBUG)" == "0" --- 162,181 ---- !endif !if "$(WX_DEBUG)" == "0" ! ____WX_DEBUG_4 = /O2 !endif !if "$(WX_DEBUG)" == "1" ! ____WX_DEBUG_4 = /Od !endif !if "$(WX_DEBUG)" == "0" ! ____WX_DEBUG_5 = !endif !if "$(WX_DEBUG)" == "1" ! ____WX_DEBUG_5 = /Zi !endif !if "$(WX_DEBUG)" == "0" ! ____WX_DEBUG_6 = !endif !if "$(WX_DEBUG)" == "1" ! ____WX_DEBUG_6 = /DEBUG !endif !if "$(WX_DEBUG)" == "0" *************** *** 156,163 **** !endif !if "$(WX_DEBUG)" == "0" ! ______WX_DEBUG_0 = !endif !if "$(WX_DEBUG)" == "1" ! ______WX_DEBUG_0 = /d _DEBUG !endif !if "$(WX_DEBUG)" == "0" --- 186,193 ---- !endif !if "$(WX_DEBUG)" == "0" ! ______WX_DEBUG_1 = !endif !if "$(WX_DEBUG)" == "1" ! ______WX_DEBUG_1 = /d _DEBUG !endif !if "$(WX_DEBUG)" == "0" *************** *** 190,194 **** ### Targets: ### ! all: $(__app_wxlua___depname) $(__app_wxluaedit___depname) clean: --- 220,224 ---- ### Targets: ### ! all: $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) clean: *************** *** 202,209 **** -if exist ..\..\..\bin\wxluaedit.ilk del ..\..\..\bin\wxluaedit.ilk -if exist ..\..\..\bin\wxluaedit.pdb del ..\..\..\bin\wxluaedit.pdb !if "$(USE_WXLUAAPP)" == "1" ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_2) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /SUBSYSTEM:WINDOWS @<< $(APP_WXLUA_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib 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)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).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 << --- 232,242 ---- -if exist ..\..\..\bin\wxluaedit.ilk del ..\..\..\bin\wxluaedit.ilk -if exist ..\..\..\bin\wxluaedit.pdb del ..\..\..\bin\wxluaedit.pdb + -if exist ..\..\..\bin\wxluacan.exe del ..\..\..\bin\wxluacan.exe + -if exist ..\..\..\bin\wxluacan.ilk del ..\..\..\bin\wxluacan.ilk + -if exist ..\..\..\bin\wxluacan.pdb del ..\..\..\bin\wxluacan.pdb !if "$(USE_WXLUAAPP)" == "1" ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_6) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /SUBSYSTEM:WINDOWS @<< $(APP_WXLUA_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib 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)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).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 << *************** *** 212,220 **** !if "$(USE_WXLUAEDITAPP)" == "1" ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_2) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_1) /SUBSYSTEM:WINDOWS @<< $(APP_WXLUAEDIT_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib 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)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).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 << !endif msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUA_CXXFLAGS) $** --- 245,260 ---- !if "$(USE_WXLUAEDITAPP)" == "1" ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_6) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_1) /SUBSYSTEM:WINDOWS @<< $(APP_WXLUAEDIT_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib 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)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).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 << !endif + !if "$(USE_WXLUACANAPP)" == "1" + ..\..\..\bin\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.res + link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_6) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_2) /SUBSYSTEM:WINDOWS @<< + $(APP_WXLUACAN_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib 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)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).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 + << + !endif + msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUA_CXXFLAGS) $** *************** *** 224,228 **** msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____WX_SHARED_0) $(______WX_DEBUG_0) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS $** msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp --- 264,268 ---- msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_6) $(__WXDEBUG_DEFINE_p_6) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____WX_SHARED_1) $(______WX_DEBUG_1) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS $** msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp *************** *** 233,236 **** msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____WX_SHARED_0) $(______WX_DEBUG_0) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS $** --- 273,306 ---- msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_6) $(__WXDEBUG_DEFINE_p_6) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____WX_SHARED_1) $(______WX_DEBUG_1) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS $** ! ! msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_class.obj: ..\..\wxluacan\src\wxluacan_class.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! msvc$(WXLIBPOSTFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_object.obj: ..\..\wxluacan\src\wxluacan_object.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! msvc$(WXLIBPOSTFIX)\app_wxluacan_cansim.obj: ..\..\wxluacan\src\cansim.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! msvc$(WXLIBPOSTFIX)\app_wxluacan_canlua.obj: ..\..\wxluacan\src\canlua.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_define.obj: ..\..\wxluacan\src\wxluacan_define.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_builtin.obj: ..\..\wxluacan\src\wxluacan_builtin.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_event.obj: ..\..\wxluacan\src\wxluacan_event.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.res: ..\..\wxluacan\src\wxluacan.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_6) $(__WXDEBUG_DEFINE_p_6) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____WX_SHARED_1) $(______WX_DEBUG_1) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS $** Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** makefile.bcc 3 Feb 2006 16:55:47 -0000 1.20 --- makefile.bcc 3 Feb 2006 18:40:50 -0000 1.21 *************** *** 70,73 **** --- 70,78 ---- !endif + # Compile the wxLuaCan app ? [0,1] + !ifndef USE_WXLUACANAPP + USE_WXLUACANAPP = 1 + !endif + # Compile the wxLuaEditor app ? [0,1] !ifndef USE_WXLUAEDITAPP *************** *** 86,90 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_1) \ -I..\..\..\modules -I.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ --- 91,95 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_2) \ -I..\..\..\modules -I.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ *************** *** 94,98 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_1) \ -I..\..\..\modules -I.\..\..\.. -I$(WXSTEDIT)\include \ -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) --- 99,103 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_2) \ -I..\..\..\modules -I.\..\..\.. -I$(WXSTEDIT)\include \ -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) *************** *** 100,103 **** --- 105,124 ---- borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj \ borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.obj + APP_WXLUACAN_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ + $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ + -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ + -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_2) \ + -I..\..\..\modules -I.\..\..\.. -I..\..\..\modules\wxbind\setup $(CPPFLAGS) \ + $(CXXFLAGS) + APP_WXLUACAN_OBJECTS = \ + borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.obj \ + borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_class.obj \ + borland$(WXLIBPOSTFIX)\app_wxluacan_cancom.obj \ + borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_object.obj \ + borland$(WXLIBPOSTFIX)\app_wxluacan_cansim.obj \ + borland$(WXLIBPOSTFIX)\app_wxluacan_canlua.obj \ + borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_define.obj \ + borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_builtin.obj \ + borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_event.obj ### Conditionally set variables: ### *************** *** 124,132 **** __WXLUA_OUTPUT_FOLDER_FILENAMES_1 = lib\bcc_dll$(WXLIBPOSTFIX) !endif !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p = -D_UNICODE !endif !if "$(WX_UNICODE)" == "1" ! __WXUNICODE_DEFINE_p_0 = -d_UNICODE !endif !if "$(WX_DEBUG)" == "1" --- 145,162 ---- __WXLUA_OUTPUT_FOLDER_FILENAMES_1 = lib\bcc_dll$(WXLIBPOSTFIX) !endif + !if "$(USE_WXLUACANAPP)" == "1" + __app_wxluacan___depname = ..\..\..\bin\wxluacan.exe + !endif + !if "$(WX_SHARED)" == "0" + __WXLUA_OUTPUT_FOLDER_FILENAMES_2 = lib\bcc_lib$(WXLIBPOSTFIX) + !endif + !if "$(WX_SHARED)" == "1" + __WXLUA_OUTPUT_FOLDER_FILENAMES_2 = lib\bcc_dll$(WXLIBPOSTFIX) + !endif !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p = -D_UNICODE !endif !if "$(WX_UNICODE)" == "1" ! __WXUNICODE_DEFINE_p_6 = -d_UNICODE !endif !if "$(WX_DEBUG)" == "1" *************** *** 134,138 **** !endif !if "$(WX_DEBUG)" == "1" ! __WXDEBUG_DEFINE_p_0 = -d__WXDEBUG__ !endif !if "$(WX_SHARED)" == "0" --- 164,168 ---- !endif !if "$(WX_DEBUG)" == "1" ! __WXDEBUG_DEFINE_p_6 = -d__WXDEBUG__ !endif !if "$(WX_SHARED)" == "0" *************** *** 143,150 **** !endif !if "$(WX_SHARED)" == "0" ! ____WX_SHARED_0 = !endif !if "$(WX_SHARED)" == "1" ! ____WX_SHARED_0 = -dWXUSINGDLL !endif !if "$(WX_DEBUG)" == "0" --- 173,180 ---- !endif !if "$(WX_SHARED)" == "0" ! ____WX_SHARED_1 = !endif !if "$(WX_SHARED)" == "1" ! ____WX_SHARED_1 = -dWXUSINGDLL !endif !if "$(WX_DEBUG)" == "0" *************** *** 161,168 **** !endif !if "$(WX_DEBUG)" == "0" ! ____WX_DEBUG_1 = -v- !endif !if "$(WX_DEBUG)" == "1" ! ____WX_DEBUG_1 = -v !endif !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" --- 191,198 ---- !endif !if "$(WX_DEBUG)" == "0" ! ____WX_DEBUG_2 = -v- !endif !if "$(WX_DEBUG)" == "1" ! ____WX_DEBUG_2 = -v !endif !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" *************** *** 183,187 **** ### Targets: ### ! all: $(__app_wxlua___depname) $(__app_wxluaedit___depname) clean: --- 213,217 ---- ### Targets: ### ! all: $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) clean: *************** *** 201,208 **** -if exist ..\..\..\bin\wxluaedit.ilf del ..\..\..\bin\wxluaedit.ilf -if exist ..\..\..\bin\wxluaedit.ils del ..\..\..\bin\wxluaedit.ils !if "$(USE_WXLUAAPP)" == "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) $(____WX_DEBUG_1) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).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,, borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res | --- 231,244 ---- -if exist ..\..\..\bin\wxluaedit.ilf del ..\..\..\bin\wxluaedit.ilf -if exist ..\..\..\bin\wxluaedit.ils del ..\..\..\bin\wxluaedit.ils + -if exist ..\..\..\bin\wxluacan.exe del ..\..\..\bin\wxluacan.exe + -if exist ..\..\..\bin\wxluacan.tds del ..\..\..\bin\wxluacan.tds + -if exist ..\..\..\bin\wxluacan.ilc del ..\..\..\bin\wxluacan.ilc + -if exist ..\..\..\bin\wxluacan.ild del ..\..\..\bin\wxluacan.ild + -if exist ..\..\..\bin\wxluacan.ilf del ..\..\..\bin\wxluacan.ilf + -if exist ..\..\..\bin\wxluacan.ils del ..\..\..\bin\wxluacan.ils !if "$(USE_WXLUAAPP)" == "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) $(____WX_DEBUG_2) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).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,, borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res | *************** *** 211,219 **** !if "$(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) $(____WX_DEBUG_1) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_1) -aa @&&| c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib 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)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).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,, borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res | !endif borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** --- 247,262 ---- !if "$(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) $(____WX_DEBUG_2) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_1) -aa @&&| c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib 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)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).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,, borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res | !endif + !if "$(USE_WXLUACANAPP)" == "1" + ..\..\..\bin\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.res + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_2) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_2) -aa @&&| + c0w32.obj $(APP_WXLUACAN_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).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,, borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.res + | + !endif + borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** *************** *** 223,227 **** borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____WX_SHARED_0) -i..\..\..\modules -i.\..\..\.. $** borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp --- 266,270 ---- borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_6) $(__WXDEBUG_DEFINE_p_6) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____WX_SHARED_1) -i..\..\..\modules -i.\..\..\.. $** borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp *************** *** 232,235 **** borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____WX_SHARED_0) -i..\..\..\modules -i.\..\..\.. $** --- 275,308 ---- borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_6) $(__WXDEBUG_DEFINE_p_6) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____WX_SHARED_1) -i..\..\..\modules -i.\..\..\.. $** ! ! borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp ! $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_class.obj: ..\..\wxluacan\src\wxluacan_class.cpp ! $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! borland$(WXLIBPOSTFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp ! $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_object.obj: ..\..\wxluacan\src\wxluacan_object.cpp ! $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! borland$(WXLIBPOSTFIX)\app_wxluacan_cansim.obj: ..\..\wxluacan\src\cansim.cpp ! $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! borland$(WXLIBPOSTFIX)\app_wxluacan_canlua.obj: ..\..\wxluacan\src\canlua.cpp ! $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_define.obj: ..\..\wxluacan\src\wxluacan_define.cpp ! $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_builtin.obj: ..\..\wxluacan\src\wxluacan_builtin.cpp ! $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_event.obj: ..\..\wxluacan\src\wxluacan_event.cpp ! $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.res: ..\..\wxluacan\src\wxluacan.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_6) $(__WXDEBUG_DEFINE_p_6) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____WX_SHARED_1) -i..\..\..\modules -i.\..\..\.. $** Index: apps.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/apps.dsw,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** apps.dsw 25 Jan 2006 18:35:58 -0000 1.4 --- apps.dsw 3 Feb 2006 18:40:50 -0000 1.5 *************** *** 27,28 **** --- 27,40 ---- ############################################################################### + Project: "app_wxluacan"=apps_app_wxluacan.dsp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + }}} + + ############################################################################### + Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** makefile.wat 3 Feb 2006 16:55:47 -0000 1.20 --- makefile.wat 3 Feb 2006 18:40:50 -0000 1.21 *************** *** 45,48 **** --- 45,51 ---- USE_WXLUAAPP = 1 + # Compile the wxLuaCan app ? [0,1] + USE_WXLUACANAPP = 1 + # Compile the wxLuaEditor app ? [0,1] USE_WXLUAEDITAPP = 0 *************** *** 97,100 **** --- 100,114 ---- __WXLUA_OUTPUT_FOLDER_FILENAMES_1 = lib\wat_dll$(WXLIBPOSTFIX) !endif + __app_wxluacan___depname = + !ifeq USE_WXLUACANAPP 1 + __app_wxluacan___depname = ..\..\..\bin\wxluacan.exe + !endif + __WXLUA_OUTPUT_FOLDER_FILENAMES_2 = + !ifeq WX_SHARED 0 + __WXLUA_OUTPUT_FOLDER_FILENAMES_2 = lib\wat_lib$(WXLIBPOSTFIX) + !endif + !ifeq WX_SHARED 1 + __WXLUA_OUTPUT_FOLDER_FILENAMES_2 = lib\wat_dll$(WXLIBPOSTFIX) + !endif ____WX_DEBUG_1 = !ifeq WX_DEBUG 0 *************** *** 111,120 **** ____WX_DEBUG = -od !endif ! ____WX_DEBUG_0 = !ifeq WX_DEBUG 0 ! ____WX_DEBUG_0 = -d0 !endif !ifeq WX_DEBUG 1 ! ____WX_DEBUG_0 = -d2 !endif ____WX_DEBUG_2 = --- 125,134 ---- ____WX_DEBUG = -od !endif ! ____WX_DEBUG_3 = !ifeq WX_DEBUG 0 ! ____WX_DEBUG_3 = -d0 !endif !ifeq WX_DEBUG 1 ! ____WX_DEBUG_3 = -d2 !endif ____WX_DEBUG_2 = *************** *** 169,173 **** -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & ! $(____WX_DEBUG_0) -i=..\..\..\modules -i=.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj & --- 183,187 ---- -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & ! $(____WX_DEBUG_3) -i=..\..\..\modules -i=.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj & *************** *** 176,184 **** -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & ! $(____WX_DEBUG_0) -i=..\..\..\modules -i=.\..\..\.. -i=$(%WXSTEDIT)\include & -i=$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj & watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.obj --- 190,213 ---- -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & ! $(____WX_DEBUG_3) -i=..\..\..\modules -i=.\..\..\.. -i=$(%WXSTEDIT)\include & -i=$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj & watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.obj + APP_WXLUACAN_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & + -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & + -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & + $(____WX_DEBUG_3) -i=..\..\..\modules -i=.\..\..\.. & + -i=..\..\..\modules\wxbind\setup $(CPPFLAGS) $(CXXFLAGS) + APP_WXLUACAN_OBJECTS = & + watcom$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.obj & + watcom$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_class.obj & + watcom$(WXLIBPOSTFIX)\app_wxluacan_cancom.obj & + watcom$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_object.obj & + watcom$(WXLIBPOSTFIX)\app_wxluacan_cansim.obj & + watcom$(WXLIBPOSTFIX)\app_wxluacan_canlua.obj & + watcom$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_define.obj & + watcom$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_builtin.obj & + watcom$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_event.obj *************** *** 189,193 **** ### Targets: ### ! all : .SYMBOLIC $(__app_wxlua___depname) $(__app_wxluaedit___depname) clean : .SYMBOLIC --- 218,222 ---- ### Targets: ### ! all : .SYMBOLIC $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) clean : .SYMBOLIC *************** *** 199,202 **** --- 228,232 ---- -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe -if exist ..\..\..\bin\wxluaedit.exe del ..\..\..\bin\wxluaedit.exe + -if exist ..\..\..\bin\wxluacan.exe del ..\..\..\bin\wxluacan.exe !ifeq USE_WXLUAAPP 1 *************** *** 226,229 **** --- 256,272 ---- !endif + !ifeq USE_WXLUACANAPP 1 + ..\..\..\bin\wxluacan.exe : $(APP_WXLUACAN_OBJECTS) watcom$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.res + @%create watcom$(WXLIBPOSTFIX)\app_wxluacan.lbc + @%append watcom$(WXLIBPOSTFIX)\app_wxluacan.lbc option quiet + @%append watcom$(WXLIBPOSTFIX)\app_wxluacan.lbc name $^@ + @%append watcom$(WXLIBPOSTFIX)\app_wxluacan.lbc option caseexact + @%append watcom$(WXLIBPOSTFIX)\app_wxluacan.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_2) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_2) system nt_win ref '_WinMain@16' + @for %i in ($(APP_WXLUACAN_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxluacan.lbc file %i + @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).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) do @%append watcom$(WXLIBPOSTFIX)\app_wxluacan.lbc library %i + @%append watcom$(WXLIBPOSTFIX)\app_wxluacan.lbc option resource=watcom$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.res + wlink @watcom$(WXLIBPOSTFIX)\app_wxluacan.lbc + !endif + watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj : .AUTODEPEND ..\..\wxlua\src\wxlua.cpp $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUA_CXXFLAGS) $< *************** *** 244,245 **** --- 287,318 ---- wrc -q -ad -bt=nt -r -fo=$^@ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(____WX_SHARED) -i=..\..\..\modules -i=.\..\..\.. $< + watcom$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.obj : .AUTODEPEND ..\..\wxluacan\src\wxluacan.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_class.obj : .AUTODEPEND ..\..\wxluacan\src\wxluacan_class.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\app_wxluacan_cancom.obj : .AUTODEPEND ..\..\wxluacan\src\cancom.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_object.obj : .AUTODEPEND ..\..\wxluacan\src\wxluacan_object.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\app_wxluacan_cansim.obj : .AUTODEPEND ..\..\wxluacan\src\cansim.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\app_wxluacan_canlua.obj : .AUTODEPEND ..\..\wxluacan\src\canlua.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_define.obj : .AUTODEPEND ..\..\wxluacan\src\wxluacan_define.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_builtin.obj : .AUTODEPEND ..\..\wxluacan\src\wxluacan_builtin.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_event.obj : .AUTODEPEND ..\..\wxluacan\src\wxluacan_event.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.res : .AUTODEPEND ..\..\wxluacan\src\wxluacan.rc + wrc -q -ad -bt=nt -r -fo=$^@ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(____WX_SHARED) -i=..\..\..\modules -i=.\..\..\.. $< + Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** makefile.gcc 3 Feb 2006 16:55:47 -0000 1.21 --- makefile.gcc 3 Feb 2006 18:40:50 -0000 1.22 *************** *** 41,44 **** --- 41,47 ---- USE_WXLUAAPP = 1 + # Compile the wxLuaCan app ? [0,1] + USE_WXLUACANAPP = 1 + # Compile the wxLuaEditor app ? [0,1] USE_WXLUAEDITAPP = 0 *************** *** 72,75 **** --- 75,95 ---- mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.o \ mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit_rc.o + APP_WXLUACAN_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ + $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ + -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include \ + $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) $(____WX_DEBUG_2) \ + -I..\..\..\modules -I.\..\..\.. -I..\..\..\modules\wxbind\setup $(CPPFLAGS) \ + $(CXXFLAGS) + APP_WXLUACAN_OBJECTS = \ + mingw$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.o \ + mingw$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_class.o \ + mingw$(WXLIBPOSTFIX)\app_wxluacan_cancom.o \ + mingw$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_object.o \ + mingw$(WXLIBPOSTFIX)\app_wxluacan_cansim.o \ + mingw$(WXLIBPOSTFIX)\app_wxluacan_canlua.o \ + mingw$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_define.o \ + mingw$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_builtin.o \ + mingw$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_event.o \ + mingw$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_rc.o ### Conditionally set variables: ### *************** *** 96,104 **** __WXLUA_OUTPUT_FOLDER_FILENAMES_1 = lib\gcc_dll$(WXLIBPOSTFIX) endif ifeq ($(WX_UNICODE),1) __WXUNICODE_DEFINE_p = -D_UNICODE endif ifeq ($(WX_UNICODE),1) ! __WXUNICODE_DEFINE_p_0 = --define _UNICODE endif ifeq ($(WX_DEBUG),1) --- 116,133 ---- __WXLUA_OUTPUT_FOLDER_FILENAMES_1 = lib\gcc_dll$(WXLIBPOSTFIX) endif + ifeq ($(USE_WXLUACANAPP),1) + __app_wxluacan___depname = ..\..\..\bin\wxluacan.exe + endif + ifeq ($(WX_SHARED),0) + __WXLUA_OUTPUT_FOLDER_FILENAMES_2 = lib\gcc_lib$(WXLIBPOSTFIX) + endif + ifeq ($(WX_SHARED),1) + __WXLUA_OUTPUT_FOLDER_FILENAMES_2 = lib\gcc_dll$(WXLIBPOSTFIX) + endif ifeq ($(WX_UNICODE),1) __WXUNICODE_DEFINE_p = -D_UNICODE endif ifeq ($(WX_UNICODE),1) ! __WXUNICODE_DEFINE_p_6 = --define _UNICODE endif ifeq ($(WX_DEBUG),1) *************** *** 106,110 **** endif ifeq ($(WX_DEBUG),1) ! __WXDEBUG_DEFINE_p_0 = --define __WXDEBUG__ endif ifeq ($(WX_SHARED),0) --- 135,139 ---- endif ifeq ($(WX_DEBUG),1) ! __WXDEBUG_DEFINE_p_6 = --define __WXDEBUG__ endif ifeq ($(WX_SHARED),0) *************** *** 115,122 **** endif ifeq ($(WX_SHARED),0) ! ____WX_SHARED_0 = endif ifeq ($(WX_SHARED),1) ! ____WX_SHARED_0 = --define WXUSINGDLL endif ifeq ($(WX_DEBUG),0) --- 144,151 ---- endif ifeq ($(WX_SHARED),0) ! ____WX_SHARED_1 = endif ifeq ($(WX_SHARED),1) ! ____WX_SHARED_1 = --define WXUSINGDLL endif ifeq ($(WX_DEBUG),0) *************** *** 167,171 **** ### Targets: ### ! all: $(__app_wxlua___depname) $(__app_wxluaedit___depname) clean: --- 196,200 ---- ### Targets: ### ! all: $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) clean: *************** *** 174,177 **** --- 203,207 ---- -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe -if exist ..\..\..\bin\wxluaedit.exe del ..\..\..\bin\wxluaedit.exe + -if exist ..\..\..\bin\wxluacan.exe del ..\..\..\bin\wxluacan.exe ifeq ($(USE_WXLUAAPP),1) *************** *** 185,188 **** --- 215,223 ---- endif + ifeq ($(USE_WXLUACANAPP),1) + ..\..\..\bin\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) mingw$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_rc.o + $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____WX_DEBUG_2) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_2) -Wl,--subsystem,windows -mwindows -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 + endif + mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua.o: ../../wxlua/src/wxlua.cpp $(CXX) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(CPPDEPS) $< *************** *** 192,196 **** mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o: ../../wxlua/src/wxlua.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(____WX_SHARED_0) --include-dir ../../../modules --include-dir ./../../.. mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.o: ../../wxluaedit/src/wxledit.cpp --- 227,231 ---- mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o: ../../wxlua/src/wxlua.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_6) $(__WXDEBUG_DEFINE_p_6) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(____WX_SHARED_1) --include-dir ../../../modules --include-dir ./../../.. mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.o: ../../wxluaedit/src/wxledit.cpp *************** *** 201,205 **** mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit_rc.o: ../../wxluaedit/src/wxluaedit.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(____WX_SHARED_0) --include-dir ../../../modules --include-dir ./../../.. .PHONY: all clean --- 236,270 ---- mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit_rc.o: ../../wxluaedit/src/wxluaedit.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_6) $(__WXDEBUG_DEFINE_p_6) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(____WX_SHARED_1) --include-dir ../../../modules --include-dir ./../../.. ! ! mingw$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.o: ../../wxluacan/src/wxluacan.cpp ! $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! ! mingw$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_class.o: ../../wxluacan/src/wxluacan_class.cpp ! $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! ! mingw$(WXLIBPOSTFIX)\app_wxluacan_cancom.o: ../../wxluacan/src/cancom.cpp ! $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! ! mingw$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_object.o: ../../wxluacan/src/wxluacan_object.cpp ! $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! ! mingw$(WXLIBPOSTFIX)\app_wxluacan_cansim.o: ../../wxluacan/src/cansim.cpp ! $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! ! mingw$(WXLIBPOSTFIX)\app_wxluacan_canlua.o: ../../wxluacan/src/canlua.cpp ! $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! ! mingw$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_define.o: ../../wxluacan/src/wxluacan_define.cpp ! $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! ! mingw$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_builtin.o: ../../wxluacan/src/wxluacan_builtin.cpp ! $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! ! mingw$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_event.o: ../../wxluacan/src/wxluacan_event.cpp ! $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! ! mingw$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_rc.o: ../../wxluacan/src/wxluacan.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_6) $(__WXDEBUG_DEFINE_p_6) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(____WX_SHARED_1) --include-dir ../../../modules --include-dir ./../../.. .PHONY: all clean |
