From: Vadim Zeitlin Date: Fri, 23 Jan 2009 09:23:10 +0000 (+0000) Subject: rebake without persistence files X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ab37ac7075cb22f2f2adfe702dd287848d9bbc72 rebake without persistence files git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 9b1eb7db83..cfa9a6c2ae 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -1701,7 +1701,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_nbkbase.obj \ $(OBJS)\monodll_overlaycmn.obj \ $(OBJS)\monodll_paper.obj \ - $(OBJS)\monodll_persist.obj \ $(OBJS)\monodll_pickerbase.obj \ $(OBJS)\monodll_popupcmn.obj \ $(OBJS)\monodll_prntbase.obj \ @@ -1940,7 +1939,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_nbkbase.obj \ $(OBJS)\monodll_overlaycmn.obj \ $(OBJS)\monodll_paper.obj \ - $(OBJS)\monodll_persist.obj \ $(OBJS)\monodll_pickerbase.obj \ $(OBJS)\monodll_popupcmn.obj \ $(OBJS)\monodll_prntbase.obj \ @@ -2382,7 +2380,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_nbkbase.obj \ $(OBJS)\monolib_overlaycmn.obj \ $(OBJS)\monolib_paper.obj \ - $(OBJS)\monolib_persist.obj \ $(OBJS)\monolib_pickerbase.obj \ $(OBJS)\monolib_popupcmn.obj \ $(OBJS)\monolib_prntbase.obj \ @@ -2621,7 +2618,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_nbkbase.obj \ $(OBJS)\monolib_overlaycmn.obj \ $(OBJS)\monolib_paper.obj \ - $(OBJS)\monolib_persist.obj \ $(OBJS)\monolib_pickerbase.obj \ $(OBJS)\monolib_popupcmn.obj \ $(OBJS)\monolib_prntbase.obj \ @@ -2969,7 +2965,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_nbkbase.obj \ $(OBJS)\coredll_overlaycmn.obj \ $(OBJS)\coredll_paper.obj \ - $(OBJS)\coredll_persist.obj \ $(OBJS)\coredll_pickerbase.obj \ $(OBJS)\coredll_popupcmn.obj \ $(OBJS)\coredll_prntbase.obj \ @@ -3208,7 +3203,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_nbkbase.obj \ $(OBJS)\coredll_overlaycmn.obj \ $(OBJS)\coredll_paper.obj \ - $(OBJS)\coredll_persist.obj \ $(OBJS)\coredll_pickerbase.obj \ $(OBJS)\coredll_popupcmn.obj \ $(OBJS)\coredll_prntbase.obj \ @@ -3453,7 +3447,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_nbkbase.obj \ $(OBJS)\corelib_overlaycmn.obj \ $(OBJS)\corelib_paper.obj \ - $(OBJS)\corelib_persist.obj \ $(OBJS)\corelib_pickerbase.obj \ $(OBJS)\corelib_popupcmn.obj \ $(OBJS)\corelib_prntbase.obj \ @@ -3692,7 +3685,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_nbkbase.obj \ $(OBJS)\corelib_overlaycmn.obj \ $(OBJS)\corelib_paper.obj \ - $(OBJS)\corelib_persist.obj \ $(OBJS)\corelib_pickerbase.obj \ $(OBJS)\corelib_popupcmn.obj \ $(OBJS)\corelib_prntbase.obj \ @@ -7147,11 +7139,6 @@ $(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\paper.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_persist.obj: ..\..\src\common\persist.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\persist.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_pickerbase.obj: ..\..\src\common\pickerbase.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\pickerbase.cpp @@ -9367,11 +9354,6 @@ $(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\paper.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_persist.obj: ..\..\src\common\persist.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\persist.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_pickerbase.obj: ..\..\src\common\pickerbase.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\pickerbase.cpp @@ -11611,11 +11593,6 @@ $(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\paper.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_persist.obj: ..\..\src\common\persist.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\persist.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_pickerbase.obj: ..\..\src\common\pickerbase.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\pickerbase.cpp @@ -12985,11 +12962,6 @@ $(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\paper.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_persist.obj: ..\..\src\common\persist.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\persist.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_pickerbase.obj: ..\..\src\common\pickerbase.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\pickerbase.cpp diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index fc80dd3856..c997f06243 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1719,7 +1719,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_nbkbase.o \ $(OBJS)\monodll_overlaycmn.o \ $(OBJS)\monodll_paper.o \ - $(OBJS)\monodll_persist.o \ $(OBJS)\monodll_pickerbase.o \ $(OBJS)\monodll_popupcmn.o \ $(OBJS)\monodll_prntbase.o \ @@ -1960,7 +1959,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_nbkbase.o \ $(OBJS)\monodll_overlaycmn.o \ $(OBJS)\monodll_paper.o \ - $(OBJS)\monodll_persist.o \ $(OBJS)\monodll_pickerbase.o \ $(OBJS)\monodll_popupcmn.o \ $(OBJS)\monodll_prntbase.o \ @@ -2406,7 +2404,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_nbkbase.o \ $(OBJS)\monolib_overlaycmn.o \ $(OBJS)\monolib_paper.o \ - $(OBJS)\monolib_persist.o \ $(OBJS)\monolib_pickerbase.o \ $(OBJS)\monolib_popupcmn.o \ $(OBJS)\monolib_prntbase.o \ @@ -2647,7 +2644,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_nbkbase.o \ $(OBJS)\monolib_overlaycmn.o \ $(OBJS)\monolib_paper.o \ - $(OBJS)\monolib_persist.o \ $(OBJS)\monolib_pickerbase.o \ $(OBJS)\monolib_popupcmn.o \ $(OBJS)\monolib_prntbase.o \ @@ -3009,7 +3005,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_nbkbase.o \ $(OBJS)\coredll_overlaycmn.o \ $(OBJS)\coredll_paper.o \ - $(OBJS)\coredll_persist.o \ $(OBJS)\coredll_pickerbase.o \ $(OBJS)\coredll_popupcmn.o \ $(OBJS)\coredll_prntbase.o \ @@ -3250,7 +3245,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_nbkbase.o \ $(OBJS)\coredll_overlaycmn.o \ $(OBJS)\coredll_paper.o \ - $(OBJS)\coredll_persist.o \ $(OBJS)\coredll_pickerbase.o \ $(OBJS)\coredll_popupcmn.o \ $(OBJS)\coredll_prntbase.o \ @@ -3501,7 +3495,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_nbkbase.o \ $(OBJS)\corelib_overlaycmn.o \ $(OBJS)\corelib_paper.o \ - $(OBJS)\corelib_persist.o \ $(OBJS)\corelib_pickerbase.o \ $(OBJS)\corelib_popupcmn.o \ $(OBJS)\corelib_prntbase.o \ @@ -3742,7 +3735,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_nbkbase.o \ $(OBJS)\corelib_overlaycmn.o \ $(OBJS)\corelib_paper.o \ - $(OBJS)\corelib_persist.o \ $(OBJS)\corelib_pickerbase.o \ $(OBJS)\corelib_popupcmn.o \ $(OBJS)\corelib_prntbase.o \ @@ -7411,11 +7403,6 @@ $(OBJS)\monodll_paper.o: ../../src/common/paper.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_persist.o: ../../src/common/persist.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\monodll_pickerbase.o: ../../src/common/pickerbase.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -9745,11 +9732,6 @@ $(OBJS)\monolib_paper.o: ../../src/common/paper.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_persist.o: ../../src/common/persist.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\monolib_pickerbase.o: ../../src/common/pickerbase.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -12103,11 +12085,6 @@ $(OBJS)\coredll_paper.o: ../../src/common/paper.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_persist.o: ../../src/common/persist.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\coredll_pickerbase.o: ../../src/common/pickerbase.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -13589,11 +13566,6 @@ $(OBJS)\corelib_paper.o: ../../src/common/paper.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_persist.o: ../../src/common/persist.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\corelib_pickerbase.o: ../../src/common/pickerbase.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 39e4c70c8a..09722b2490 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -1881,7 +1881,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_nbkbase.obj \ $(OBJS)\monodll_overlaycmn.obj \ $(OBJS)\monodll_paper.obj \ - $(OBJS)\monodll_persist.obj \ $(OBJS)\monodll_pickerbase.obj \ $(OBJS)\monodll_popupcmn.obj \ $(OBJS)\monodll_prntbase.obj \ @@ -2120,7 +2119,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_nbkbase.obj \ $(OBJS)\monodll_overlaycmn.obj \ $(OBJS)\monodll_paper.obj \ - $(OBJS)\monodll_persist.obj \ $(OBJS)\monodll_pickerbase.obj \ $(OBJS)\monodll_popupcmn.obj \ $(OBJS)\monodll_prntbase.obj \ @@ -2568,7 +2566,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_nbkbase.obj \ $(OBJS)\monolib_overlaycmn.obj \ $(OBJS)\monolib_paper.obj \ - $(OBJS)\monolib_persist.obj \ $(OBJS)\monolib_pickerbase.obj \ $(OBJS)\monolib_popupcmn.obj \ $(OBJS)\monolib_prntbase.obj \ @@ -2807,7 +2804,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_nbkbase.obj \ $(OBJS)\monolib_overlaycmn.obj \ $(OBJS)\monolib_paper.obj \ - $(OBJS)\monolib_persist.obj \ $(OBJS)\monolib_pickerbase.obj \ $(OBJS)\monolib_popupcmn.obj \ $(OBJS)\monolib_prntbase.obj \ @@ -3185,7 +3181,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_nbkbase.obj \ $(OBJS)\coredll_overlaycmn.obj \ $(OBJS)\coredll_paper.obj \ - $(OBJS)\coredll_persist.obj \ $(OBJS)\coredll_pickerbase.obj \ $(OBJS)\coredll_popupcmn.obj \ $(OBJS)\coredll_prntbase.obj \ @@ -3424,7 +3419,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_nbkbase.obj \ $(OBJS)\coredll_overlaycmn.obj \ $(OBJS)\coredll_paper.obj \ - $(OBJS)\coredll_persist.obj \ $(OBJS)\coredll_pickerbase.obj \ $(OBJS)\coredll_popupcmn.obj \ $(OBJS)\coredll_prntbase.obj \ @@ -3675,7 +3669,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_nbkbase.obj \ $(OBJS)\corelib_overlaycmn.obj \ $(OBJS)\corelib_paper.obj \ - $(OBJS)\corelib_persist.obj \ $(OBJS)\corelib_pickerbase.obj \ $(OBJS)\corelib_popupcmn.obj \ $(OBJS)\corelib_prntbase.obj \ @@ -3914,7 +3907,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_nbkbase.obj \ $(OBJS)\corelib_overlaycmn.obj \ $(OBJS)\corelib_paper.obj \ - $(OBJS)\corelib_persist.obj \ $(OBJS)\corelib_pickerbase.obj \ $(OBJS)\corelib_popupcmn.obj \ $(OBJS)\corelib_prntbase.obj \ @@ -7493,11 +7485,6 @@ $(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\paper.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_persist.obj: ..\..\src\common\persist.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\persist.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_pickerbase.obj: ..\..\src\common\pickerbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\pickerbase.cpp @@ -9713,11 +9700,6 @@ $(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\paper.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_persist.obj: ..\..\src\common\persist.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\persist.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_pickerbase.obj: ..\..\src\common\pickerbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\pickerbase.cpp @@ -11957,11 +11939,6 @@ $(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\paper.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_persist.obj: ..\..\src\common\persist.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\persist.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_pickerbase.obj: ..\..\src\common\pickerbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\pickerbase.cpp @@ -13331,11 +13308,6 @@ $(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\paper.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_persist.obj: ..\..\src\common\persist.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\persist.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_pickerbase.obj: ..\..\src\common\pickerbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\pickerbase.cpp diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index 42ae60c64f..09bafb5599 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -398,7 +398,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_nbkbase.obj & $(OBJS)\monodll_overlaycmn.obj & $(OBJS)\monodll_paper.obj & - $(OBJS)\monodll_persist.obj & $(OBJS)\monodll_pickerbase.obj & $(OBJS)\monodll_popupcmn.obj & $(OBJS)\monodll_prntbase.obj & @@ -639,7 +638,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_nbkbase.obj & $(OBJS)\monodll_overlaycmn.obj & $(OBJS)\monodll_paper.obj & - $(OBJS)\monodll_persist.obj & $(OBJS)\monodll_pickerbase.obj & $(OBJS)\monodll_popupcmn.obj & $(OBJS)\monodll_prntbase.obj & @@ -1090,7 +1088,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_nbkbase.obj & $(OBJS)\monolib_overlaycmn.obj & $(OBJS)\monolib_paper.obj & - $(OBJS)\monolib_persist.obj & $(OBJS)\monolib_pickerbase.obj & $(OBJS)\monolib_popupcmn.obj & $(OBJS)\monolib_prntbase.obj & @@ -1331,7 +1328,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_nbkbase.obj & $(OBJS)\monolib_overlaycmn.obj & $(OBJS)\monolib_paper.obj & - $(OBJS)\monolib_persist.obj & $(OBJS)\monolib_pickerbase.obj & $(OBJS)\monolib_popupcmn.obj & $(OBJS)\monolib_prntbase.obj & @@ -1704,7 +1700,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_nbkbase.obj & $(OBJS)\coredll_overlaycmn.obj & $(OBJS)\coredll_paper.obj & - $(OBJS)\coredll_persist.obj & $(OBJS)\coredll_pickerbase.obj & $(OBJS)\coredll_popupcmn.obj & $(OBJS)\coredll_prntbase.obj & @@ -1945,7 +1940,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_nbkbase.obj & $(OBJS)\coredll_overlaycmn.obj & $(OBJS)\coredll_paper.obj & - $(OBJS)\coredll_persist.obj & $(OBJS)\coredll_pickerbase.obj & $(OBJS)\coredll_popupcmn.obj & $(OBJS)\coredll_prntbase.obj & @@ -2198,7 +2192,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_nbkbase.obj & $(OBJS)\corelib_overlaycmn.obj & $(OBJS)\corelib_paper.obj & - $(OBJS)\corelib_persist.obj & $(OBJS)\corelib_pickerbase.obj & $(OBJS)\corelib_popupcmn.obj & $(OBJS)\corelib_prntbase.obj & @@ -2439,7 +2432,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_nbkbase.obj & $(OBJS)\corelib_overlaycmn.obj & $(OBJS)\corelib_paper.obj & - $(OBJS)\corelib_persist.obj & $(OBJS)\corelib_pickerbase.obj & $(OBJS)\corelib_popupcmn.obj & $(OBJS)\corelib_prntbase.obj & @@ -7656,11 +7648,6 @@ $(OBJS)\monodll_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\monodll_persist.obj : .AUTODEPEND ..\..\src\common\persist.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\monodll_pickerbase.obj : .AUTODEPEND ..\..\src\common\pickerbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -9990,11 +9977,6 @@ $(OBJS)\monolib_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\monolib_persist.obj : .AUTODEPEND ..\..\src\common\persist.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\monolib_pickerbase.obj : .AUTODEPEND ..\..\src\common\pickerbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -12348,11 +12330,6 @@ $(OBJS)\coredll_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\coredll_persist.obj : .AUTODEPEND ..\..\src\common\persist.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\coredll_pickerbase.obj : .AUTODEPEND ..\..\src\common\pickerbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -13834,11 +13811,6 @@ $(OBJS)\corelib_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\corelib_persist.obj : .AUTODEPEND ..\..\src\common\persist.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\corelib_pickerbase.obj : .AUTODEPEND ..\..\src\common\pickerbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index 0633e43ab2..07f58a9f13 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -562,10 +562,6 @@ SOURCE=..\..\src\common\paper.cpp # End Source File # Begin Source File -SOURCE=..\..\src\common\persist.cpp -# End Source File -# Begin Source File - SOURCE=..\..\src\common\pickerbase.cpp # End Source File # Begin Source File @@ -5746,10 +5742,6 @@ SOURCE=..\..\include\wx\bmpcbox.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\persist\bookctrl.h -# End Source File -# Begin Source File - SOURCE=..\..\include\wx\bookctrl.h # End Source File # Begin Source File @@ -5834,10 +5826,6 @@ SOURCE=..\..\include\wx\combobox.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\persist\common.h -# End Source File -# Begin Source File - SOURCE=..\..\include\wx\control.h # End Source File # Begin Source File @@ -6518,10 +6506,6 @@ SOURCE=..\..\include\wx\toplevel.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\persist\toplevel.h -# End Source File -# Begin Source File - SOURCE=..\..\include\wx\treebase.h # End Source File # Begin Source File diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj index 7207d902ee..e0523118cf 100644 --- a/build/msw/wx_vc7_core.vcproj +++ b/build/msw/wx_vc7_core.vcproj @@ -801,9 +801,6 @@ - - @@ -3559,9 +3556,6 @@ - - @@ -3625,9 +3619,6 @@ - - @@ -4138,9 +4129,6 @@ - - diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj index 9bc0b3aae2..bfc07fd603 100644 --- a/build/msw/wx_vc8_core.vcproj +++ b/build/msw/wx_vc8_core.vcproj @@ -1106,10 +1106,6 @@ RelativePath="..\..\src\common\paper.cpp" > - - @@ -4767,10 +4763,6 @@ RelativePath="..\..\include\wx\bmpcbox.h" > - - @@ -4855,10 +4847,6 @@ RelativePath="..\..\include\wx\combobox.h" > - - @@ -5539,10 +5527,6 @@ RelativePath="..\..\include\wx\toplevel.h" > - - diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj index ba0fdf2585..3e6620b500 100644 --- a/build/msw/wx_vc9_core.vcproj +++ b/build/msw/wx_vc9_core.vcproj @@ -1102,10 +1102,6 @@ RelativePath="..\..\src\common\paper.cpp" > - - @@ -4763,10 +4759,6 @@ RelativePath="..\..\include\wx\bmpcbox.h" > - - @@ -4851,10 +4843,6 @@ RelativePath="..\..\include\wx\combobox.h" > - - @@ -5535,10 +5523,6 @@ RelativePath="..\..\include\wx\toplevel.h" > - -