Menu
▾
▴
[Wxlua-commit] wxLua/modules/build/msw makefile.bcc,1.4,1.5 makefile.gcc,1.4,1.5 makefile.vc,1.2,1.3 makefile.wat,1.2,1.3
|
From: Francesco <fr...@us...> - 2005-06-19 19:11:17
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7921/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Updated makefiles Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/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 21:44:42 -0000 1.2 --- makefile.vc 19 Jun 2005 19:11:07 -0000 1.3 *************** *** 106,109 **** --- 106,127 ---- msvc$(WXLIBPOSTFIX)\wxlua_dll_interp.obj \ msvc$(WXLIBPOSTFIX)\wxlua_dll_library.obj + WXBIND_LIB_CXXFLAGS = /MD$(__DEBUGRUNTIME) /DWIN32 $(__WXUNICODE_DEFINE_p) \ + $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ + /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ + /I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \ + $(__DEBUGINFO) /Fd..\..\..\lib\vc_lib\wxbind.pdb $(____DEBUGRUNTIME) \ + $(__WX_SHAREDDEFINE_p) /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) + WXBIND_LIB_OBJECTS = \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_wxlhtmlwin.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.obj + WXBIND_DLL_CXXFLAGS = /MD$(__DEBUGRUNTIME) /DWIN32 $(__WXUNICODE_DEFINE_p) \ + $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ + /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ + /I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \ + $(__DEBUGINFO) /Fd..\..\..\lib\vc_dll\wxbind_dll.pdb $(____DEBUGRUNTIME) \ + $(__WX_SHAREDDEFINE_p) /DA2DWXBINDMAKINGDLL /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) + WXBIND_DLL_OBJECTS = \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_wxlhtmlwin.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_wxlprint.obj WXLUADEBUG_LIB_CXXFLAGS = /MD$(__DEBUGRUNTIME) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ *************** *** 163,166 **** --- 181,190 ---- !endif !if "$(WX_SHARED)" == "0" + __wxbind_lib___depname = ..\..\..\lib\vc_lib\wxbind.lib + !endif + !if "$(WX_SHARED)" == "1" + __wxbind_dll___depname = ..\..\..\lib\vc_dll\wxbind_dll.dll + !endif + !if "$(WX_SHARED)" == "0" __wxluadebug_lib___depname = ..\..\..\lib\vc_lib\wxluadebug.lib !endif *************** *** 175,182 **** !endif !if "$(WX_DEBUG)" == "0" ! __DEBUGINFO_1 = !endif !if "$(WX_DEBUG)" == "1" ! __DEBUGINFO_1 = /DEBUG !endif !if "$(WX_SHARED)" == "0" --- 199,206 ---- !endif !if "$(WX_DEBUG)" == "0" ! __DEBUGINFO_2 = !endif !if "$(WX_DEBUG)" == "1" ! __DEBUGINFO_2 = /DEBUG !endif !if "$(WX_SHARED)" == "0" *************** *** 248,252 **** ### Targets: ### ! all: ..\..\..\lib\vc_lib ..\..\..\lib\vc_dll ..\..\..\lib\vc_lib\lua.lib ..\..\..\bin\lua.exe $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) clean: --- 272,276 ---- ### Targets: ### ! all: ..\..\..\lib\vc_lib ..\..\..\lib\vc_dll ..\..\..\lib\vc_lib\lua.lib ..\..\..\bin\lua.exe $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxbind_lib___depname) $(__wxbind_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) clean: *************** *** 263,266 **** --- 287,295 ---- -if exist ..\..\..\lib\vc_dll\wxlua_dll.pdb del ..\..\..\lib\vc_dll\wxlua_dll.pdb -if exist ..\..\..\lib\vc_dll\wxlua.lib del ..\..\..\lib\vc_dll\wxlua.lib + -if exist ..\..\..\lib\vc_lib\wxbind.lib del ..\..\..\lib\vc_lib\wxbind.lib + -if exist ..\..\..\lib\vc_dll\wxbind_dll.dll del ..\..\..\lib\vc_dll\wxbind_dll.dll + -if exist ..\..\..\lib\vc_dll\wxbind_dll.ilk del ..\..\..\lib\vc_dll\wxbind_dll.ilk + -if exist ..\..\..\lib\vc_dll\wxbind_dll.pdb del ..\..\..\lib\vc_dll\wxbind_dll.pdb + -if exist ..\..\..\lib\vc_dll\wxbind.lib del ..\..\..\lib\vc_dll\wxbind.lib -if exist ..\..\..\lib\vc_lib\wxluadebug.lib del ..\..\..\lib\vc_lib\wxluadebug.lib -if exist ..\..\..\lib\vc_dll\wxluadebug_dll.dll del ..\..\..\lib\vc_dll\wxluadebug_dll.dll *************** *** 301,305 **** !if "$(WX_SHARED)" == "1" ..\..\..\lib\vc_dll\wxlua_dll.dll: $(WXLUA_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_1) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< $(WXLUA_DLL_OBJECTS) wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.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 /IMPLIB:..\..\..\lib\vc_dll\wxlua.lib << --- 330,334 ---- !if "$(WX_SHARED)" == "1" ..\..\..\lib\vc_dll\wxlua_dll.dll: $(WXLUA_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_2) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< $(WXLUA_DLL_OBJECTS) wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.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 /IMPLIB:..\..\..\lib\vc_dll\wxlua.lib << *************** *** 307,310 **** --- 336,354 ---- !if "$(WX_SHARED)" == "0" + ..\..\..\lib\vc_lib\wxbind.lib: $(WXBIND_LIB_OBJECTS) + if exist $@ del $@ + lib /NOLOGO /OUT:$@ @<< + $(WXBIND_LIB_OBJECTS) + << + !endif + + !if "$(WX_SHARED)" == "1" + ..\..\..\lib\vc_dll\wxbind_dll.dll: $(WXBIND_DLL_OBJECTS) + link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_2) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< + $(WXBIND_DLL_OBJECTS) wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.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 /IMPLIB:..\..\..\lib\vc_dll\wxbind.lib + << + !endif + + !if "$(WX_SHARED)" == "0" ..\..\..\lib\vc_lib\wxluadebug.lib: $(WXLUADEBUG_LIB_OBJECTS) if exist $@ del $@ *************** *** 316,320 **** !if "$(WX_SHARED)" == "1" ..\..\..\lib\vc_dll\wxluadebug_dll.dll: $(WXLUADEBUG_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_1) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< $(WXLUADEBUG_DLL_OBJECTS) wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.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 /IMPLIB:..\..\..\lib\vc_dll\wxluadebug.lib << --- 360,364 ---- !if "$(WX_SHARED)" == "1" ..\..\..\lib\vc_dll\wxluadebug_dll.dll: $(WXLUADEBUG_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_2) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< $(WXLUADEBUG_DLL_OBJECTS) wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.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 /IMPLIB:..\..\..\lib\vc_dll\wxluadebug.lib << *************** *** 331,335 **** !if "$(WX_SHARED)" == "1" ..\..\..\lib\vc_dll\wxluasocket_dll.dll: $(WXLUASOCKET_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_1) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< $(WXLUASOCKET_DLL_OBJECTS) wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.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 /IMPLIB:..\..\..\lib\vc_dll\wxluasocket.lib << --- 375,379 ---- !if "$(WX_SHARED)" == "1" ..\..\..\lib\vc_dll\wxluasocket_dll.dll: $(WXLUASOCKET_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_2) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< $(WXLUASOCKET_DLL_OBJECTS) wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.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 /IMPLIB:..\..\..\lib\vc_dll\wxluasocket.lib << *************** *** 444,447 **** --- 488,503 ---- $(CXX) /c /nologo /TP /Fo$@ $(WXLUA_DLL_CXXFLAGS) $** + msvc$(WXLIBPOSTFIX)\wxbind_lib_wxlhtmlwin.obj: ..\..\wxbind\src\wxlhtmlwin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.obj: ..\..\wxbind\src\wxlprint.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_wxlhtmlwin.obj: ..\..\wxbind\src\wxlhtmlwin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxbind_dll_wxlprint.obj: ..\..\wxbind\src\wxlprint.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + msvc$(WXLIBPOSTFIX)\wxluadebug_lib_debug.obj: ..\..\wxluadebug\src\debug.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXLUADEBUG_LIB_CXXFLAGS) $** Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.bcc 14 Jun 2005 21:44:41 -0000 1.4 --- makefile.bcc 19 Jun 2005 19:11:07 -0000 1.5 *************** *** 135,138 **** --- 135,154 ---- borland$(WXLIBPOSTFIX)\wxlua_dll_interp.obj \ borland$(WXLIBPOSTFIX)\wxlua_dll_library.obj + WXBIND_LIB_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) $(__DEBUGINFO) -tWM \ + $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) + WXBIND_LIB_OBJECTS = \ + borland$(WXLIBPOSTFIX)\wxbind_lib_wxlhtmlwin.obj \ + borland$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.obj + WXBIND_DLL_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) $(__DEBUGINFO) -tWM \ + $(__WX_SHAREDDEFINE_p) -DA2DWXBINDMAKINGDLL $(CPPFLAGS) $(CXXFLAGS) + WXBIND_DLL_OBJECTS = \ + borland$(WXLIBPOSTFIX)\wxbind_dll_wxlhtmlwin.obj \ + borland$(WXLIBPOSTFIX)\wxbind_dll_wxlprint.obj WXLUADEBUG_LIB_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ *************** *** 186,189 **** --- 202,211 ---- !endif !if "$(WX_SHARED)" == "0" + __wxbind_lib___depname = ..\..\..\lib\bcc_lib\wxbind.lib + !endif + !if "$(WX_SHARED)" == "1" + __wxbind_dll___depname = ..\..\..\lib\bcc_dll\wxbind_dll.dll + !endif + !if "$(WX_SHARED)" == "0" __wxluadebug_lib___depname = ..\..\..\lib\bcc_lib\wxluadebug.lib !endif *************** *** 247,251 **** ### Targets: ### ! all: ..\..\..\lib\bcc_lib ..\..\..\lib\bcc_dll ..\..\..\lib\bcc_lib\lua.lib ..\..\..\bin\lua.exe $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) clean: --- 269,273 ---- ### Targets: ### ! all: ..\..\..\lib\bcc_lib ..\..\..\lib\bcc_dll ..\..\..\lib\bcc_lib\lua.lib ..\..\..\bin\lua.exe $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxbind_lib___depname) $(__wxbind_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) clean: *************** *** 268,271 **** --- 290,301 ---- -if exist ..\..\..\lib\bcc_dll\wxlua_dll.ils del ..\..\..\lib\bcc_dll\wxlua_dll.ils -if exist ..\..\..\lib\bcc_dll\wxlua.lib del ..\..\..\lib\bcc_dll\wxlua.lib + -if exist ..\..\..\lib\bcc_lib\wxbind.lib del ..\..\..\lib\bcc_lib\wxbind.lib + -if exist ..\..\..\lib\bcc_dll\wxbind_dll.dll del ..\..\..\lib\bcc_dll\wxbind_dll.dll + -if exist ..\..\..\lib\bcc_dll\wxbind_dll.tds del ..\..\..\lib\bcc_dll\wxbind_dll.tds + -if exist ..\..\..\lib\bcc_dll\wxbind_dll.ilc del ..\..\..\lib\bcc_dll\wxbind_dll.ilc + -if exist ..\..\..\lib\bcc_dll\wxbind_dll.ild del ..\..\..\lib\bcc_dll\wxbind_dll.ild + -if exist ..\..\..\lib\bcc_dll\wxbind_dll.ilf del ..\..\..\lib\bcc_dll\wxbind_dll.ilf + -if exist ..\..\..\lib\bcc_dll\wxbind_dll.ils del ..\..\..\lib\bcc_dll\wxbind_dll.ils + -if exist ..\..\..\lib\bcc_dll\wxbind.lib del ..\..\..\lib\bcc_dll\wxbind.lib -if exist ..\..\..\lib\bcc_lib\wxluadebug.lib del ..\..\..\lib\bcc_lib\wxluadebug.lib -if exist ..\..\..\lib\bcc_dll\wxluadebug_dll.dll del ..\..\..\lib\bcc_dll\wxluadebug_dll.dll *************** *** 319,322 **** --- 349,368 ---- !if "$(WX_SHARED)" == "0" + ..\..\..\lib\bcc_lib\wxbind.lib: $(WXBIND_LIB_OBJECTS) + if exist $@ del $@ + tlib /a /p4096 $@ @&&| + $(WXBIND_LIB_OBJECTS) + | + !endif + + !if "$(WX_SHARED)" == "1" + ..\..\..\lib\bcc_dll\wxbind_dll.dll: $(WXBIND_DLL_OBJECTS) + ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| + c0d32.obj $(WXBIND_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.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,, + | + implib -f ..\..\..\lib\bcc_dll\wxbind $@ + !endif + + !if "$(WX_SHARED)" == "0" ..\..\..\lib\bcc_lib\wxluadebug.lib: $(WXLUADEBUG_LIB_OBJECTS) if exist $@ del $@ *************** *** 458,461 **** --- 504,519 ---- $(CXX) -q -c -P -o$@ $(WXLUA_DLL_CXXFLAGS) $** + borland$(WXLIBPOSTFIX)\wxbind_lib_wxlhtmlwin.obj: ..\..\wxbind\src\wxlhtmlwin.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.obj: ..\..\wxbind\src\wxlprint.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_wxlhtmlwin.obj: ..\..\wxbind\src\wxlhtmlwin.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbind_dll_wxlprint.obj: ..\..\wxbind\src\wxlprint.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + borland$(WXLIBPOSTFIX)\wxluadebug_lib_debug.obj: ..\..\wxluadebug\src\debug.cpp $(CXX) -q -c -P -o$@ $(WXLUADEBUG_LIB_CXXFLAGS) $** Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/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 21:44:42 -0000 1.2 --- makefile.wat 19 Jun 2005 19:11:07 -0000 1.3 *************** *** 79,82 **** --- 79,90 ---- __wxlua_dll___depname = ..\..\..\lib\wat_dll\wxlua_dll.dll !endif + __wxbind_lib___depname = + !ifeq WX_SHARED 0 + __wxbind_lib___depname = ..\..\..\lib\wat_lib\wxbind.lib + !endif + __wxbind_dll___depname = + !ifeq WX_SHARED 1 + __wxbind_dll___depname = ..\..\..\lib\wat_dll\wxbind_dll.dll + !endif __wxluadebug_lib___depname = !ifeq WX_SHARED 0 *************** *** 95,104 **** __wxluasocket_dll___depname = ..\..\..\lib\wat_dll\wxluasocket_dll.dll !endif ! __DEBUGINFO_1 = !ifeq WX_DEBUG 0 ! __DEBUGINFO_1 = !endif !ifeq WX_DEBUG 1 ! __DEBUGINFO_1 = debug all !endif __WXLUA_OUTPUT_FOLDER_FILENAMES = --- 103,112 ---- __wxluasocket_dll___depname = ..\..\..\lib\wat_dll\wxluasocket_dll.dll !endif ! __DEBUGINFO_3 = !ifeq WX_DEBUG 0 ! __DEBUGINFO_3 = !endif !ifeq WX_DEBUG 1 ! __DEBUGINFO_3 = debug all !endif __WXLUA_OUTPUT_FOLDER_FILENAMES = *************** *** 219,222 **** --- 227,245 ---- watcom$(WXLIBPOSTFIX)\wxlua_dll_interp.obj & watcom$(WXLIBPOSTFIX)\wxlua_dll_library.obj + WXBIND_LIB_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & + -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & + -i=$(WX_DIR)\include -i=..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) & + $(__DEBUGINFO) -bm $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) + WXBIND_LIB_OBJECTS = & + watcom$(WXLIBPOSTFIX)\wxbind_lib_wxlhtmlwin.obj & + watcom$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.obj + WXBIND_DLL_CXXFLAGS = -bd $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & + -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & + -i=$(WX_DIR)\include -i=..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) & + $(__DEBUGINFO) -bm $(__WX_SHAREDDEFINE_p) -dA2DWXBINDMAKINGDLL $(CPPFLAGS) & + $(CXXFLAGS) + WXBIND_DLL_OBJECTS = & + watcom$(WXLIBPOSTFIX)\wxbind_dll_wxlhtmlwin.obj & + watcom$(WXLIBPOSTFIX)\wxbind_dll_wxlprint.obj WXLUADEBUG_LIB_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & *************** *** 263,267 **** ### Targets: ### ! all : .SYMBOLIC ..\..\..\lib\wat_lib ..\..\..\lib\wat_dll ..\..\..\lib\wat_lib\lua.lib ..\..\..\bin\lua.exe $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) clean : .SYMBOLIC --- 286,290 ---- ### Targets: ### ! all : .SYMBOLIC ..\..\..\lib\wat_lib ..\..\..\lib\wat_dll ..\..\..\lib\wat_lib\lua.lib ..\..\..\bin\lua.exe $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxbind_lib___depname) $(__wxbind_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) clean : .SYMBOLIC *************** *** 276,279 **** --- 299,305 ---- -if exist ..\..\..\lib\wat_dll\wxlua_dll.dll del ..\..\..\lib\wat_dll\wxlua_dll.dll -if exist ..\..\..\lib\wat_dll\wxlua.lib del ..\..\..\lib\wat_dll\wxlua.lib + -if exist ..\..\..\lib\wat_lib\wxbind.lib del ..\..\..\lib\wat_lib\wxbind.lib + -if exist ..\..\..\lib\wat_dll\wxbind_dll.dll del ..\..\..\lib\wat_dll\wxbind_dll.dll + -if exist ..\..\..\lib\wat_dll\wxbind.lib del ..\..\..\lib\wat_dll\wxbind.lib -if exist ..\..\..\lib\wat_lib\wxluadebug.lib del ..\..\..\lib\wat_lib\wxluadebug.lib -if exist ..\..\..\lib\wat_dll\wxluadebug_dll.dll del ..\..\..\lib\wat_dll\wxluadebug_dll.dll *************** *** 318,322 **** @%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_1) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(WXLUA_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc file %i @for %i in ( wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.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_dll.lbc library %i --- 344,348 ---- @%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_3) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(WXLUA_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc file %i @for %i in ( wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.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_dll.lbc library %i *************** *** 328,331 **** --- 354,379 ---- !ifeq WX_SHARED 0 + ..\..\..\lib\wat_lib\wxbind.lib : $(WXBIND_LIB_OBJECTS) + @%create watcom$(WXLIBPOSTFIX)\wxbind_lib.lbc + @for %i in ($(WXBIND_LIB_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxbind_lib.lbc +%i + wlib -q -p4096 -n -b $^@ @watcom$(WXLIBPOSTFIX)\wxbind_lib.lbc + !endif + + !ifeq WX_SHARED 1 + ..\..\..\lib\wat_dll\wxbind_dll.dll : $(WXBIND_DLL_OBJECTS) + @%create watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc + @%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc option quiet + @%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc name $^@ + @%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc option caseexact + @%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_3) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) + @for %i in ($(WXBIND_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc file %i + @for %i in ( wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.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)\wxbind_dll.lbc library %i + @%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc + @%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc system nt_dll + wlink @watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc + wlib -q -n -b ..\..\..\lib\wat_dll\wxbind.lib +$^@ + !endif + + !ifeq WX_SHARED 0 ..\..\..\lib\wat_lib\wxluadebug.lib : $(WXLUADEBUG_LIB_OBJECTS) @%create watcom$(WXLIBPOSTFIX)\wxluadebug_lib.lbc *************** *** 340,344 **** @%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_1) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(WXLUADEBUG_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc file %i @for %i in ( wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.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)\wxluadebug_dll.lbc library %i --- 388,392 ---- @%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_3) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(WXLUADEBUG_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc file %i @for %i in ( wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.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)\wxluadebug_dll.lbc library %i *************** *** 362,366 **** @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_1) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(WXLUASOCKET_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc file %i @for %i in ( wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.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)\wxluasocket_dll.lbc library %i --- 410,414 ---- @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_3) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(WXLUASOCKET_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc file %i @for %i in ( wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.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)\wxluasocket_dll.lbc library %i *************** *** 479,482 **** --- 527,542 ---- $(CXX) -zq -fo=$^@ $(WXLUA_DLL_CXXFLAGS) $< + watcom$(WXLIBPOSTFIX)\wxbind_lib_wxlhtmlwin.obj : .AUTODEPEND ..\..\wxbind\src\wxlhtmlwin.cpp + $(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.obj : .AUTODEPEND ..\..\wxbind\src\wxlprint.cpp + $(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\wxbind_dll_wxlhtmlwin.obj : .AUTODEPEND ..\..\wxbind\src\wxlhtmlwin.cpp + $(CXX) -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\wxbind_dll_wxlprint.obj : .AUTODEPEND ..\..\wxbind\src\wxlprint.cpp + $(CXX) -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $< + watcom$(WXLIBPOSTFIX)\wxluadebug_lib_debug.obj : .AUTODEPEND ..\..\wxluadebug\src\debug.cpp $(CXX) -zq -fo=$^@ $(WXLUADEBUG_LIB_CXXFLAGS) $< Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.gcc 14 Jun 2005 21:44:41 -0000 1.4 --- makefile.gcc 19 Jun 2005 19:11:07 -0000 1.5 *************** *** 105,108 **** --- 105,125 ---- mingw$(WXLIBPOSTFIX)\wxlua_dll_interp.o \ mingw$(WXLIBPOSTFIX)\wxlua_dll_library.o + WXBIND_LIB_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) $(__OPTIMIZEFLAG) \ + $(__DEBUGINFO) -mthreads $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) + WXBIND_LIB_OBJECTS = \ + mingw$(WXLIBPOSTFIX)\wxbind_lib_wxlhtmlwin.o \ + mingw$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.o + WXBIND_DLL_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) $(__OPTIMIZEFLAG) \ + $(__DEBUGINFO) -mthreads $(__WX_SHAREDDEFINE_p) -DA2DWXBINDMAKINGDLL \ + $(CPPFLAGS) $(CXXFLAGS) + WXBIND_DLL_OBJECTS = \ + mingw$(WXLIBPOSTFIX)\wxbind_dll_wxlhtmlwin.o \ + mingw$(WXLIBPOSTFIX)\wxbind_dll_wxlprint.o WXLUADEBUG_LIB_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ *************** *** 158,161 **** --- 175,184 ---- endif ifeq ($(WX_SHARED),0) + __wxbind_lib___depname = ..\..\..\lib\gcc_lib\libwxbind.a + endif + ifeq ($(WX_SHARED),1) + __wxbind_dll___depname = ..\..\..\lib\gcc_dll\wxbind_dll.dll + endif + ifeq ($(WX_SHARED),0) __wxluadebug_lib___depname = ..\..\..\lib\gcc_lib\libwxluadebug.a endif *************** *** 231,235 **** ### Targets: ### ! all: ..\..\..\lib\gcc_lib ..\..\..\lib\gcc_dll ..\..\..\lib\gcc_lib\liblua.a ..\..\..\bin\lua.exe $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) clean: --- 254,258 ---- ### Targets: ### ! all: ..\..\..\lib\gcc_lib ..\..\..\lib\gcc_dll ..\..\..\lib\gcc_lib\liblua.a ..\..\..\bin\lua.exe $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxbind_lib___depname) $(__wxbind_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) clean: *************** *** 240,243 **** --- 263,269 ---- -if exist ..\..\..\lib\gcc_dll\wxlua_dll.dll del ..\..\..\lib\gcc_dll\wxlua_dll.dll -if exist ..\..\..\lib\gcc_dll\libwxlua.a del ..\..\..\lib\gcc_dll\libwxlua.a + -if exist ..\..\..\lib\gcc_lib\libwxbind.a del ..\..\..\lib\gcc_lib\libwxbind.a + -if exist ..\..\..\lib\gcc_dll\wxbind_dll.dll del ..\..\..\lib\gcc_dll\wxbind_dll.dll + -if exist ..\..\..\lib\gcc_dll\libwxbind.a del ..\..\..\lib\gcc_dll\libwxbind.a -if exist ..\..\..\lib\gcc_lib\libwxluadebug.a del ..\..\..\lib\gcc_lib\libwxluadebug.a -if exist ..\..\..\lib\gcc_dll\wxluadebug_dll.dll del ..\..\..\lib\gcc_dll\wxluadebug_dll.dll *************** *** 274,277 **** --- 300,315 ---- ifeq ($(WX_SHARED),0) + ..\..\..\lib\gcc_lib\libwxbind.a: $(WXBIND_LIB_OBJECTS) + if exist $@ del $@ + ar rcu $@ $(WXBIND_LIB_OBJECTS) + ranlib $@ + endif + + ifeq ($(WX_SHARED),1) + ..\..\..\lib\gcc_dll\wxbind_dll.dll: $(WXBIND_DLL_OBJECTS) + $(CXX) -shared -fPIC -o $@ $(WXBIND_DLL_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--out-implib,..\..\..\lib\gcc_dll\libwxbind.a -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -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 + endif + + ifeq ($(WX_SHARED),0) ..\..\..\lib\gcc_lib\libwxluadebug.a: $(WXLUADEBUG_LIB_OBJECTS) if exist $@ del $@ *************** *** 405,408 **** --- 443,458 ---- $(CXX) -c -o $@ $(WXLUA_DLL_CXXFLAGS) $< + mingw$(WXLIBPOSTFIX)\wxbind_lib_wxlhtmlwin.o: ../../wxbind/src/wxlhtmlwin.cpp + $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< + + mingw$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.o: ../../wxbind/src/wxlprint.cpp + $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $< + + mingw$(WXLIBPOSTFIX)\wxbind_dll_wxlhtmlwin.o: ../../wxbind/src/wxlhtmlwin.cpp + $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< + + mingw$(WXLIBPOSTFIX)\wxbind_dll_wxlprint.o: ../../wxbind/src/wxlprint.cpp + $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $< + mingw$(WXLIBPOSTFIX)\wxluadebug_lib_debug.o: ../../wxluadebug/src/debug.cpp $(CXX) -c -o $@ $(WXLUADEBUG_LIB_CXXFLAGS) $< |
