Menu
▾
▴
[Wxlua-commit] wxLua/apps/build/msw makefile.bcc,1.8,1.9 makefile.gcc,1.8,1.9 makefile.vc,1.6,1.7 makefile.wat,1.8,1.9
|
From: John L. <jr...@us...> - 2005-11-24 21:34:31
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29076/wxLua/apps/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: formatting for bakfiles added USE_WXLUAAPP, USE_WXLUAEDITAPP Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** makefile.vc 23 Nov 2005 20:33:14 -0000 1.6 --- makefile.vc 24 Nov 2005 21:34:16 -0000 1.7 *************** *** 38,41 **** --- 38,47 ---- WX_VERSION = 26 + # Compile the wxLua app ? [0,1] + USE_WXLUAAPP = 1 + + # Compile the wxLuaEditor app ? [0,1] + USE_WXLUAEDITAPP = 0 + *************** *** 46,54 **** ### Variables: ### ! APP_WXLUA_CXXFLAGS = /MD$(__DEBUGRUNTIME_7) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS_2) $(__OPTIMIZEFLAG_3) \ ! $(__DEBUGINFO_4) /Fd..\..\..\bin\wxlua.pdb $(____DEBUGRUNTIME_6_p) \ $(__WX_SHAREDDEFINE_p) /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ --- 52,60 ---- ### Variables: ### ! APP_WXLUA_CXXFLAGS = /MD$(__DEBUGRUNTIME) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \ ! $(__DEBUGINFO) /Fd..\..\..\bin\wxlua.pdb $(____DEBUGRUNTIME) \ $(__WX_SHAREDDEFINE_p) /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ *************** *** 56,59 **** --- 62,75 ---- msvc$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj \ msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res + APP_WXLUAEDIT_CXXFLAGS = /MD$(__DEBUGRUNTIME) /DWIN32 $(__WXUNICODE_DEFINE_p) \ + $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ + /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ + /I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \ + $(__DEBUGINFO) /Fd..\..\..\bin\wxluaedit.pdb $(____DEBUGRUNTIME) \ + $(__WX_SHAREDDEFINE_p) /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) + APP_WXLUAEDIT_OBJECTS = \ + msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj \ + msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.obj \ + msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res ### Conditionally set variables: ### *************** *** 62,70 **** WX3RDPARTYLIBPOSTFIX = d !endif !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p = /D_UNICODE !endif !if "$(WX_UNICODE)" == "1" ! __WXUNICODE_DEFINE_p_1 = /d _UNICODE !endif !if "$(WX_DEBUG)" == "1" --- 78,92 ---- WX3RDPARTYLIBPOSTFIX = d !endif + !if "$(USE_WXLUAAPP)" == "1" + __app_wxlua___depname = ..\..\..\bin\wxlua.exe + !endif + !if "$(USE_WXLUAEDITAPP)" == "1" + __app_wxluaedit___depname = ..\..\..\bin\wxluaedit.exe + !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" *************** *** 72,118 **** !endif !if "$(WX_DEBUG)" == "1" ! __WXDEBUG_DEFINE_p_1 = /d __WXDEBUG__ !endif !if "$(WX_DEBUG)" == "0" ! __WARNINGS_2 = /w !endif !if "$(WX_DEBUG)" == "1" ! __WARNINGS_2 = /W4 !endif !if "$(WX_DEBUG)" == "0" ! __OPTIMIZEFLAG_3 = /O2 !endif !if "$(WX_DEBUG)" == "1" ! __OPTIMIZEFLAG_3 = /Od !endif !if "$(WX_DEBUG)" == "0" ! __DEBUGINFO_4 = !endif !if "$(WX_DEBUG)" == "1" ! __DEBUGINFO_4 = /Zi !endif !if "$(WX_DEBUG)" == "0" ! __DEBUGINFO_5 = !endif !if "$(WX_DEBUG)" == "1" ! __DEBUGINFO_5 = /DEBUG !endif !if "$(WX_DEBUG)" == "0" ! ____DEBUGRUNTIME_6_p = !endif !if "$(WX_DEBUG)" == "1" ! ____DEBUGRUNTIME_6_p = /D_DEBUG !endif !if "$(WX_DEBUG)" == "0" ! ____DEBUGRUNTIME_6_p_1 = !endif !if "$(WX_DEBUG)" == "1" ! ____DEBUGRUNTIME_6_p_1 = /d _DEBUG !endif !if "$(WX_DEBUG)" == "0" ! __DEBUGRUNTIME_7 = !endif !if "$(WX_DEBUG)" == "1" ! __DEBUGRUNTIME_7 = d !endif !if "$(WX_SHARED)" == "1" --- 94,140 ---- !endif !if "$(WX_DEBUG)" == "1" ! __WXDEBUG_DEFINE_p_0 = /d __WXDEBUG__ !endif !if "$(WX_DEBUG)" == "0" ! __WARNINGS = /w !endif !if "$(WX_DEBUG)" == "1" ! __WARNINGS = /W4 !endif !if "$(WX_DEBUG)" == "0" ! __OPTIMIZEFLAG = /O2 !endif !if "$(WX_DEBUG)" == "1" ! __OPTIMIZEFLAG = /Od !endif !if "$(WX_DEBUG)" == "0" ! __DEBUGINFO = !endif !if "$(WX_DEBUG)" == "1" ! __DEBUGINFO = /Zi !endif !if "$(WX_DEBUG)" == "0" ! __DEBUGINFO_0 = !endif !if "$(WX_DEBUG)" == "1" ! __DEBUGINFO_0 = /DEBUG !endif !if "$(WX_DEBUG)" == "0" ! ____DEBUGRUNTIME = !endif !if "$(WX_DEBUG)" == "1" ! ____DEBUGRUNTIME = /D_DEBUG !endif !if "$(WX_DEBUG)" == "0" ! ____DEBUGRUNTIME_0 = !endif !if "$(WX_DEBUG)" == "1" ! ____DEBUGRUNTIME_0 = /d _DEBUG !endif !if "$(WX_DEBUG)" == "0" ! __DEBUGRUNTIME = !endif !if "$(WX_DEBUG)" == "1" ! __DEBUGRUNTIME = d !endif !if "$(WX_SHARED)" == "1" *************** *** 120,124 **** !endif !if "$(WX_SHARED)" == "1" ! __WX_SHAREDDEFINE_p_1 = /d WXUSINGDLL !endif !if "$(WX_SHARED)" == "0" --- 142,146 ---- !endif !if "$(WX_SHARED)" == "1" ! __WX_SHAREDDEFINE_p_0 = /d WXUSINGDLL !endif !if "$(WX_SHARED)" == "0" *************** *** 151,155 **** ### Targets: ### ! all: ..\..\..\bin\wxlua.exe clean: --- 173,177 ---- ### Targets: ### ! all: $(__app_wxlua___depname) $(__app_wxluaedit___depname) clean: *************** *** 160,168 **** -if exist ..\..\..\bin\wxlua.ilk del ..\..\..\bin\wxlua.ilk -if exist ..\..\..\bin\wxlua.pdb del ..\..\..\bin\wxlua.pdb ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_5) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< $(APP_WXLUA_OBJECTS) wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp --- 182,202 ---- -if exist ..\..\..\bin\wxlua.ilk del ..\..\..\bin\wxlua.ilk -if exist ..\..\..\bin\wxlua.pdb del ..\..\..\bin\wxlua.pdb + -if exist ..\..\..\bin\wxluaedit.exe del ..\..\..\bin\wxluaedit.exe + -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) $(__DEBUGINFO_0) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< $(APP_WXLUA_OBJECTS) wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << + !endif + + !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) $(__DEBUGINFO_0) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< + $(APP_WXLUAEDIT_OBJECTS) wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib + << + !endif msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp *************** *** 173,176 **** 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 /i ..\..\..\modules $(____DEBUGRUNTIME_6_p_1) $(__WX_SHAREDDEFINE_p_1) $** --- 207,219 ---- 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 /i ..\..\..\modules $(____DEBUGRUNTIME_0) $(__WX_SHAREDDEFINE_p_0) $** ! ! msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUAEDIT_CXXFLAGS) $** ! ! msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.obj: ..\..\wxluaedit\src\wxluaedit.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUAEDIT_CXXFLAGS) $** ! ! msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxlua\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 /i ..\..\..\modules $(____DEBUGRUNTIME_0) $(__WX_SHAREDDEFINE_p_0) $** Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** makefile.bcc 23 Nov 2005 20:33:14 -0000 1.8 --- makefile.bcc 24 Nov 2005 21:34:16 -0000 1.9 *************** *** 65,68 **** --- 65,78 ---- !endif + # Compile the wxLua app ? [0,1] + !ifndef USE_WXLUAAPP + USE_WXLUAAPP = 1 + !endif + + # Compile the wxLuaEditor app ? [0,1] + !ifndef USE_WXLUAEDITAPP + USE_WXLUAEDITAPP = 0 + !endif + *************** *** 76,84 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG_1) $(__DEBUGINFO) \ ! -tWM $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj \ borland$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj ### Conditionally set variables: ### --- 86,102 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG) $(__DEBUGINFO) -tWM \ ! $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj \ borland$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj + APP_WXLUAEDIT_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ + $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ + -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ + -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG) $(__DEBUGINFO) -tWM \ + $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) + APP_WXLUAEDIT_OBJECTS = \ + borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj \ + borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.obj ### Conditionally set variables: ### *************** *** 87,95 **** WX3RDPARTYLIBPOSTFIX = d !endif !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p = -D_UNICODE !endif !if "$(WX_UNICODE)" == "1" ! __WXUNICODE_DEFINE_p_1 = -d_UNICODE !endif !if "$(WX_DEBUG)" == "1" --- 105,119 ---- WX3RDPARTYLIBPOSTFIX = d !endif + !if "$(USE_WXLUAAPP)" == "1" + __app_wxlua___depname = ..\..\..\bin\wxlua.exe + !endif + !if "$(USE_WXLUAEDITAPP)" == "1" + __app_wxluaedit___depname = ..\..\..\bin\wxluaedit.exe + !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" *************** *** 97,107 **** !endif !if "$(WX_DEBUG)" == "1" ! __WXDEBUG_DEFINE_p_1 = -d__WXDEBUG__ !endif !if "$(WX_DEBUG)" == "0" ! __OPTIMIZEFLAG_1 = -O2 !endif !if "$(WX_DEBUG)" == "1" ! __OPTIMIZEFLAG_1 = -Od !endif !if "$(WX_SHARED)" == "1" --- 121,131 ---- !endif !if "$(WX_DEBUG)" == "1" ! __WXDEBUG_DEFINE_p_0 = -d__WXDEBUG__ !endif !if "$(WX_DEBUG)" == "0" ! __OPTIMIZEFLAG = -O2 !endif !if "$(WX_DEBUG)" == "1" ! __OPTIMIZEFLAG = -Od !endif !if "$(WX_SHARED)" == "1" *************** *** 109,113 **** !endif !if "$(WX_SHARED)" == "1" ! __WX_SHAREDDEFINE_p_1 = -dWXUSINGDLL !endif !if "$(WX_SHARED)" == "0" --- 133,137 ---- !endif !if "$(WX_SHARED)" == "1" ! __WX_SHAREDDEFINE_p_0 = -dWXUSINGDLL !endif !if "$(WX_SHARED)" == "0" *************** *** 146,150 **** ### Targets: ### ! all: ..\..\..\bin\wxlua.exe clean: --- 170,174 ---- ### Targets: ### ! all: $(__app_wxlua___depname) $(__app_wxluaedit___depname) clean: *************** *** 158,166 **** --- 182,205 ---- -if exist ..\..\..\bin\wxlua.ilf del ..\..\..\bin\wxlua.ilf -if exist ..\..\..\bin\wxlua.ils del ..\..\..\bin\wxlua.ils + -if exist ..\..\..\bin\wxluaedit.exe del ..\..\..\bin\wxluaedit.exe + -if exist ..\..\..\bin\wxluaedit.tds del ..\..\..\bin\wxluaedit.tds + -if exist ..\..\..\bin\wxluaedit.ilc del ..\..\..\bin\wxluaedit.ilc + -if exist ..\..\..\bin\wxluaedit.ild del ..\..\..\bin\wxluaedit.ild + -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) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| c0x32.obj $(APP_WXLUA_OBJECTS),$@,, wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res | + !endif + + !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) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| + c0x32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res + | + !endif borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp *************** *** 171,174 **** 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 -i..\..\..\modules $(__WX_SHAREDDEFINE_p_1) $** --- 210,222 ---- 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 -i..\..\..\modules $(__WX_SHAREDDEFINE_p_0) $** ! ! borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp ! $(CXX) -q -c -P -o$@ $(APP_WXLUAEDIT_CXXFLAGS) $** ! ! borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.obj: ..\..\wxluaedit\src\wxluaedit.cpp ! $(CXX) -q -c -P -o$@ $(APP_WXLUAEDIT_CXXFLAGS) $** ! ! borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxlua\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 -i..\..\..\modules $(__WX_SHAREDDEFINE_p_0) $** Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** makefile.wat 23 Nov 2005 20:33:14 -0000 1.8 --- makefile.wat 24 Nov 2005 21:34:16 -0000 1.9 *************** *** 38,41 **** --- 38,47 ---- WX_VERSION = 26 + # Compile the wxLua app ? [0,1] + USE_WXLUAAPP = 1 + + # Compile the wxLuaEditor app ? [0,1] + USE_WXLUAEDITAPP = 0 + *************** *** 65,95 **** WX3RDPARTYLIBPOSTFIX = d !endif ! __WARNINGS_0 = !ifeq WX_DEBUG 0 ! __WARNINGS_0 = !endif !ifeq WX_DEBUG 1 ! __WARNINGS_0 = -wx !endif ! __OPTIMIZEFLAG_1 = !ifeq WX_DEBUG 0 ! __OPTIMIZEFLAG_1 = -ot -ox !endif !ifeq WX_DEBUG 1 ! __OPTIMIZEFLAG_1 = -od !endif ! __DEBUGINFO_2 = !ifeq WX_DEBUG 0 ! __DEBUGINFO_2 = -d0 !endif !ifeq WX_DEBUG 1 ! __DEBUGINFO_2 = -d2 !endif ! __DEBUGINFO_3 = !ifeq WX_DEBUG 0 ! __DEBUGINFO_3 = !endif !ifeq WX_DEBUG 1 ! __DEBUGINFO_3 = debug all !endif __WXLUA_OUTPUT_FOLDER_FILENAMES = --- 71,109 ---- WX3RDPARTYLIBPOSTFIX = d !endif ! __app_wxlua___depname = ! !ifeq USE_WXLUAAPP 1 ! __app_wxlua___depname = ..\..\..\bin\wxlua.exe ! !endif ! __app_wxluaedit___depname = ! !ifeq USE_WXLUAEDITAPP 1 ! __app_wxluaedit___depname = ..\..\..\bin\wxluaedit.exe ! !endif ! __WARNINGS = !ifeq WX_DEBUG 0 ! __WARNINGS = !endif !ifeq WX_DEBUG 1 ! __WARNINGS = -wx !endif ! __OPTIMIZEFLAG = !ifeq WX_DEBUG 0 ! __OPTIMIZEFLAG = -ot -ox !endif !ifeq WX_DEBUG 1 ! __OPTIMIZEFLAG = -od !endif ! __DEBUGINFO = !ifeq WX_DEBUG 0 ! __DEBUGINFO = -d0 !endif !ifeq WX_DEBUG 1 ! __DEBUGINFO = -d2 !endif ! __DEBUGINFO_0 = !ifeq WX_DEBUG 0 ! __DEBUGINFO_0 = !endif !ifeq WX_DEBUG 1 ! __DEBUGINFO_0 = debug all !endif __WXLUA_OUTPUT_FOLDER_FILENAMES = *************** *** 140,149 **** APP_WXLUA_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include -i=..\..\..\modules $(__WARNINGS_0) & ! $(__OPTIMIZEFLAG_1) $(__DEBUGINFO_2) -bm $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) & ! $(CXXFLAGS) APP_WXLUA_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj & watcom$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj --- 154,169 ---- APP_WXLUA_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include -i=..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) & ! $(__DEBUGINFO) -bm $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj & watcom$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj + APP_WXLUAEDIT_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & + -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & + -i=$(WX_DIR)\include -i=..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) & + $(__DEBUGINFO) -bm $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) + APP_WXLUAEDIT_OBJECTS = & + watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj & + watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.obj *************** *** 154,158 **** ### Targets: ### ! all : .SYMBOLIC ..\..\..\bin\wxlua.exe clean : .SYMBOLIC --- 174,178 ---- ### Targets: ### ! all : .SYMBOLIC $(__app_wxlua___depname) $(__app_wxluaedit___depname) clean : .SYMBOLIC *************** *** 163,167 **** --- 183,189 ---- -if exist watcom$(WXLIBPOSTFIX)\*.pch del watcom$(WXLIBPOSTFIX)\*.pch -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe + -if exist ..\..\..\bin\wxluaedit.exe del ..\..\..\bin\wxluaedit.exe + !ifeq USE_WXLUAAPP 1 ..\..\..\bin\wxlua.exe : $(APP_WXLUA_OBJECTS) watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.res @%create watcom$(WXLIBPOSTFIX)\app_wxlua.lbc *************** *** 169,177 **** @%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) $(__DEBUGINFO_3) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc file %i @for %i in ( wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc library %i @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc option resource=watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.res wlink @watcom$(WXLIBPOSTFIX)\app_wxlua.lbc watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj : .AUTODEPEND ..\..\wxlua\src\wxlua.cpp --- 191,213 ---- @%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) $(__DEBUGINFO_0) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc file %i @for %i in ( wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc library %i @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc option resource=watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.res wlink @watcom$(WXLIBPOSTFIX)\app_wxlua.lbc + !endif + + !ifeq USE_WXLUAEDITAPP 1 + ..\..\..\bin\wxluaedit.exe : $(APP_WXLUAEDIT_OBJECTS) watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res + @%create watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc + @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc option quiet + @%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) $(__DEBUGINFO_0) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) + @for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc file %i + @for %i in ( wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc library %i + @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc option resource=watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res + wlink @watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc + !endif watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj : .AUTODEPEND ..\..\wxlua\src\wxlua.cpp *************** *** 184,185 **** --- 220,230 ---- 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 -i=..\..\..\modules $(__WX_SHAREDDEFINE_p) $< + watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj : .AUTODEPEND ..\..\wxluaedit\src\wxledit.cpp + $(CXX) -zq -fo=$^@ $(APP_WXLUAEDIT_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.obj : .AUTODEPEND ..\..\wxluaedit\src\wxluaedit.cpp + $(CXX) -zq -fo=$^@ $(APP_WXLUAEDIT_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res : .AUTODEPEND ..\..\wxlua\src\wxluaedit.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 -i=..\..\..\modules $(__WX_SHAREDDEFINE_p) $< + Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** makefile.gcc 23 Nov 2005 20:33:14 -0000 1.8 --- makefile.gcc 24 Nov 2005 21:34:16 -0000 1.9 *************** *** 38,41 **** --- 38,47 ---- WX_VERSION = 26 + # Compile the wxLua app ? [0,1] + USE_WXLUAAPP = 1 + + # Compile the wxLuaEditor app ? [0,1] + USE_WXLUAEDITAPP = 0 + *************** *** 50,59 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include \ ! -I..\..\..\modules $(__WARNINGS_0) $(__OPTIMIZEFLAG_1) $(__DEBUGINFO) \ ! -mthreads $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua.o \ mingw$(WXLIBPOSTFIX)\app_wxlua_lconsole.o \ mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o ### Conditionally set variables: ### --- 56,74 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include \ ! -I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) $(__DEBUGINFO) -mthreads \ ! $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua.o \ mingw$(WXLIBPOSTFIX)\app_wxlua_lconsole.o \ mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o + APP_WXLUAEDIT_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ + $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ + -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include \ + -I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) $(__DEBUGINFO) -mthreads \ + $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) + APP_WXLUAEDIT_OBJECTS = \ + mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.o \ + mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.o \ + mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit_rc.o ### Conditionally set variables: ### *************** *** 62,70 **** WX3RDPARTYLIBPOSTFIX = d endif ifeq ($(WX_UNICODE),1) __WXUNICODE_DEFINE_p = -D_UNICODE endif ifeq ($(WX_UNICODE),1) ! __WXUNICODE_DEFINE_p_1 = --define _UNICODE endif ifeq ($(WX_DEBUG),1) --- 77,91 ---- WX3RDPARTYLIBPOSTFIX = d endif + ifeq ($(USE_WXLUAAPP),1) + __app_wxlua___depname = ..\..\..\bin\wxlua.exe + endif + ifeq ($(USE_WXLUAEDITAPP),1) + __app_wxluaedit___depname = ..\..\..\bin\wxluaedit.exe + 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) *************** *** 72,88 **** endif ifeq ($(WX_DEBUG),1) ! __WXDEBUG_DEFINE_p_1 = --define __WXDEBUG__ endif ifeq ($(WX_DEBUG),0) ! __WARNINGS_0 = endif ifeq ($(WX_DEBUG),1) ! __WARNINGS_0 = -W -Wall endif ifeq ($(WX_DEBUG),0) ! __OPTIMIZEFLAG_1 = -O2 endif ifeq ($(WX_DEBUG),1) ! __OPTIMIZEFLAG_1 = -O0 endif ifeq ($(WX_SHARED),1) --- 93,124 ---- endif ifeq ($(WX_DEBUG),1) ! __WXDEBUG_DEFINE_p_0 = --define __WXDEBUG__ endif ifeq ($(WX_DEBUG),0) ! ifeq ($(WX_UNICODE),1) ! WXLIBPOSTFIX = u ! endif endif ifeq ($(WX_DEBUG),1) ! ifeq ($(WX_UNICODE),0) ! WXLIBPOSTFIX = d ! endif ! endif ! ifeq ($(WX_DEBUG),1) ! ifeq ($(WX_UNICODE),1) ! WXLIBPOSTFIX = ud ! endif endif ifeq ($(WX_DEBUG),0) ! __WARNINGS = endif ifeq ($(WX_DEBUG),1) ! __WARNINGS = -W -Wall ! endif ! ifeq ($(WX_DEBUG),0) ! __OPTIMIZEFLAG = -O2 ! endif ! ifeq ($(WX_DEBUG),1) ! __OPTIMIZEFLAG = -O0 endif ifeq ($(WX_SHARED),1) *************** *** 90,94 **** endif ifeq ($(WX_SHARED),1) ! __WX_SHAREDDEFINE_p_1 = --define WXUSINGDLL endif ifeq ($(WX_SHARED),0) --- 126,130 ---- endif ifeq ($(WX_SHARED),1) ! __WX_SHAREDDEFINE_p_0 = --define WXUSINGDLL endif ifeq ($(WX_SHARED),0) *************** *** 98,116 **** __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\gcc_dll endif - ifeq ($(WX_DEBUG),0) - ifeq ($(WX_UNICODE),1) - WXLIBPOSTFIX = u - endif - endif - ifeq ($(WX_DEBUG),1) - ifeq ($(WX_UNICODE),0) - WXLIBPOSTFIX = d - endif - endif - ifeq ($(WX_DEBUG),1) - ifeq ($(WX_UNICODE),1) - WXLIBPOSTFIX = ud - endif - endif ifeq ($(WX_SHARED),0) WXLIBPATH = \lib\gcc_lib --- 134,137 ---- *************** *** 133,137 **** ### Targets: ### ! all: ..\..\..\bin\wxlua.exe clean: --- 154,158 ---- ### Targets: ### ! all: $(__app_wxlua___depname) $(__app_wxluaedit___depname) clean: *************** *** 139,145 **** --- 160,174 ---- -if exist mingw$(WXLIBPOSTFIX)\*.d del mingw$(WXLIBPOSTFIX)\*.d -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe + -if exist ..\..\..\bin\wxluaedit.exe del ..\..\..\bin\wxluaedit.exe + ifeq ($(USE_WXLUAAPP),1) ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc -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 + + ifeq ($(USE_WXLUAEDITAPP),1) + ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit_rc.o + $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc -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 *************** *** 150,154 **** mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o: ../../wxlua/src/wxlua.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ..\..\..\modules $(__WX_SHAREDDEFINE_p_1) .PHONY: all clean --- 179,192 ---- 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 --include-dir ..\..\..\modules $(__WX_SHAREDDEFINE_p_0) ! ! mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.o: ../../wxluaedit/src/wxledit.cpp ! $(CXX) -c -o $@ $(APP_WXLUAEDIT_CXXFLAGS) $(CPPDEPS) $< ! ! mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.o: ../../wxluaedit/src/wxluaedit.cpp ! $(CXX) -c -o $@ $(APP_WXLUAEDIT_CXXFLAGS) $(CPPDEPS) $< ! ! mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit_rc.o: ../../wxlua/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 --include-dir ..\..\..\modules $(__WX_SHAREDDEFINE_p_0) .PHONY: all clean |
