From: Francesco <fr...@us...> - 2005-06-12 22:09:22
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7008/modules/build/msw Modified Files: makefile.bcc makefile.gcc Log Message: Fixed module builds (beta) Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.bcc 12 Jun 2005 21:31:38 -0000 1.2 --- makefile.bcc 12 Jun 2005 22:09:13 -0000 1.3 *************** *** 25,28 **** --- 25,33 ---- !endif + # C++ compiler + !ifndef CXX + CXX = bcc32 + !endif + # Standard flags for CC !ifndef CFLAGS *************** *** 30,33 **** --- 35,43 ---- !endif + # Standard flags for C++ + !ifndef CXXFLAGS + CXXFLAGS = + !endif + # Standard preprocessor flags (common for CC and CXX) !ifndef CPPFLAGS *************** *** 35,38 **** --- 45,53 ---- !endif + # Standard linker flags + !ifndef LDFLAGS + LDFLAGS = + !endif + # The directory where wxWidgets library is installed !ifndef WX_DIR *************** *** 63,75 **** ### Variables: ### ! LUA_CFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) \ ! -D__WXMSW__ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include -I..\..\..\include -I..\..\..\modules \ ! $(__OPTIMIZEFLAG_1) $(__DEBUGINFO_2) -tWM $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) \ ! $(CFLAGS) LUA_OBJECTS = \ borland$(WXLIBPOSTFIX)\lua_lapi.obj \ borland$(WXLIBPOSTFIX)\lua_lcode.obj \ borland$(WXLIBPOSTFIX)\lua_ldebug.obj \ borland$(WXLIBPOSTFIX)\lua_ldo.obj \ borland$(WXLIBPOSTFIX)\lua_ldump.obj \ --- 78,97 ---- ### Variables: ### ! LUA_LIB_CFLAGS = -I$(BCCDIR)\include -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) ! LUA_LIB_OBJECTS = \ ! borland$(WXLIBPOSTFIX)\lua_lib_lauxlib.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_lbaselib.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_ldblib.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_liolib.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_lmathlib.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_loadlib.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_lstrlib.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_ltablib.obj ! LUA_CFLAGS = -I$(BCCDIR)\include -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) LUA_OBJECTS = \ borland$(WXLIBPOSTFIX)\lua_lapi.obj \ borland$(WXLIBPOSTFIX)\lua_lcode.obj \ borland$(WXLIBPOSTFIX)\lua_ldebug.obj \ + borland$(WXLIBPOSTFIX)\lua_ldllmain.obj \ borland$(WXLIBPOSTFIX)\lua_ldo.obj \ borland$(WXLIBPOSTFIX)\lua_ldump.obj \ *************** *** 88,95 **** borland$(WXLIBPOSTFIX)\lua_lundump.obj \ borland$(WXLIBPOSTFIX)\lua_lvm.obj \ ! borland$(WXLIBPOSTFIX)\lua_lzio.obj ### Conditionally set variables: ### !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p = -D_UNICODE --- 110,130 ---- borland$(WXLIBPOSTFIX)\lua_lundump.obj \ borland$(WXLIBPOSTFIX)\lua_lvm.obj \ ! borland$(WXLIBPOSTFIX)\lua_lzio.obj \ ! borland$(WXLIBPOSTFIX)\lua_lua.obj ! WXLUA_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_1) $(__DEBUGINFO_2) \ ! -tWM $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) ! WXLUA_OBJECTS = \ ! borland$(WXLIBPOSTFIX)\wxlua_internal.obj \ ! borland$(WXLIBPOSTFIX)\wxlua_interp.obj \ ! borland$(WXLIBPOSTFIX)\wxlua_library.obj ### Conditionally set variables: ### + !if "$(WX_SHARED)" == "0" + __wxlua___depname = ..\..\..\lib\bcc_lib\wxlua.lib + !endif !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p = -D_UNICODE *************** *** 119,125 **** __WX_SHAREDDEFINE_p = -DWXUSINGDLL !endif - !if "$(WX_SHARED)" == "0" - __wxlua___depname = ..\..\..\lib\bcc_lib\wxlua.lib - !endif !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = u --- 154,157 ---- *************** *** 139,143 **** ### Targets: ### ! all: ..\..\..\lib\bcc_lib ..\..\..\lib\bcc_dll ..\..\..\lib\bcc_lib\lua.lib $(__wxlua___depname) clean: --- 171,175 ---- ### Targets: ### ! all: ..\..\..\lib\bcc_lib ..\..\..\lib\bcc_dll ..\..\..\lib\bcc_lib\lua.lib ..\..\..\bin\lua.exe $(__wxlua___depname) clean: *************** *** 146,149 **** --- 178,187 ---- -if exist borland$(WXLIBPOSTFIX)\*.csm del borland$(WXLIBPOSTFIX)\*.csm -if exist ..\..\..\lib\bcc_lib\lua.lib del ..\..\..\lib\bcc_lib\lua.lib + -if exist ..\..\..\bin\lua.exe del ..\..\..\bin\lua.exe + -if exist ..\..\..\bin\lua.tds del ..\..\..\bin\lua.tds + -if exist ..\..\..\bin\lua.ilc del ..\..\..\bin\lua.ilc + -if exist ..\..\..\bin\lua.ild del ..\..\..\bin\lua.ild + -if exist ..\..\..\bin\lua.ilf del ..\..\..\bin\lua.ilf + -if exist ..\..\..\bin\lua.ils del ..\..\..\bin\lua.ils -if exist ..\..\..\lib\bcc_lib\wxlua.lib del ..\..\..\lib\bcc_lib\wxlua.lib *************** *** 154,171 **** if not exist ..\..\..\lib\bcc_dll mkdir ..\..\..\lib\bcc_dll ! ..\..\..\lib\bcc_lib\lua.lib: $(LUA_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| ! $(LUA_OBJECTS) | !if "$(WX_SHARED)" == "0" ! ..\..\..\lib\bcc_lib\wxlua.lib: if exist $@ del $@ tlib /a /p4096 $@ @&&| ! | !endif borland$(WXLIBPOSTFIX)\lua_lapi.obj: ..\..\lua\src\lapi.c $(CC) -q -c -P- -o$@ $(LUA_CFLAGS) $** --- 192,238 ---- if not exist ..\..\..\lib\bcc_dll mkdir ..\..\..\lib\bcc_dll ! ..\..\..\lib\bcc_lib\lua.lib: $(LUA_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| ! $(LUA_LIB_OBJECTS) ! | ! ! ..\..\..\bin\lua.exe: $(LUA_OBJECTS) ..\..\..\lib\bcc_lib\lua.lib ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk @&&| ! c0x32.obj $(LUA_OBJECTS),$@,, ..\..\..\lib\bcc_lib\lua.lib import32.lib cw32.lib,, | !if "$(WX_SHARED)" == "0" ! ..\..\..\lib\bcc_lib\wxlua.lib: $(WXLUA_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| ! $(WXLUA_OBJECTS) | !endif + borland$(WXLIBPOSTFIX)\lua_lib_lauxlib.obj: ..\..\lua\src\lib\lauxlib.c + $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** + + borland$(WXLIBPOSTFIX)\lua_lib_lbaselib.obj: ..\..\lua\src\lib\lbaselib.c + $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** + + borland$(WXLIBPOSTFIX)\lua_lib_ldblib.obj: ..\..\lua\src\lib\ldblib.c + $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** + + borland$(WXLIBPOSTFIX)\lua_lib_liolib.obj: ..\..\lua\src\lib\liolib.c + $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** + + borland$(WXLIBPOSTFIX)\lua_lib_lmathlib.obj: ..\..\lua\src\lib\lmathlib.c + $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** + + borland$(WXLIBPOSTFIX)\lua_lib_loadlib.obj: ..\..\lua\src\lib\loadlib.c + $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** + + borland$(WXLIBPOSTFIX)\lua_lib_lstrlib.obj: ..\..\lua\src\lib\lstrlib.c + $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** + + borland$(WXLIBPOSTFIX)\lua_lib_ltablib.obj: ..\..\lua\src\lib\ltablib.c + $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** + borland$(WXLIBPOSTFIX)\lua_lapi.obj: ..\..\lua\src\lapi.c $(CC) -q -c -P- -o$@ $(LUA_CFLAGS) $** *************** *** 177,180 **** --- 244,250 ---- $(CC) -q -c -P- -o$@ $(LUA_CFLAGS) $** + borland$(WXLIBPOSTFIX)\lua_ldllmain.obj: ..\..\lua\src\ldllmain.c + $(CC) -q -c -P- -o$@ $(LUA_CFLAGS) $** + borland$(WXLIBPOSTFIX)\lua_ldo.obj: ..\..\lua\src\ldo.c $(CC) -q -c -P- -o$@ $(LUA_CFLAGS) $** *************** *** 228,229 **** --- 298,311 ---- $(CC) -q -c -P- -o$@ $(LUA_CFLAGS) $** + borland$(WXLIBPOSTFIX)\lua_lua.obj: ..\..\lua\src\lua\lua.c + $(CC) -q -c -P- -o$@ $(LUA_CFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxlua_internal.obj: ..\..\wxlua\src\internal.cpp + $(CXX) -q -c -P -o$@ $(WXLUA_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxlua_interp.obj: ..\..\wxlua\src\interp.cpp + $(CXX) -q -c -P -o$@ $(WXLUA_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxlua_library.obj: ..\..\wxlua\src\library.cpp + $(CXX) -q -c -P -o$@ $(WXLUA_CXXFLAGS) $** + Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.gcc 12 Jun 2005 21:31:38 -0000 1.2 --- makefile.gcc 12 Jun 2005 22:09:13 -0000 1.3 *************** *** 14,23 **** --- 14,32 ---- 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 = + # The directory where wxWidgets library is installed WX_DIR = $(WXWIN) *************** *** 40,52 **** ### Variables: ### ! LUA_CFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) \ ! -D__WXMSW__ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include -I..\..\..\include -I..\..\..\modules $(__WARNINGS_0) \ ! $(__OPTIMIZEFLAG_1) $(__DEBUGINFO_2) -mthreads $(__WX_SHAREDDEFINE_p) \ ! $(CPPFLAGS) $(CFLAGS) LUA_OBJECTS = \ mingw$(WXLIBPOSTFIX)\lua_lapi.o \ mingw$(WXLIBPOSTFIX)\lua_lcode.o \ mingw$(WXLIBPOSTFIX)\lua_ldebug.o \ mingw$(WXLIBPOSTFIX)\lua_ldo.o \ mingw$(WXLIBPOSTFIX)\lua_ldump.o \ --- 49,68 ---- ### Variables: ### ! LUA_LIB_CFLAGS = -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) ! LUA_LIB_OBJECTS = \ ! mingw$(WXLIBPOSTFIX)\lua_lib_lauxlib.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_lbaselib.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_ldblib.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_liolib.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_lmathlib.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_loadlib.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_lstrlib.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_ltablib.o ! LUA_CFLAGS = -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) LUA_OBJECTS = \ mingw$(WXLIBPOSTFIX)\lua_lapi.o \ mingw$(WXLIBPOSTFIX)\lua_lcode.o \ mingw$(WXLIBPOSTFIX)\lua_ldebug.o \ + mingw$(WXLIBPOSTFIX)\lua_ldllmain.o \ mingw$(WXLIBPOSTFIX)\lua_ldo.o \ mingw$(WXLIBPOSTFIX)\lua_ldump.o \ *************** *** 65,72 **** mingw$(WXLIBPOSTFIX)\lua_lundump.o \ mingw$(WXLIBPOSTFIX)\lua_lvm.o \ ! mingw$(WXLIBPOSTFIX)\lua_lzio.o ### Conditionally set variables: ### ifeq ($(WX_UNICODE),1) __WXUNICODE_DEFINE_p = -D_UNICODE --- 81,100 ---- mingw$(WXLIBPOSTFIX)\lua_lundump.o \ mingw$(WXLIBPOSTFIX)\lua_lvm.o \ ! mingw$(WXLIBPOSTFIX)\lua_lzio.o \ ! mingw$(WXLIBPOSTFIX)\lua_lua.o ! WXLUA_CXXFLAGS = -DHAVE_W32API_H $(__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) -mthreads $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) ! WXLUA_OBJECTS = \ ! mingw$(WXLIBPOSTFIX)\wxlua_internal.o \ ! mingw$(WXLIBPOSTFIX)\wxlua_interp.o \ ! mingw$(WXLIBPOSTFIX)\wxlua_library.o ### Conditionally set variables: ### + ifeq ($(WX_SHARED),0) + __wxlua___depname = ..\..\..\lib\gcc_lib\libwxlua.a + endif ifeq ($(WX_UNICODE),1) __WXUNICODE_DEFINE_p = -D_UNICODE *************** *** 102,108 **** __WX_SHAREDDEFINE_p = -DWXUSINGDLL endif - ifeq ($(WX_SHARED),0) - __wxlua___depname = ..\..\..\lib\gcc_lib\libwxlua.a - endif ifeq ($(WX_DEBUG),0) ifeq ($(WX_UNICODE),1) --- 130,133 ---- *************** *** 128,136 **** ### Targets: ### ! all: ..\..\..\lib\gcc_lib ..\..\..\lib\gcc_dll ..\..\..\lib\gcc_lib\liblua.a $(__wxlua___depname) clean: -if exist mingw$(WXLIBPOSTFIX)\*.o del mingw$(WXLIBPOSTFIX)\*.o -if exist ..\..\..\lib\gcc_lib\liblua.a del ..\..\..\lib\gcc_lib\liblua.a -if exist ..\..\..\lib\gcc_lib\libwxlua.a del ..\..\..\lib\gcc_lib\libwxlua.a --- 153,162 ---- ### Targets: ### ! all: ..\..\..\lib\gcc_lib ..\..\..\lib\gcc_dll ..\..\..\lib\gcc_lib\liblua.a ..\..\..\bin\lua.exe $(__wxlua___depname) clean: -if exist mingw$(WXLIBPOSTFIX)\*.o del mingw$(WXLIBPOSTFIX)\*.o -if exist ..\..\..\lib\gcc_lib\liblua.a del ..\..\..\lib\gcc_lib\liblua.a + -if exist ..\..\..\bin\lua.exe del ..\..\..\bin\lua.exe -if exist ..\..\..\lib\gcc_lib\libwxlua.a del ..\..\..\lib\gcc_lib\libwxlua.a *************** *** 141,156 **** if not exist ..\..\..\lib\gcc_dll mkdir ..\..\..\lib\gcc_dll ! ..\..\..\lib\gcc_lib\liblua.a: $(LUA_OBJECTS) if exist $@ del $@ ! ar rcu $@ $(LUA_OBJECTS) ranlib $@ ifeq ($(WX_SHARED),0) ! ..\..\..\lib\gcc_lib\libwxlua.a: if exist $@ del $@ ! ar rcu $@ ranlib $@ endif mingw$(WXLIBPOSTFIX)\lua_lapi.o: ../../lua/src/lapi.c $(CC) -c -o $@ $(LUA_CFLAGS) $< --- 167,209 ---- if not exist ..\..\..\lib\gcc_dll mkdir ..\..\..\lib\gcc_dll ! ..\..\..\lib\gcc_lib\liblua.a: $(LUA_LIB_OBJECTS) if exist $@ del $@ ! ar rcu $@ $(LUA_LIB_OBJECTS) ranlib $@ + ..\..\..\bin\lua.exe: $(LUA_OBJECTS) ..\..\..\lib\gcc_lib\liblua.a + $(CC) -o $@ $(LUA_OBJECTS) $(LDFLAGS) ..\..\..\lib\gcc_lib\liblua.a + ifeq ($(WX_SHARED),0) ! ..\..\..\lib\gcc_lib\libwxlua.a: $(WXLUA_OBJECTS) if exist $@ del $@ ! ar rcu $@ $(WXLUA_OBJECTS) ranlib $@ endif + mingw$(WXLIBPOSTFIX)\lua_lib_lauxlib.o: ../../lua/src/lib/lauxlib.c + $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< + + mingw$(WXLIBPOSTFIX)\lua_lib_lbaselib.o: ../../lua/src/lib/lbaselib.c + $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< + + mingw$(WXLIBPOSTFIX)\lua_lib_ldblib.o: ../../lua/src/lib/ldblib.c + $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< + + mingw$(WXLIBPOSTFIX)\lua_lib_liolib.o: ../../lua/src/lib/liolib.c + $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< + + mingw$(WXLIBPOSTFIX)\lua_lib_lmathlib.o: ../../lua/src/lib/lmathlib.c + $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< + + mingw$(WXLIBPOSTFIX)\lua_lib_loadlib.o: ../../lua/src/lib/loadlib.c + $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< + + mingw$(WXLIBPOSTFIX)\lua_lib_lstrlib.o: ../../lua/src/lib/lstrlib.c + $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< + + mingw$(WXLIBPOSTFIX)\lua_lib_ltablib.o: ../../lua/src/lib/ltablib.c + $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< + mingw$(WXLIBPOSTFIX)\lua_lapi.o: ../../lua/src/lapi.c $(CC) -c -o $@ $(LUA_CFLAGS) $< *************** *** 162,165 **** --- 215,221 ---- $(CC) -c -o $@ $(LUA_CFLAGS) $< + mingw$(WXLIBPOSTFIX)\lua_ldllmain.o: ../../lua/src/ldllmain.c + $(CC) -c -o $@ $(LUA_CFLAGS) $< + mingw$(WXLIBPOSTFIX)\lua_ldo.o: ../../lua/src/ldo.c $(CC) -c -o $@ $(LUA_CFLAGS) $< *************** *** 213,216 **** --- 269,284 ---- $(CC) -c -o $@ $(LUA_CFLAGS) $< + mingw$(WXLIBPOSTFIX)\lua_lua.o: ../../lua/src/lua/lua.c + $(CC) -c -o $@ $(LUA_CFLAGS) $< + + mingw$(WXLIBPOSTFIX)\wxlua_internal.o: ../../wxlua/src/internal.cpp + $(CXX) -c -o $@ $(WXLUA_CXXFLAGS) $< + + mingw$(WXLIBPOSTFIX)\wxlua_interp.o: ../../wxlua/src/interp.cpp + $(CXX) -c -o $@ $(WXLUA_CXXFLAGS) $< + + mingw$(WXLIBPOSTFIX)\wxlua_library.o: ../../wxlua/src/library.cpp + $(CXX) -c -o $@ $(WXLUA_CXXFLAGS) $< + .PHONY: all clean |