Menu
▾
▴
[Wxlua-commit] wxLua/apps/build/msw makefile.bcc, 1.67, 1.68 makefile.gcc, 1.67, 1.68 makefile.vc, 1.67, 1.68 makefile.wat, 1.68, 1.69
|
From: John L. <jr...@us...> - 2007-05-24 01:00:20
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21191/wxLua/apps/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Removed dservice.h/cpp splttree.h/cpp, moved staktree.h/cpp to wxlstack.h/cpp Rebaked with the changes Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** makefile.vc 6 May 2007 10:52:51 -0000 1.67 --- makefile.vc 24 May 2007 00:59:43 -0000 1.68 *************** *** 123,128 **** $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ - vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res APP_WXLUAEDIT_CXXFLAGS = /M$(__RUNTIME_LIBS_54)$(____app_21) /DWIN32 \ --- 123,128 ---- $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj \ + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res APP_WXLUAEDIT_CXXFLAGS = /M$(__RUNTIME_LIBS_54)$(____app_21) /DWIN32 \ *************** *** 144,152 **** /I..\..\..\modules\wxbind\setup /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ - vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj \ - vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj \ - vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res APP_WXLUAFREEZE_CXXFLAGS = /M$(__RUNTIME_LIBS_82)$(____app_21) /DWIN32 \ --- 144,152 ---- /I..\..\..\modules\wxbind\setup /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj \ + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj \ + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj \ + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res APP_WXLUAFREEZE_CXXFLAGS = /M$(__RUNTIME_LIBS_82)$(____app_21) /DWIN32 \ *************** *** 541,548 **** $(CC) /c /nologo /TC /Fo$@ $(APP_LUAC_CFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUA_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj: ..\..\wxlua\src\lconsole.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUA_CXXFLAGS) $** --- 541,548 ---- $(CC) /c /nologo /TC /Fo$@ $(APP_LUAC_CFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj: ..\..\wxlua\src\lconsole.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUA_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUA_CXXFLAGS) $** *************** *** 559,569 **** rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS /i $(WXSTEDIT_DIR)\include /i $(WX_DIR)\contrib\include $** - vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp - $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** - vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj: ..\..\wxluacan\src\wxluacan_bind.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** --- 559,566 ---- rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS /i $(WXSTEDIT_DIR)\include /i $(WX_DIR)\contrib\include $** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj: ..\..\wxluacan\src\canlua.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** *************** *** 571,575 **** $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj: ..\..\wxluacan\src\canlua.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** --- 568,575 ---- $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj: ..\..\wxluacan\src\wxluacan_bind.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** makefile.bcc 6 May 2007 10:52:50 -0000 1.67 --- makefile.bcc 24 May 2007 00:59:43 -0000 1.68 *************** *** 169,174 **** -I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj APP_WXLUAEDIT_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ --- 169,174 ---- -I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj APP_WXLUAEDIT_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ *************** *** 187,195 **** $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ - bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj APP_WXLUAFREEZE_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ --- 187,195 ---- $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj APP_WXLUAFREEZE_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ *************** *** 557,564 **** $(CC) -q -c -P- -o$@ $(APP_LUAC_CFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj: ..\..\wxlua\src\lconsole.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** --- 557,564 ---- $(CC) -q -c -P- -o$@ $(APP_LUAC_CFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj: ..\..\wxlua\src\lconsole.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** *************** *** 575,585 **** brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_DIR)\include -i$(WXSTEDIT_DIR)\include -i$(WX_DIR)\contrib\include $** - bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp - $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** - bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj: ..\..\wxluacan\src\wxluacan_bind.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** --- 575,582 ---- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_DIR)\include -i$(WXSTEDIT_DIR)\include -i$(WX_DIR)\contrib\include $** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj: ..\..\wxluacan\src\canlua.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** *************** *** 587,591 **** $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj: ..\..\wxluacan\src\canlua.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** --- 584,591 ---- $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp ! $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj: ..\..\wxluacan\src\wxluacan_bind.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** makefile.wat 6 May 2007 10:52:51 -0000 1.68 --- makefile.wat 24 May 2007 00:59:43 -0000 1.69 *************** *** 531,536 **** $(CXXFLAGS) APP_WXLUA_OBJECTS = & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj APP_WXLUAEDIT_CXXFLAGS = $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) & $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & --- 531,536 ---- $(CXXFLAGS) APP_WXLUA_OBJECTS = & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj APP_WXLUAEDIT_CXXFLAGS = $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) & $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & *************** *** 550,558 **** -i=..\..\..\modules\wxbind\setup $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = & - watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj APP_WXLUAFREEZE_CXXFLAGS = $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) & $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & --- 550,558 ---- -i=..\..\..\modules\wxbind\setup $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj APP_WXLUAFREEZE_CXXFLAGS = $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) & $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & *************** *** 713,720 **** $(CC) -bt=nt -zq -fo=$^@ $(APP_LUAC_CFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj : .AUTODEPEND ..\..\wxlua\src\wxlua.cpp $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUA_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj : .AUTODEPEND ..\..\wxlua\src\lconsole.cpp $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUA_CXXFLAGS) $< --- 713,720 ---- $(CC) -bt=nt -zq -fo=$^@ $(APP_LUAC_CFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj : .AUTODEPEND ..\..\wxlua\src\lconsole.cpp $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUA_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj : .AUTODEPEND ..\..\wxlua\src\wxlua.cpp $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUA_CXXFLAGS) $< *************** *** 731,741 **** wrc -q -ad -bt=nt -r -fo=$^@ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_DIR)\include -i=$(WXSTEDIT_DIR)\include -i=$(WX_DIR)\contrib\include $< - watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj : .AUTODEPEND ..\..\wxluacan\src\wxluacan.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< - watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj : .AUTODEPEND ..\..\wxluacan\src\cancom.cpp $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj : .AUTODEPEND ..\..\wxluacan\src\wxluacan_bind.cpp $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< --- 731,738 ---- wrc -q -ad -bt=nt -r -fo=$^@ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_DIR)\include -i=$(WXSTEDIT_DIR)\include -i=$(WX_DIR)\contrib\include $< watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj : .AUTODEPEND ..\..\wxluacan\src\cancom.cpp $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj : .AUTODEPEND ..\..\wxluacan\src\canlua.cpp $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< *************** *** 743,747 **** $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj : .AUTODEPEND ..\..\wxluacan\src\canlua.cpp $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< --- 740,747 ---- $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj : .AUTODEPEND ..\..\wxluacan\src\wxluacan.cpp ! $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< ! ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj : .AUTODEPEND ..\..\wxluacan\src\wxluacan_bind.cpp $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** makefile.gcc 6 May 2007 10:52:51 -0000 1.67 --- makefile.gcc 24 May 2007 00:59:43 -0000 1.68 *************** *** 109,114 **** -I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ - gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua_rc.o APP_WXLUAEDIT_CXXFLAGS = -DHAVE_W32API_H $(____WX_SHARED) \ --- 109,114 ---- -I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.o \ + gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua_rc.o APP_WXLUAEDIT_CXXFLAGS = -DHAVE_W32API_H $(____WX_SHARED) \ *************** *** 129,137 **** $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ - gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.o \ - gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.o \ - gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim_rc.o APP_WXLUAFREEZE_CXXFLAGS = -DHAVE_W32API_H $(____WX_SHARED) \ --- 129,137 ---- $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.o \ + gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.o \ + gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.o \ + gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim_rc.o APP_WXLUAFREEZE_CXXFLAGS = -DHAVE_W32API_H $(____WX_SHARED) \ *************** *** 602,609 **** $(CC) -c -o $@ $(APP_LUAC_CFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.o: ../../wxlua/src/wxlua.cpp $(CXX) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.o: ../../wxlua/src/lconsole.cpp $(CXX) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(CPPDEPS) $< --- 602,609 ---- $(CC) -c -o $@ $(APP_LUAC_CFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.o: ../../wxlua/src/lconsole.cpp $(CXX) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.o: ../../wxlua/src/wxlua.cpp $(CXX) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(CPPDEPS) $< *************** *** 620,630 **** windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(____WX_SHARED_2) $(__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 --include-dir ./../../.. --include-dir $(LUA_DIR)/include --include-dir $(WXSTEDIT_DIR)/include --include-dir $(WX_DIR)/contrib/include - gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.o: ../../wxluacan/src/wxluacan.cpp - $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< - gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.o: ../../wxluacan/src/cancom.cpp $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.o: ../../wxluacan/src/wxluacan_bind.cpp $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< --- 620,627 ---- windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(____WX_SHARED_2) $(__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 --include-dir ./../../.. --include-dir $(LUA_DIR)/include --include-dir $(WXSTEDIT_DIR)/include --include-dir $(WX_DIR)/contrib/include gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.o: ../../wxluacan/src/cancom.cpp $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.o: ../../wxluacan/src/canlua.cpp $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< *************** *** 632,636 **** $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.o: ../../wxluacan/src/canlua.cpp $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< --- 629,636 ---- $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.o: ../../wxluacan/src/wxluacan.cpp ! $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.o: ../../wxluacan/src/wxluacan_bind.cpp $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< |
