From: John L. <jr...@us...> - 2008-01-10 23:06:31
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20968/wxLua/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Renamed wxcore_wxlprint to wxcore_wxlcore and wxhtml_wxlhtmlwin to wxhtml_wxlhtml since these files contain more than just printing or the htmlwin. Updated configure.ac to check for $WXSTEDIT shell env var and added --with-wxstedit-prefix to make it easier to specify where wxStEdit is. Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** makefile.vc 9 Jan 2008 04:59:58 -0000 1.74 --- makefile.vc 10 Jan 2008 23:06:26 -0000 1.75 *************** *** 345,349 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_sizer.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_windows.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlprint.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_dummy.obj WXBINDCORE_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS_151)$(VAR_199) /DWIN32 \ --- 345,349 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_sizer.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_windows.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlcore.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_dummy.obj WXBINDCORE_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS_151)$(VAR_199) /DWIN32 \ *************** *** 377,381 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_sizer.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_windows.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlprint.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_dummy.obj WXBINDGL_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS_164)$(VAR_199) /DWIN32 \ --- 377,381 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_sizer.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_windows.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlcore.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_dummy.obj WXBINDGL_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS_164)$(VAR_199) /DWIN32 \ *************** *** 421,425 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_bind.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_html.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtmlwin.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_dummy.obj WXBINDHTML_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS_205)$(VAR_199) /DWIN32 \ --- 421,425 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_bind.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_html.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtml.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_dummy.obj WXBINDHTML_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS_205)$(VAR_199) /DWIN32 \ *************** *** 437,441 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_bind.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_html.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtmlwin.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_dummy.obj WXBINDMEDIA_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS_218)$(VAR_199) /DWIN32 \ --- 437,441 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_bind.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_html.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtml.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_dummy.obj WXBINDMEDIA_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS_218)$(VAR_199) /DWIN32 \ *************** *** 2041,2045 **** $(CXX) /c /nologo /TP /Fo$@ $(WXBINDCORE_LIB_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlprint.obj: ..\..\wxbind\src\wxcore_wxlprint.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXBINDCORE_LIB_CXXFLAGS) $** --- 2041,2045 ---- $(CXX) /c /nologo /TP /Fo$@ $(WXBINDCORE_LIB_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlcore.obj: ..\..\wxbind\src\wxcore_wxlcore.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXBINDCORE_LIB_CXXFLAGS) $** *************** *** 2101,2105 **** $(CXX) /c /nologo /TP /Fo$@ $(WXBINDCORE_DLL_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlprint.obj: ..\..\wxbind\src\wxcore_wxlprint.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXBINDCORE_DLL_CXXFLAGS) $** --- 2101,2105 ---- $(CXX) /c /nologo /TP /Fo$@ $(WXBINDCORE_DLL_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlcore.obj: ..\..\wxbind\src\wxcore_wxlcore.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXBINDCORE_DLL_CXXFLAGS) $** *************** *** 2131,2135 **** $(CXX) /c /nologo /TP /Fo$@ $(WXBINDHTML_LIB_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtmlwin.obj: ..\..\wxbind\src\wxhtml_wxlhtmlwin.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXBINDHTML_LIB_CXXFLAGS) $** --- 2131,2135 ---- $(CXX) /c /nologo /TP /Fo$@ $(WXBINDHTML_LIB_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtml.obj: ..\..\wxbind\src\wxhtml_wxlhtml.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXBINDHTML_LIB_CXXFLAGS) $** *************** *** 2143,2147 **** $(CXX) /c /nologo /TP /Fo$@ $(WXBINDHTML_DLL_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtmlwin.obj: ..\..\wxbind\src\wxhtml_wxlhtmlwin.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXBINDHTML_DLL_CXXFLAGS) $** --- 2143,2147 ---- $(CXX) /c /nologo /TP /Fo$@ $(WXBINDHTML_DLL_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtml.obj: ..\..\wxbind\src\wxhtml_wxlhtml.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXBINDHTML_DLL_CXXFLAGS) $** Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** makefile.bcc 9 Jan 2008 04:59:58 -0000 1.75 --- makefile.bcc 10 Jan 2008 23:06:25 -0000 1.76 *************** *** 385,389 **** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_sizer.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_windows.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlprint.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_dummy.obj WXBINDCORE_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ --- 385,389 ---- bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_sizer.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_windows.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlcore.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_dummy.obj WXBINDCORE_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ *************** *** 414,418 **** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_sizer.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_windows.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlprint.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_dummy.obj WXBINDGL_LIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ --- 414,418 ---- bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_sizer.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_windows.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlcore.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_dummy.obj WXBINDGL_LIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ *************** *** 451,455 **** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_bind.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_html.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtmlwin.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_dummy.obj WXBINDHTML_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ --- 451,455 ---- bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_bind.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_html.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtml.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_dummy.obj WXBINDHTML_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ *************** *** 464,468 **** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_bind.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_html.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtmlwin.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_dummy.obj WXBINDMEDIA_LIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ --- 464,468 ---- bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_bind.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_html.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtml.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_dummy.obj WXBINDMEDIA_LIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ *************** *** 1909,1913 **** $(CXX) -q -c -P -o$@ $(WXBINDCORE_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlprint.obj: ..\..\wxbind\src\wxcore_wxlprint.cpp $(CXX) -q -c -P -o$@ $(WXBINDCORE_LIB_CXXFLAGS) $** --- 1909,1913 ---- $(CXX) -q -c -P -o$@ $(WXBINDCORE_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlcore.obj: ..\..\wxbind\src\wxcore_wxlcore.cpp $(CXX) -q -c -P -o$@ $(WXBINDCORE_LIB_CXXFLAGS) $** *************** *** 1969,1973 **** $(CXX) -q -c -P -o$@ $(WXBINDCORE_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlprint.obj: ..\..\wxbind\src\wxcore_wxlprint.cpp $(CXX) -q -c -P -o$@ $(WXBINDCORE_DLL_CXXFLAGS) $** --- 1969,1973 ---- $(CXX) -q -c -P -o$@ $(WXBINDCORE_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlcore.obj: ..\..\wxbind\src\wxcore_wxlcore.cpp $(CXX) -q -c -P -o$@ $(WXBINDCORE_DLL_CXXFLAGS) $** *************** *** 1999,2003 **** $(CXX) -q -c -P -o$@ $(WXBINDHTML_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtmlwin.obj: ..\..\wxbind\src\wxhtml_wxlhtmlwin.cpp $(CXX) -q -c -P -o$@ $(WXBINDHTML_LIB_CXXFLAGS) $** --- 1999,2003 ---- $(CXX) -q -c -P -o$@ $(WXBINDHTML_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtml.obj: ..\..\wxbind\src\wxhtml_wxlhtml.cpp $(CXX) -q -c -P -o$@ $(WXBINDHTML_LIB_CXXFLAGS) $** *************** *** 2011,2015 **** $(CXX) -q -c -P -o$@ $(WXBINDHTML_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtmlwin.obj: ..\..\wxbind\src\wxhtml_wxlhtmlwin.cpp $(CXX) -q -c -P -o$@ $(WXBINDHTML_DLL_CXXFLAGS) $** --- 2011,2015 ---- $(CXX) -q -c -P -o$@ $(WXBINDHTML_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtml.obj: ..\..\wxbind\src\wxhtml_wxlhtml.cpp $(CXX) -q -c -P -o$@ $(WXBINDHTML_DLL_CXXFLAGS) $** Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** makefile.wat 9 Jan 2008 04:59:58 -0000 1.74 --- makefile.wat 10 Jan 2008 23:06:26 -0000 1.75 *************** *** 988,992 **** watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_sizer.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_windows.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlprint.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_dummy.obj WXBINDCORE_DLL_CXXFLAGS = -bd -i=..\..\..\modules\wxbind\setup & --- 988,992 ---- watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_sizer.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_windows.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlcore.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_dummy.obj WXBINDCORE_DLL_CXXFLAGS = -bd -i=..\..\..\modules\wxbind\setup & *************** *** 1015,1019 **** watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_sizer.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_windows.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlprint.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_dummy.obj WXBINDGL_LIB_CXXFLAGS = -i=..\..\..\modules\wxbind\setup $(____WX_SHARED) & --- 1015,1019 ---- watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_sizer.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_windows.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlcore.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_dummy.obj WXBINDGL_LIB_CXXFLAGS = -i=..\..\..\modules\wxbind\setup $(____WX_SHARED) & *************** *** 1046,1050 **** watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_bind.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_html.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtmlwin.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_dummy.obj WXBINDHTML_DLL_CXXFLAGS = -bd -i=..\..\..\modules\wxbind\setup & --- 1046,1050 ---- watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_bind.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_html.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtml.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_dummy.obj WXBINDHTML_DLL_CXXFLAGS = -bd -i=..\..\..\modules\wxbind\setup & *************** *** 1057,1061 **** watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_bind.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_html.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtmlwin.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_dummy.obj WXBINDMEDIA_LIB_CXXFLAGS = -i=..\..\..\modules\wxbind\setup $(____WX_SHARED) & --- 1057,1061 ---- watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_bind.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_html.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtml.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_dummy.obj WXBINDMEDIA_LIB_CXXFLAGS = -i=..\..\..\modules\wxbind\setup $(____WX_SHARED) & *************** *** 2178,2182 **** $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCORE_LIB_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlprint.obj : .AUTODEPEND ..\..\wxbind\src\wxcore_wxlprint.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCORE_LIB_CXXFLAGS) $< --- 2178,2182 ---- $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCORE_LIB_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlcore.obj : .AUTODEPEND ..\..\wxbind\src\wxcore_wxlcore.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCORE_LIB_CXXFLAGS) $< *************** *** 2238,2242 **** $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCORE_DLL_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlprint.obj : .AUTODEPEND ..\..\wxbind\src\wxcore_wxlprint.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCORE_DLL_CXXFLAGS) $< --- 2238,2242 ---- $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCORE_DLL_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlcore.obj : .AUTODEPEND ..\..\wxbind\src\wxcore_wxlcore.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCORE_DLL_CXXFLAGS) $< *************** *** 2268,2272 **** $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDHTML_LIB_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtmlwin.obj : .AUTODEPEND ..\..\wxbind\src\wxhtml_wxlhtmlwin.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDHTML_LIB_CXXFLAGS) $< --- 2268,2272 ---- $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDHTML_LIB_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtml.obj : .AUTODEPEND ..\..\wxbind\src\wxhtml_wxlhtml.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDHTML_LIB_CXXFLAGS) $< *************** *** 2280,2284 **** $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDHTML_DLL_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtmlwin.obj : .AUTODEPEND ..\..\wxbind\src\wxhtml_wxlhtmlwin.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDHTML_DLL_CXXFLAGS) $< --- 2280,2284 ---- $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDHTML_DLL_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtml.obj : .AUTODEPEND ..\..\wxbind\src\wxhtml_wxlhtml.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDHTML_DLL_CXXFLAGS) $< Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** makefile.gcc 9 Jan 2008 04:59:58 -0000 1.74 --- makefile.gcc 10 Jan 2008 23:06:25 -0000 1.75 *************** *** 287,291 **** gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_sizer.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_windows.o \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlprint.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_dummy.o WXBINDCORE_DLL_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ --- 287,291 ---- gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_sizer.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_windows.o \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlcore.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_dummy.o WXBINDCORE_DLL_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ *************** *** 314,318 **** gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_sizer.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_windows.o \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlprint.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_dummy.o WXBINDGL_LIB_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ --- 314,318 ---- gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_sizer.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_windows.o \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlcore.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_dummy.o WXBINDGL_LIB_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ *************** *** 343,347 **** gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_bind.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_html.o \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtmlwin.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_dummy.o WXBINDHTML_DLL_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ --- 343,347 ---- gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_bind.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_html.o \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtml.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_dummy.o WXBINDHTML_DLL_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ *************** *** 354,358 **** gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_bind.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_html.o \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtmlwin.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_dummy.o WXBINDMEDIA_LIB_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ --- 354,358 ---- gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_bind.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_html.o \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtml.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_dummy.o WXBINDMEDIA_LIB_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ *************** *** 1894,1898 **** $(CXX) -c -o $@ $(WXBINDCORE_LIB_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlprint.o: ../../wxbind/src/wxcore_wxlprint.cpp $(CXX) -c -o $@ $(WXBINDCORE_LIB_CXXFLAGS) $(CPPDEPS) $< --- 1894,1898 ---- $(CXX) -c -o $@ $(WXBINDCORE_LIB_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_lib_wxcore_wxlcore.o: ../../wxbind/src/wxcore_wxlcore.cpp $(CXX) -c -o $@ $(WXBINDCORE_LIB_CXXFLAGS) $(CPPDEPS) $< *************** *** 1954,1958 **** $(CXX) -c -o $@ $(WXBINDCORE_DLL_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlprint.o: ../../wxbind/src/wxcore_wxlprint.cpp $(CXX) -c -o $@ $(WXBINDCORE_DLL_CXXFLAGS) $(CPPDEPS) $< --- 1954,1958 ---- $(CXX) -c -o $@ $(WXBINDCORE_DLL_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_wxlcore.o: ../../wxbind/src/wxcore_wxlcore.cpp $(CXX) -c -o $@ $(WXBINDCORE_DLL_CXXFLAGS) $(CPPDEPS) $< *************** *** 1984,1988 **** $(CXX) -c -o $@ $(WXBINDHTML_LIB_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtmlwin.o: ../../wxbind/src/wxhtml_wxlhtmlwin.cpp $(CXX) -c -o $@ $(WXBINDHTML_LIB_CXXFLAGS) $(CPPDEPS) $< --- 1984,1988 ---- $(CXX) -c -o $@ $(WXBINDHTML_LIB_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_lib_wxhtml_wxlhtml.o: ../../wxbind/src/wxhtml_wxlhtml.cpp $(CXX) -c -o $@ $(WXBINDHTML_LIB_CXXFLAGS) $(CPPDEPS) $< *************** *** 1996,2000 **** $(CXX) -c -o $@ $(WXBINDHTML_DLL_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtmlwin.o: ../../wxbind/src/wxhtml_wxlhtmlwin.cpp $(CXX) -c -o $@ $(WXBINDHTML_DLL_CXXFLAGS) $(CPPDEPS) $< --- 1996,2000 ---- $(CXX) -c -o $@ $(WXBINDHTML_DLL_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_wxlhtml.o: ../../wxbind/src/wxhtml_wxlhtml.cpp $(CXX) -c -o $@ $(WXBINDHTML_DLL_CXXFLAGS) $(CPPDEPS) $< |