Menu
▾
▴
[Wxlua-commit] wxLua/apps/build/msw makefile.bcc,1.2,1.3 makefile.gcc,1.2,1.3 makefile.vc,1.2,1.3 makefile.wat,1.2,1.3
|
From: Francesco <fr...@us...> - 2005-06-14 21:45:20
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3140/apps/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Fixed modules compilation Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.vc 14 Jun 2005 20:22:48 -0000 1.2 --- makefile.vc 14 Jun 2005 21:44:39 -0000 1.3 *************** *** 11,17 **** --- 11,23 ---- # ------------------------------------------------------------------------- + # C compiler + CC = cl + # C++ compiler CXX = cl + # Standard flags for CC + CFLAGS = + # Standard flags for C++ CXXFLAGS = *************** *** 46,49 **** --- 52,61 ---- ### Variables: ### + WXLUA_CFLAGS = /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) $(CPPFLAGS) $(CFLAGS) WXLUA_CXXFLAGS = /MD$(__DEBUGRUNTIME_7) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ *************** *** 54,58 **** WXLUA_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxlua_wxlua.obj \ ! msvc$(WXLIBPOSTFIX)\wxlua_lconsole.obj ### Conditionally set variables: ### --- 66,72 ---- WXLUA_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxlua_wxlua.obj \ ! msvc$(WXLIBPOSTFIX)\wxlua_lconsole.obj \ ! msvc$(WXLIBPOSTFIX)\wxlua_wxlua.res \ ! msvc$(WXLIBPOSTFIX)\wxlua_wxluawrap.obj ### Conditionally set variables: ### *************** *** 64,70 **** --- 78,90 ---- __WXUNICODE_DEFINE_p = /D_UNICODE !endif + !if "$(WX_UNICODE)" == "1" + __WXUNICODE_DEFINE_p_1 = /d _UNICODE + !endif !if "$(WX_DEBUG)" == "1" __WXDEBUG_DEFINE_p = /D__WXDEBUG__ !endif + !if "$(WX_DEBUG)" == "1" + __WXDEBUG_DEFINE_p_1 = /d __WXDEBUG__ + !endif !if "$(WX_DEBUG)" == "0" __WARNINGS_2 = /w *************** *** 98,101 **** --- 118,127 ---- !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 *************** *** 106,109 **** --- 132,138 ---- __WX_SHAREDDEFINE_p = /DWXUSINGDLL !endif + !if "$(WX_SHARED)" == "1" + __WX_SHAREDDEFINE_p_1 = /d WXUSINGDLL + !endif !if "$(WX_SHARED)" == "0" __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\vc_lib *************** *** 135,139 **** ### Targets: ### ! all: ..\..\..\bin\wxlua.exe clean: --- 164,168 ---- ### Targets: ### ! all: wrap ..\..\..\bin\wxlua.exe clean: *************** *** 145,157 **** -if exist ..\..\..\bin\wxlua.pdb del ..\..\..\bin\wxlua.pdb ! ..\..\..\bin\wxlua.exe: $(WXLUA_OBJECTS) link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_5) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< ! $(WXLUA_OBJECTS) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).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)\wxlua_wxlua.obj: ..\..\..\wxlua\src\wxlua.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXLUA_CXXFLAGS) $** ! msvc$(WXLIBPOSTFIX)\wxlua_lconsole.obj: ..\..\..\wxlua\src\lconsole.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXLUA_CXXFLAGS) $** --- 174,196 ---- -if exist ..\..\..\bin\wxlua.pdb del ..\..\..\bin\wxlua.pdb ! wrap: ..\..\..\bindings\wxwidgets\override.hpp ! ..\..\..\bin\lua -e"target=\"msw\"" ..\..\wxlua\src\wrap.lua ! copy ..\..\..\bindings\wxwidgets\wxluawrap.i ..\..\..\bindings\wxwidgets\wxluawrap.c ! ! ..\..\..\bin\wxlua.exe: $(WXLUA_OBJECTS) wrap msvc$(WXLIBPOSTFIX)\wxlua_wxlua.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_5) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< ! $(WXLUA_OBJECTS) wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).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)\wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXLUA_CXXFLAGS) $** ! msvc$(WXLIBPOSTFIX)\wxlua_lconsole.obj: ..\..\wxlua\src\lconsole.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXLUA_CXXFLAGS) $** + msvc$(WXLIBPOSTFIX)\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) $** + + msvc$(WXLIBPOSTFIX)\wxlua_wxluawrap.obj: ..\..\..\bindings\wxwidgets\wxluawrap.c + $(CC) /c /nologo /TC /Fo$@ $(WXLUA_CFLAGS) $** + Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.bcc 14 Jun 2005 20:22:47 -0000 1.2 --- makefile.bcc 14 Jun 2005 21:44:39 -0000 1.3 *************** *** 20,23 **** --- 20,28 ---- # ------------------------------------------------------------------------- + # C compiler + !ifndef CC + CC = bcc32 + !endif + # C++ compiler !ifndef CXX *************** *** 25,28 **** --- 30,38 ---- !endif + # Standard flags for CC + !ifndef CFLAGS + CFLAGS = + !endif + # Standard flags for C++ !ifndef CXXFLAGS *************** *** 73,76 **** --- 83,91 ---- ### Variables: ### + WXLUA_CFLAGS = -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) \ + -tWM $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CFLAGS) WXLUA_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ *************** *** 80,84 **** WXLUA_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxlua_wxlua.obj \ ! borland$(WXLIBPOSTFIX)\wxlua_lconsole.obj ### Conditionally set variables: ### --- 95,100 ---- WXLUA_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxlua_wxlua.obj \ ! borland$(WXLIBPOSTFIX)\wxlua_lconsole.obj \ ! borland$(WXLIBPOSTFIX)\wxlua_wxluawrap.obj ### Conditionally set variables: ### *************** *** 90,96 **** --- 106,118 ---- __WXUNICODE_DEFINE_p = -D_UNICODE !endif + !if "$(WX_UNICODE)" == "1" + __WXUNICODE_DEFINE_p_1 = -d_UNICODE + !endif !if "$(WX_DEBUG)" == "1" __WXDEBUG_DEFINE_p = -D__WXDEBUG__ !endif + !if "$(WX_DEBUG)" == "1" + __WXDEBUG_DEFINE_p_1 = -d__WXDEBUG__ + !endif !if "$(WX_DEBUG)" == "0" __OPTIMIZEFLAG_1 = -O2 *************** *** 102,105 **** --- 124,130 ---- __WX_SHAREDDEFINE_p = -DWXUSINGDLL !endif + !if "$(WX_SHARED)" == "1" + __WX_SHAREDDEFINE_p_1 = -dWXUSINGDLL + !endif !if "$(WX_SHARED)" == "0" __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_lib *************** *** 137,141 **** ### Targets: ### ! all: ..\..\..\bin\wxlua.exe clean: --- 162,166 ---- ### Targets: ### ! all: wrap ..\..\..\bin\wxlua.exe clean: *************** *** 150,162 **** -if exist ..\..\..\bin\wxlua.ils del ..\..\..\bin\wxlua.ils ! ..\..\..\bin\wxlua.exe: $(WXLUA_OBJECTS) ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0x32.obj $(WXLUA_OBJECTS),$@,, wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, | ! borland$(WXLIBPOSTFIX)\wxlua_wxlua.obj: ..\..\..\wxlua\src\wxlua.cpp $(CXX) -q -c -P -o$@ $(WXLUA_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxlua_lconsole.obj: ..\..\..\wxlua\src\lconsole.cpp $(CXX) -q -c -P -o$@ $(WXLUA_CXXFLAGS) $** --- 175,197 ---- -if exist ..\..\..\bin\wxlua.ils del ..\..\..\bin\wxlua.ils ! wrap: ..\..\..\bindings\wxwidgets\override.hpp ! ..\..\..\bin\lua -e"target=\"msw\"" ..\..\wxlua\src\wrap.lua ! copy ..\..\..\bindings\wxwidgets\wxluawrap.i ..\..\..\bindings\wxwidgets\wxluawrap.c ! ! ..\..\..\bin\wxlua.exe: $(WXLUA_OBJECTS) wrap borland$(WXLIBPOSTFIX)\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 $(WXLUA_OBJECTS),$@,, wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, borland$(WXLIBPOSTFIX)\wxlua_wxlua.res | ! borland$(WXLIBPOSTFIX)\wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) -q -c -P -o$@ $(WXLUA_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxlua_lconsole.obj: ..\..\wxlua\src\lconsole.cpp $(CXX) -q -c -P -o$@ $(WXLUA_CXXFLAGS) $** + borland$(WXLIBPOSTFIX)\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) $** + + borland$(WXLIBPOSTFIX)\wxlua_wxluawrap.obj: ..\..\..\bindings\wxwidgets\wxluawrap.c + $(CC) -q -c -P- -o$@ $(WXLUA_CFLAGS) $** + Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.wat 14 Jun 2005 20:22:48 -0000 1.2 --- makefile.wat 14 Jun 2005 21:44:39 -0000 1.3 *************** *** 11,17 **** --- 11,23 ---- # ------------------------------------------------------------------------- + # C compiler + CC = wcc386 + # C++ compiler CXX = wpp386 + # Standard flags for CC + CFLAGS = + # Standard flags for C++ CXXFLAGS = *************** *** 65,76 **** WX3RDPARTLIBPOSTFIX = d !endif - __WXUNICODE_DEFINE_p = - !ifeq WX_UNICODE 1 - __WXUNICODE_DEFINE_p = -d_UNICODE - !endif - __WXDEBUG_DEFINE_p = - !ifeq WX_DEBUG 1 - __WXDEBUG_DEFINE_p = -d__WXDEBUG__ - !endif __WARNINGS_0 = !ifeq WX_DEBUG 0 --- 71,74 ---- *************** *** 101,108 **** __DEBUGINFO_3 = debug all !endif - __WX_SHAREDDEFINE_p = - !ifeq WX_SHARED 1 - __WX_SHAREDDEFINE_p = -dWXUSINGDLL - !endif __WXLUA_OUTPUT_FOLDER_FILENAMES = !ifeq WX_SHARED 0 --- 99,102 ---- *************** *** 112,115 **** --- 106,117 ---- __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\wat_dll !endif + __WXUNICODE_DEFINE_p = + !ifeq WX_UNICODE 1 + __WXUNICODE_DEFINE_p = -d_UNICODE + !endif + __WXDEBUG_DEFINE_p = + !ifeq WX_DEBUG 1 + __WXDEBUG_DEFINE_p = -d__WXDEBUG__ + !endif WXLIBPOSTFIX = !ifeq WX_DEBUG 0 *************** *** 135,141 **** --- 137,152 ---- __WXLIBPATH_FILENAMES = \lib\wat_dll !endif + __WX_SHAREDDEFINE_p = + !ifeq WX_SHARED 1 + __WX_SHAREDDEFINE_p = -dWXUSINGDLL + !endif ### Variables: ### + WXLUA_CFLAGS = $(__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) & + $(CFLAGS) WXLUA_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & *************** *** 145,149 **** WXLUA_OBJECTS = & watcom$(WXLIBPOSTFIX)\wxlua_wxlua.obj & ! watcom$(WXLIBPOSTFIX)\wxlua_lconsole.obj --- 156,161 ---- WXLUA_OBJECTS = & watcom$(WXLIBPOSTFIX)\wxlua_wxlua.obj & ! watcom$(WXLIBPOSTFIX)\wxlua_lconsole.obj & ! watcom$(WXLIBPOSTFIX)\wxlua_wxluawrap.obj *************** *** 154,158 **** ### Targets: ### ! all : .SYMBOLIC ..\..\..\bin\wxlua.exe clean : .SYMBOLIC --- 166,170 ---- ### Targets: ### ! all : .SYMBOLIC wrap ..\..\..\bin\wxlua.exe clean : .SYMBOLIC *************** *** 164,168 **** -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe ! ..\..\..\bin\wxlua.exe : $(WXLUA_OBJECTS) @%create watcom$(WXLIBPOSTFIX)\wxlua.lbc @%append watcom$(WXLIBPOSTFIX)\wxlua.lbc option quiet --- 176,184 ---- -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe ! wrap : ..\..\..\bindings\wxwidgets\override.hpp ! ..\..\..\bin\lua -e"target=\"msw\"" ..\..\wxlua\src\wrap.lua ! copy ..\..\..\bindings\wxwidgets\wxluawrap.i ..\..\..\bindings\wxwidgets\wxluawrap.c ! ! ..\..\..\bin\wxlua.exe : $(WXLUA_OBJECTS) wrap watcom$(WXLIBPOSTFIX)\wxlua_wxlua.res @%create watcom$(WXLIBPOSTFIX)\wxlua.lbc @%append watcom$(WXLIBPOSTFIX)\wxlua.lbc option quiet *************** *** 171,182 **** @%append watcom$(WXLIBPOSTFIX)\wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_3) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(WXLUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxlua.lbc file %i ! @for %i in ( wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).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)\wxlua.lbc library %i ! @%append watcom$(WXLIBPOSTFIX)\wxlua.lbc wlink @watcom$(WXLIBPOSTFIX)\wxlua.lbc ! watcom$(WXLIBPOSTFIX)\wxlua_wxlua.obj : .AUTODEPEND ..\..\..\wxlua\src\wxlua.cpp $(CXX) -zq -fo=$^@ $(WXLUA_CXXFLAGS) $< ! watcom$(WXLIBPOSTFIX)\wxlua_lconsole.obj : .AUTODEPEND ..\..\..\wxlua\src\lconsole.cpp $(CXX) -zq -fo=$^@ $(WXLUA_CXXFLAGS) $< --- 187,204 ---- @%append watcom$(WXLIBPOSTFIX)\wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_3) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(WXLUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxlua.lbc file %i ! @for %i in ( wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).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)\wxlua.lbc library %i ! @%append watcom$(WXLIBPOSTFIX)\wxlua.lbc option resource=watcom$(WXLIBPOSTFIX)\wxlua_wxlua.res wlink @watcom$(WXLIBPOSTFIX)\wxlua.lbc ! watcom$(WXLIBPOSTFIX)\wxlua_wxlua.obj : .AUTODEPEND ..\..\wxlua\src\wxlua.cpp $(CXX) -zq -fo=$^@ $(WXLUA_CXXFLAGS) $< ! watcom$(WXLIBPOSTFIX)\wxlua_lconsole.obj : .AUTODEPEND ..\..\wxlua\src\lconsole.cpp $(CXX) -zq -fo=$^@ $(WXLUA_CXXFLAGS) $< + watcom$(WXLIBPOSTFIX)\wxlua_wxlua.res : .AUTODEPEND ..\..\wxlua\src\wxlua.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) $< + + watcom$(WXLIBPOSTFIX)\wxlua_wxluawrap.obj : .AUTODEPEND ..\..\..\bindings\wxwidgets\wxluawrap.c + $(CC) -zq -fo=$^@ $(WXLUA_CFLAGS) $< + Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.gcc 14 Jun 2005 20:22:48 -0000 1.2 --- makefile.gcc 14 Jun 2005 21:44:39 -0000 1.3 *************** *** 11,17 **** --- 11,23 ---- # ------------------------------------------------------------------------- + # C compiler + CC = gcc + # C++ compiler CXX = g++ + # Standard flags for CC + CFLAGS = + # Standard flags for C++ CXXFLAGS = *************** *** 46,56 **** ### Variables: ### 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) -mthreads $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) WXLUA_OBJECTS = \ mingw$(WXLIBPOSTFIX)\wxlua_wxlua.o \ ! mingw$(WXLIBPOSTFIX)\wxlua_lconsole.o ### Conditionally set variables: ### --- 52,68 ---- ### Variables: ### + WXLUA_CFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) $(__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) $(CFLAGS) WXLUA_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_0) $(__OPTIMIZEFLAG_1) $(__DEBUGINFO) \ ! -mthreads $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) WXLUA_OBJECTS = \ mingw$(WXLIBPOSTFIX)\wxlua_wxlua.o \ ! mingw$(WXLIBPOSTFIX)\wxlua_lconsole.o \ ! mingw$(WXLIBPOSTFIX)\wxlua_wxlua_rc.o \ ! mingw$(WXLIBPOSTFIX)\wxlua_wxluawrap.o ### Conditionally set variables: ### *************** *** 62,68 **** --- 74,86 ---- __WXUNICODE_DEFINE_p = -D_UNICODE endif + ifeq ($(WX_UNICODE),1) + __WXUNICODE_DEFINE_p_1 = --define _UNICODE + endif ifeq ($(WX_DEBUG),1) __WXDEBUG_DEFINE_p = -D__WXDEBUG__ endif + ifeq ($(WX_DEBUG),1) + __WXDEBUG_DEFINE_p_1 = --define __WXDEBUG__ + endif ifeq ($(WX_DEBUG),0) __WARNINGS_0 = *************** *** 80,83 **** --- 98,104 ---- __WX_SHAREDDEFINE_p = -DWXUSINGDLL endif + ifeq ($(WX_SHARED),1) + __WX_SHAREDDEFINE_p_1 = --define WXUSINGDLL + endif ifeq ($(WX_SHARED),0) __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\gcc_lib *************** *** 102,109 **** endif ifeq ($(WX_SHARED),0) ! __WXLIBPATH_FILENAMES = \lib\gcc_lib endif ifeq ($(WX_SHARED),1) ! __WXLIBPATH_FILENAMES = \lib\gcc_dll endif ifeq ($(WX_DEBUG),0) --- 123,130 ---- endif ifeq ($(WX_SHARED),0) ! WXLIBPATH = \lib\gcc_lib endif ifeq ($(WX_SHARED),1) ! WXLIBPATH = \lib\gcc_dll endif ifeq ($(WX_DEBUG),0) *************** *** 121,125 **** ### Targets: ### ! all: ..\..\..\bin\wxlua.exe clean: --- 142,146 ---- ### Targets: ### ! all: wrap ..\..\..\bin\wxlua.exe clean: *************** *** 127,139 **** -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe ! ..\..\..\bin\wxlua.exe: $(WXLUA_OBJECTS) ! $(CXX) -o $@ $(WXLUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxtiff$(WX3RDPARTLIBPOSTFIX) -lwxjpeg$(WX3RDPARTLIBPOSTFIX) -lwxpng$(WX3RDPARTLIBPOSTFIX) -lwxzlib$(WX3RDPARTLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 ! mingw$(WXLIBPOSTFIX)\wxlua_wxlua.o: ../../../wxlua/src/wxlua.cpp $(CXX) -c -o $@ $(WXLUA_CXXFLAGS) $< ! mingw$(WXLIBPOSTFIX)\wxlua_lconsole.o: ../../../wxlua/src/lconsole.cpp $(CXX) -c -o $@ $(WXLUA_CXXFLAGS) $< .PHONY: all clean --- 148,170 ---- -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe ! wrap: ..\..\..\bindings\wxwidgets\override.hpp ! ..\..\..\bin\lua -e"target=\"msw\"" ..\..\wxlua\src\wrap.lua ! copy ..\..\..\bindings\wxwidgets\wxluawrap.i ..\..\..\bindings\wxwidgets\wxluawrap.c ! ..\..\..\bin\wxlua.exe: $(WXLUA_OBJECTS) wrap mingw$(WXLIBPOSTFIX)\wxlua_wxlua_rc.o ! $(CXX) -o $@ $(WXLUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -lwxluadebug -lwxluasocket -lwxlua -llua -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxtiff$(WX3RDPARTLIBPOSTFIX) -lwxjpeg$(WX3RDPARTLIBPOSTFIX) -lwxpng$(WX3RDPARTLIBPOSTFIX) -lwxzlib$(WX3RDPARTLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 ! ! mingw$(WXLIBPOSTFIX)\wxlua_wxlua.o: ../../wxlua/src/wxlua.cpp $(CXX) -c -o $@ $(WXLUA_CXXFLAGS) $< ! mingw$(WXLIBPOSTFIX)\wxlua_lconsole.o: ../../wxlua/src/lconsole.cpp $(CXX) -c -o $@ $(WXLUA_CXXFLAGS) $< + mingw$(WXLIBPOSTFIX)\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) + + mingw$(WXLIBPOSTFIX)\wxlua_wxluawrap.o: ../../../bindings/wxwidgets/wxluawrap.c + $(CC) -c -o $@ $(WXLUA_CFLAGS) $< + .PHONY: all clean |
