Menu
▾
▴
[Wxlua-commit] wxLua/apps/build/msw makefile.bcc, 1.66, 1.67 makefile.gcc, 1.66, 1.67 makefile.vc, 1.66, 1.67 makefile.wat, 1.67, 1.68
|
From: Francesco M. <fr...@us...> - 2007-05-06 10:52:55
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17056/apps/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: don't build LUAC when SHARED==1 as it uses Lua private functions not exported in shared libs of Lua Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** makefile.vc 6 May 2007 10:16:32 -0000 1.66 --- makefile.vc 6 May 2007 10:52:51 -0000 1.67 *************** *** 116,120 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_print.obj ! APP_WXLUA_CXXFLAGS = /M$(__RUNTIME_LIBS_39)$(____app_21) /DWIN32 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ --- 116,120 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_print.obj ! APP_WXLUA_CXXFLAGS = /M$(__RUNTIME_LIBS_40)$(____app_21) /DWIN32 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ *************** *** 126,130 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res ! APP_WXLUAEDIT_CXXFLAGS = /M$(__RUNTIME_LIBS_53)$(____app_21) /DWIN32 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ --- 126,130 ---- 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 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ *************** *** 137,141 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ! APP_WXLUACAN_CXXFLAGS = /M$(__RUNTIME_LIBS_67)$(____app_21) /DWIN32 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ --- 137,141 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ! APP_WXLUACAN_CXXFLAGS = /M$(__RUNTIME_LIBS_68)$(____app_21) /DWIN32 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ *************** *** 150,154 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res ! APP_WXLUAFREEZE_CXXFLAGS = /M$(__RUNTIME_LIBS_81)$(____app_21) /DWIN32 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ --- 150,154 ---- 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 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ *************** *** 177,180 **** --- 177,183 ---- __RUNTIME_LIBS_11 = $(__THREADING) !endif + !if "$(SHARED)" == "0" + __app_luac___depname = ..\..\..\bin\vc_$(____app_27)\luac.exe + !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_25 = D *************** *** 187,194 **** !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_39 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_39 = $(__THREADING) !endif !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" --- 190,197 ---- !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_40 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_40 = $(__THREADING) !endif !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" *************** *** 196,203 **** !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_53 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_53 = $(__THREADING) !endif !if "$(USE_WXLUACANAPP)" == "1" --- 199,206 ---- !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_54 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_54 = $(__THREADING) !endif !if "$(USE_WXLUACANAPP)" == "1" *************** *** 205,212 **** !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_67 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_67 = $(__THREADING) !endif !if "$(USE_WXLUAFREEZEAPP)" == "1" --- 208,215 ---- !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_68 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_68 = $(__THREADING) !endif !if "$(USE_WXLUAFREEZEAPP)" == "1" *************** *** 214,221 **** !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_81 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_81 = $(__THREADING) !endif !if "$(WX_SHARED)" == "0" --- 217,224 ---- !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_82 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_82 = $(__THREADING) !endif !if "$(WX_SHARED)" == "0" *************** *** 434,438 **** ### Targets: ### ! all: test_for_selected_wxbuild ..\..\..\bin\vc_$(____app_27)\lua.exe ..\..\..\bin\vc_$(____app_27)\luac.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: --- 437,441 ---- ### Targets: ### ! all: test_for_selected_wxbuild ..\..\..\bin\vc_$(____app_27)\lua.exe $(__app_luac___depname) $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: *************** *** 479,486 **** --- 482,491 ---- if not exist ..\..\..\bin\vc_$(____app_27) mkdir ..\..\..\bin\vc_$(____app_27) + !if "$(SHARED)" == "0" ..\..\..\bin\vc_$(____app_27)\luac.exe: make_dir_app_luac $(APP_LUAC_OBJECTS) link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:CONSOLE @<< $(APP_LUAC_OBJECTS) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib lua5.1.lib << + !endif make_dir_app_luac: Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** makefile.bcc 6 May 2007 10:16:31 -0000 1.66 --- makefile.bcc 6 May 2007 10:52:50 -0000 1.67 *************** *** 211,214 **** --- 211,217 ---- _BUILDDIR_SHARED_SUFFIX = _dll !endif + !if "$(SHARED)" == "0" + __app_luac___depname = ..\..\..\bin\bcc_$(____app_23)\luac.exe + !endif !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" __app_wxlua___depname = ..\..\..\bin\bcc_$(____app_23)\wxlua.exe *************** *** 432,436 **** ### Targets: ### ! all: test_for_selected_wxbuild ..\..\..\bin\bcc_$(____app_23)\lua.exe ..\..\..\bin\bcc_$(____app_23)\luac.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: --- 435,439 ---- ### Targets: ### ! all: test_for_selected_wxbuild ..\..\..\bin\bcc_$(____app_23)\lua.exe $(__app_luac___depname) $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: *************** *** 495,502 **** --- 498,507 ---- if not exist ..\..\..\bin\bcc_$(____app_23) mkdir ..\..\..\bin\bcc_$(____app_23) + !if "$(SHARED)" == "0" ..\..\..\bin\bcc_$(____app_23)\luac.exe: make_dir_app_luac $(APP_LUAC_OBJECTS) ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -ap @&&| c0x32.obj $(APP_LUAC_OBJECTS),$@,, wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib lua5.1.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_6).lib,, | + !endif make_dir_app_luac: Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** makefile.wat 6 May 2007 10:16:32 -0000 1.67 --- makefile.wat 6 May 2007 10:52:51 -0000 1.68 *************** *** 125,128 **** --- 125,132 ---- _BUILDDIR_SHARED_SUFFIX = _dll !endif + __app_luac___depname = + !ifeq SHARED 0 + __app_luac___depname = ..\..\..\bin\wat_$(____app_23)\luac.exe + !endif __app_wxlua___depname = !ifeq USE_WXBINDSTC 1 *************** *** 567,571 **** ### Targets: ### ! all : .SYMBOLIC test_for_selected_wxbuild ..\..\..\bin\wat_$(____app_23)\lua.exe ..\..\..\bin\wat_$(____app_23)\luac.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean : .SYMBOLIC --- 571,575 ---- ### Targets: ### ! all : .SYMBOLIC test_for_selected_wxbuild ..\..\..\bin\wat_$(____app_23)\lua.exe $(__app_luac___depname) $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean : .SYMBOLIC *************** *** 609,612 **** --- 613,617 ---- if not exist ..\..\..\bin\wat_$(____app_23) mkdir ..\..\..\bin\wat_$(____app_23) + !ifeq SHARED 0 ..\..\..\bin\wat_$(____app_23)\luac.exe : make_dir_app_luac $(APP_LUAC_OBJECTS) @%create watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac.lbc *************** *** 620,623 **** --- 625,629 ---- @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac.lbc option stack=%i wlink @watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac.lbc + !endif make_dir_app_luac : Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** makefile.gcc 6 May 2007 10:16:31 -0000 1.66 --- makefile.gcc 6 May 2007 10:52:51 -0000 1.67 *************** *** 155,158 **** --- 155,161 ---- _BUILDDIR_SHARED_SUFFIX = _dll endif + ifeq ($(SHARED),0) + __app_luac___depname = ..\..\..\bin\gcc_$(____app_23)\luac.exe + endif ifeq ($(USE_WXBINDSTC),1) ifeq ($(USE_WXLUAAPP),1) *************** *** 514,518 **** ### Targets: ### ! all: test_for_selected_wxbuild ..\..\..\bin\gcc_$(____app_23)\lua.exe ..\..\..\bin\gcc_$(____app_23)\luac.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: --- 517,521 ---- ### Targets: ### ! all: test_for_selected_wxbuild ..\..\..\bin\gcc_$(____app_23)\lua.exe $(__app_luac___depname) $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: *************** *** 544,549 **** --- 547,554 ---- if not exist ..\..\..\bin\gcc_$(____app_23) mkdir ..\..\..\bin\gcc_$(____app_23) + ifeq ($(SHARED),0) ..\..\..\bin\gcc_$(____app_23)\luac.exe: make_dir_app_luac $(APP_LUAC_OBJECTS) $(CC) -o $@ $(APP_LUAC_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -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 -llua5.1 + endif make_dir_app_luac: |
