Menu
▾
▴
[Wxlua-commit] wxLua/build/msw makefile.bcc,1.30,1.31 makefile.gcc,1.31,1.32 makefile.vc,1.33,1.34 makefile.wat,1.32,1.33
|
From: Francesco M. <fr...@us...> - 2006-05-20 13:12:49
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8798/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: updated all build system trying to fix SHARED builds Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** makefile.vc 12 Apr 2006 18:04:05 -0000 1.33 --- makefile.vc 20 May 2006 13:12:34 -0000 1.34 *************** *** 11,14 **** --- 11,32 ---- # ------------------------------------------------------------------------- + # C compiler + CC = cl + + # C++ compiler + CXX = cl + + # Standard flags for CC + CFLAGS = + + # Standard flags for C++ + CXXFLAGS = + + # Standard preprocessor flags (common for CC and CXX) + CPPFLAGS = + + # Standard linker flags + LDFLAGS = + # Builds in debug mode [debug,release] # debug - Release *************** *** 51,54 **** --- 69,75 ---- USE_WXLUASOCKET = 1 + # Compile the lua module ? [0,1] + USE_LUAMODULE = 1 + # Compile the wxLua app ? [0,1] USE_WXLUAAPP = 1 *************** *** 80,86 **** WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \ USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \ ! USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" \ ! USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" --- 101,107 ---- WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \ USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" \ ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" \ ! WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" *************** *** 156,157 **** --- 177,182 ---- cd ..\build\msw + + !if "$(SHARED)" == "1" && "$(WX_SHARED)" == "0" + !error Cannot build a SHARED version of wxLua (SHARED is 1) against a static version of wxWidgets (WX_SHARED is 0) ! You can only do the opposite (STATIC build of wxLua against SHARED build of wxWidgets) + !endif Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** makefile.bcc 12 Apr 2006 18:04:05 -0000 1.30 --- makefile.bcc 20 May 2006 13:12:34 -0000 1.31 *************** *** 105,108 **** --- 105,113 ---- !endif + # Compile the lua module ? [0,1] + !ifndef USE_LUAMODULE + USE_LUAMODULE = 1 + !endif + # Compile the wxLua app ? [0,1] !ifndef USE_WXLUAAPP *************** *** 145,151 **** -DUSE_APPS="$(USE_APPS)" -DUSE_WXBINDSTC="$(USE_WXBINDSTC)" \ -DUSE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ ! -DUSE_WXLUASOCKET="$(USE_WXLUASOCKET)" -DUSE_WXLUAAPP="$(USE_WXLUAAPP)" \ ! -DUSE_WXLUACANAPP="$(USE_WXLUACANAPP)" -DWXSTEDIT_DIR="$(WXSTEDIT_DIR)" \ ! -DUSE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ -DUSE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" --- 150,156 ---- -DUSE_APPS="$(USE_APPS)" -DUSE_WXBINDSTC="$(USE_WXBINDSTC)" \ -DUSE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ ! -DUSE_WXLUASOCKET="$(USE_WXLUASOCKET)" -DUSE_LUAMODULE="$(USE_LUAMODULE)" \ ! -DUSE_WXLUAAPP="$(USE_WXLUAAPP)" -DUSE_WXLUACANAPP="$(USE_WXLUACANAPP)" \ ! -DWXSTEDIT_DIR="$(WXSTEDIT_DIR)" -DUSE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ -DUSE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** makefile.wat 12 Apr 2006 18:04:05 -0000 1.32 --- makefile.wat 20 May 2006 13:12:34 -0000 1.33 *************** *** 11,14 **** --- 11,32 ---- # ------------------------------------------------------------------------- + # C compiler + CC = wcc386 + + # C++ compiler + CXX = wpp386 + + # Standard flags for CC + CFLAGS = + + # Standard flags for C++ + CXXFLAGS = + + # Standard preprocessor flags (common for CC and CXX) + CPPFLAGS = + + # Standard linker flags + LDFLAGS = + # Builds in debug mode [debug,release] # debug - Release *************** *** 51,54 **** --- 69,75 ---- USE_WXLUASOCKET = 1 + # Compile the lua module ? [0,1] + USE_LUAMODULE = 1 + # Compile the wxLua app ? [0,1] USE_WXLUAAPP = 1 *************** *** 118,124 **** WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" & USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" & ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_WXLUAAPP="$(USE_WXLUAAPP)" & ! USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" & ! USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" & USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" --- 139,145 ---- WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" & USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" & ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" & ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" & ! WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" & USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** makefile.gcc 12 Apr 2006 18:04:05 -0000 1.31 --- makefile.gcc 20 May 2006 13:12:34 -0000 1.32 *************** *** 11,14 **** --- 11,32 ---- # ------------------------------------------------------------------------- + # C compiler + CC = gcc + + # C++ compiler + CXX = g++ + + # Standard flags for CC + CFLAGS = + + # Standard flags for C++ + CXXFLAGS = + + # Standard preprocessor flags (common for CC and CXX) + CPPFLAGS = + + # Standard linker flags + LDFLAGS = + # Builds in debug mode [debug,release] BUILD = debug *************** *** 44,47 **** --- 62,68 ---- USE_WXLUASOCKET = 1 + # Compile the lua module ? [0,1] + USE_LUAMODULE = 1 + # Compile the wxLua app ? [0,1] USE_WXLUAAPP = 1 *************** *** 73,79 **** WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \ USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \ ! USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" \ ! USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" --- 94,100 ---- WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \ USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" \ ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" \ ! WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" |
