Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reverted generic dialogs usage in MSW makefiles.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-06-14 11:10:17 +00:00
parent b529769179
commit 6db6859926
7 changed files with 214 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Makefile.in
View File

@@ -2888,8 +2888,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \
monodll_textctrl.o \
monodll_tglbtn.o \
monodll_treectrl.o \
monodll_colrdlgg.o \
monodll_fontdlgg.o \
monodll_fdrepdlg.o \
monodll_fontdlg.o \
monodll_helpchm.o \
@@ -3749,8 +3747,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \
monolib_textctrl.o \
monolib_tglbtn.o \
monolib_treectrl.o \
monolib_colrdlgg.o \
monolib_fontdlgg.o \
monolib_fdrepdlg.o \
monolib_fontdlg.o \
monolib_helpchm.o \
@@ -4782,8 +4778,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \
coredll_textctrl.o \
coredll_tglbtn.o \
coredll_treectrl.o \
coredll_colrdlgg.o \
coredll_fontdlgg.o \
coredll_fdrepdlg.o \
coredll_fontdlg.o \
coredll_helpchm.o \
@@ -5510,8 +5504,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \
corelib_textctrl.o \
corelib_tglbtn.o \
corelib_treectrl.o \
corelib_colrdlgg.o \
corelib_fontdlgg.o \
corelib_fdrepdlg.o \
corelib_fontdlg.o \
corelib_helpchm.o \
@@ -9443,9 +9435,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -9632,9 +9621,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -12389,9 +12375,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@@ -12578,9 +12561,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@@ -15602,9 +15582,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
@@ -15791,9 +15768,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
@@ -18035,9 +18009,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
@@ -18224,9 +18195,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<

2
build/bakefiles/files.bkl
View File

@@ -1295,8 +1295,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<!-- Files used only by desktop MSW port, but *not* WindowsCE one: -->
<set var="MSW_ONLY_SRC" hints="files">
src/generic/colrdlgg.cpp
src/generic/fontdlgg.cpp
src/msw/fdrepdlg.cpp
src/msw/fontdlg.cpp
src/msw/helpchm.cpp

72
build/msw/makefile.bcc
View File

@@ -993,8 +993,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_textctrl.obj \
$(OBJS)\monodll_tglbtn.obj \
$(OBJS)\monodll_treectrl.obj \
$(OBJS)\monodll_colrdlgg.obj \
$(OBJS)\monodll_fontdlgg.obj \
$(OBJS)\monodll_fdrepdlg.obj \
$(OBJS)\monodll_fontdlg.obj \
$(OBJS)\monodll_helpchm.obj \
@@ -1430,8 +1428,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_textctrl.obj \
$(OBJS)\monolib_tglbtn.obj \
$(OBJS)\monolib_treectrl.obj \
$(OBJS)\monolib_colrdlgg.obj \
$(OBJS)\monolib_fontdlgg.obj \
$(OBJS)\monolib_fdrepdlg.obj \
$(OBJS)\monolib_fontdlg.obj \
$(OBJS)\monolib_helpchm.obj \
@@ -1840,8 +1836,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_textctrl.obj \
$(OBJS)\coredll_tglbtn.obj \
$(OBJS)\coredll_treectrl.obj \
$(OBJS)\coredll_colrdlgg.obj \
$(OBJS)\coredll_fontdlgg.obj \
$(OBJS)\coredll_fdrepdlg.obj \
$(OBJS)\coredll_fontdlg.obj \
$(OBJS)\coredll_helpchm.obj \
@@ -2234,8 +2228,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_textctrl.obj \
$(OBJS)\corelib_tglbtn.obj \
$(OBJS)\corelib_treectrl.obj \
$(OBJS)\corelib_colrdlgg.obj \
$(OBJS)\corelib_fontdlgg.obj \
$(OBJS)\corelib_fdrepdlg.obj \
$(OBJS)\corelib_fontdlg.obj \
$(OBJS)\corelib_helpchm.obj \
@@ -3673,12 +3665,18 @@ $(OBJS)\monodll_helpchm.obj: ..\..\src\msw\helpchm.cpp
$(OBJS)\monodll_helpwin.obj: ..\..\src\msw\helpwin.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_mdig.obj: ..\..\src\generic\mdig.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -4339,16 +4337,6 @@ $(OBJS)\monodll_textctrl.obj: ..\..\src\univ\textctrl.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\monodll_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -5149,12 +5137,18 @@ $(OBJS)\monolib_helpchm.obj: ..\..\src\msw\helpchm.cpp
$(OBJS)\monolib_helpwin.obj: ..\..\src\msw\helpwin.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_mdig.obj: ..\..\src\generic\mdig.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -5815,16 +5809,6 @@ $(OBJS)\monolib_textctrl.obj: ..\..\src\univ\textctrl.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\monolib_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -6901,12 +6885,18 @@ $(OBJS)\coredll_helpchm.obj: ..\..\src\msw\helpchm.cpp
$(OBJS)\coredll_helpwin.obj: ..\..\src\msw\helpwin.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_mdig.obj: ..\..\src\generic\mdig.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -7444,16 +7434,6 @@ $(OBJS)\coredll_textctrl.obj: ..\..\src\univ\textctrl.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\coredll_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -8032,12 +8012,18 @@ $(OBJS)\corelib_helpchm.obj: ..\..\src\msw\helpchm.cpp
$(OBJS)\corelib_helpwin.obj: ..\..\src\msw\helpwin.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_mdig.obj: ..\..\src\generic\mdig.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -8575,16 +8561,6 @@ $(OBJS)\corelib_textctrl.obj: ..\..\src\univ\textctrl.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\corelib_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**

72
build/msw/makefile.gcc
View File

@@ -981,8 +981,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_textctrl.o \
$(OBJS)\monodll_tglbtn.o \
$(OBJS)\monodll_treectrl.o \
$(OBJS)\monodll_colrdlgg.o \
$(OBJS)\monodll_fontdlgg.o \
$(OBJS)\monodll_fdrepdlg.o \
$(OBJS)\monodll_fontdlg.o \
$(OBJS)\monodll_helpchm.o \
@@ -1424,8 +1422,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_textctrl.o \
$(OBJS)\monolib_tglbtn.o \
$(OBJS)\monolib_treectrl.o \
$(OBJS)\monolib_colrdlgg.o \
$(OBJS)\monolib_fontdlgg.o \
$(OBJS)\monolib_fdrepdlg.o \
$(OBJS)\monolib_fontdlg.o \
$(OBJS)\monolib_helpchm.o \
@@ -1850,8 +1846,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_textctrl.o \
$(OBJS)\coredll_tglbtn.o \
$(OBJS)\coredll_treectrl.o \
$(OBJS)\coredll_colrdlgg.o \
$(OBJS)\coredll_fontdlgg.o \
$(OBJS)\coredll_fdrepdlg.o \
$(OBJS)\coredll_fontdlg.o \
$(OBJS)\coredll_helpchm.o \
@@ -2252,8 +2246,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_textctrl.o \
$(OBJS)\corelib_tglbtn.o \
$(OBJS)\corelib_treectrl.o \
$(OBJS)\corelib_colrdlgg.o \
$(OBJS)\corelib_fontdlgg.o \
$(OBJS)\corelib_fdrepdlg.o \
$(OBJS)\corelib_fontdlg.o \
$(OBJS)\corelib_helpchm.o \
@@ -3713,12 +3705,18 @@ $(OBJS)\monodll_helpchm.o: ../../src/msw/helpchm.cpp
$(OBJS)\monodll_helpwin.o: ../../src/msw/helpwin.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_colrdlgg.o: ../../src/generic/colrdlgg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_dirdlgg.o: ../../src/generic/dirdlgg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_filedlgg.o: ../../src/generic/filedlgg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_fontdlgg.o: ../../src/generic/fontdlgg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_mdig.o: ../../src/generic/mdig.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -4475,16 +4473,6 @@ $(OBJS)\monodll_textctrl.o: ../../src/univ/textctrl.cpp
endif
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_colrdlgg.o: ../../src/generic/colrdlgg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_fontdlgg.o: ../../src/generic/fontdlgg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
ifeq ($(WXUNIV),0)
$(OBJS)\monodll_fdrepdlg.o: ../../src/msw/fdrepdlg.cpp
@@ -5289,12 +5277,18 @@ $(OBJS)\monolib_helpchm.o: ../../src/msw/helpchm.cpp
$(OBJS)\monolib_helpwin.o: ../../src/msw/helpwin.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_colrdlgg.o: ../../src/generic/colrdlgg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_dirdlgg.o: ../../src/generic/dirdlgg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_filedlgg.o: ../../src/generic/filedlgg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_fontdlgg.o: ../../src/generic/fontdlgg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_mdig.o: ../../src/generic/mdig.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@@ -6051,16 +6045,6 @@ $(OBJS)\monolib_textctrl.o: ../../src/univ/textctrl.cpp
endif
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_colrdlgg.o: ../../src/generic/colrdlgg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_fontdlgg.o: ../../src/generic/fontdlgg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
ifeq ($(WXUNIV),0)
$(OBJS)\monolib_fdrepdlg.o: ../../src/msw/fdrepdlg.cpp
@@ -7141,12 +7125,18 @@ $(OBJS)\coredll_helpchm.o: ../../src/msw/helpchm.cpp
$(OBJS)\coredll_helpwin.o: ../../src/msw/helpwin.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
$(OBJS)\coredll_colrdlgg.o: ../../src/generic/colrdlgg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
$(OBJS)\coredll_dirdlgg.o: ../../src/generic/dirdlgg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
$(OBJS)\coredll_filedlgg.o: ../../src/generic/filedlgg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
$(OBJS)\coredll_fontdlgg.o: ../../src/generic/fontdlgg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
$(OBJS)\coredll_mdig.o: ../../src/generic/mdig.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
@@ -7780,16 +7770,6 @@ $(OBJS)\coredll_textctrl.o: ../../src/univ/textctrl.cpp
endif
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_colrdlgg.o: ../../src/generic/colrdlgg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_fontdlgg.o: ../../src/generic/fontdlgg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
ifeq ($(WXUNIV),0)
$(OBJS)\coredll_fdrepdlg.o: ../../src/msw/fdrepdlg.cpp
@@ -8372,12 +8352,18 @@ $(OBJS)\corelib_helpchm.o: ../../src/msw/helpchm.cpp
$(OBJS)\corelib_helpwin.o: ../../src/msw/helpwin.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
$(OBJS)\corelib_colrdlgg.o: ../../src/generic/colrdlgg.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
$(OBJS)\corelib_dirdlgg.o: ../../src/generic/dirdlgg.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
$(OBJS)\corelib_filedlgg.o: ../../src/generic/filedlgg.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
$(OBJS)\corelib_fontdlgg.o: ../../src/generic/fontdlgg.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
$(OBJS)\corelib_mdig.o: ../../src/generic/mdig.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
@@ -9011,16 +8997,6 @@ $(OBJS)\corelib_textctrl.o: ../../src/univ/textctrl.cpp
endif
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_colrdlgg.o: ../../src/generic/colrdlgg.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_fontdlgg.o: ../../src/generic/fontdlgg.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
endif
ifeq ($(USE_GUI),1)
ifeq ($(WXUNIV),0)
$(OBJS)\corelib_fdrepdlg.o: ../../src/msw/fdrepdlg.cpp

72
build/msw/makefile.vc
View File

@@ -1200,8 +1200,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_textctrl.obj \
$(OBJS)\monodll_tglbtn.obj \
$(OBJS)\monodll_treectrl.obj \
$(OBJS)\monodll_colrdlgg.obj \
$(OBJS)\monodll_fontdlgg.obj \
$(OBJS)\monodll_fdrepdlg.obj \
$(OBJS)\monodll_fontdlg.obj \
$(OBJS)\monodll_helpchm.obj \
@@ -1655,8 +1653,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_textctrl.obj \
$(OBJS)\monolib_tglbtn.obj \
$(OBJS)\monolib_treectrl.obj \
$(OBJS)\monolib_colrdlgg.obj \
$(OBJS)\monolib_fontdlgg.obj \
$(OBJS)\monolib_fdrepdlg.obj \
$(OBJS)\monolib_fontdlg.obj \
$(OBJS)\monolib_helpchm.obj \
@@ -2155,8 +2151,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_textctrl.obj \
$(OBJS)\coredll_tglbtn.obj \
$(OBJS)\coredll_treectrl.obj \
$(OBJS)\coredll_colrdlgg.obj \
$(OBJS)\coredll_fontdlgg.obj \
$(OBJS)\coredll_fdrepdlg.obj \
$(OBJS)\coredll_fontdlg.obj \
$(OBJS)\coredll_helpchm.obj \
@@ -2567,8 +2561,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_textctrl.obj \
$(OBJS)\corelib_tglbtn.obj \
$(OBJS)\corelib_treectrl.obj \
$(OBJS)\corelib_colrdlgg.obj \
$(OBJS)\corelib_fontdlgg.obj \
$(OBJS)\corelib_fdrepdlg.obj \
$(OBJS)\corelib_fontdlg.obj \
$(OBJS)\corelib_helpchm.obj \
@@ -4228,12 +4220,18 @@ $(OBJS)\monodll_helpchm.obj: ..\..\src\msw\helpchm.cpp
$(OBJS)\monodll_helpwin.obj: ..\..\src\msw\helpwin.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_mdig.obj: ..\..\src\generic\mdig.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -4894,16 +4892,6 @@ $(OBJS)\monodll_textctrl.obj: ..\..\src\univ\textctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\monodll_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -5704,12 +5692,18 @@ $(OBJS)\monolib_helpchm.obj: ..\..\src\msw\helpchm.cpp
$(OBJS)\monolib_helpwin.obj: ..\..\src\msw\helpwin.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_mdig.obj: ..\..\src\generic\mdig.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -6370,16 +6364,6 @@ $(OBJS)\monolib_textctrl.obj: ..\..\src\univ\textctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\monolib_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7456,12 +7440,18 @@ $(OBJS)\coredll_helpchm.obj: ..\..\src\msw\helpchm.cpp
$(OBJS)\coredll_helpwin.obj: ..\..\src\msw\helpwin.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_mdig.obj: ..\..\src\generic\mdig.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -7999,16 +7989,6 @@ $(OBJS)\coredll_textctrl.obj: ..\..\src\univ\textctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\coredll_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -8587,12 +8567,18 @@ $(OBJS)\corelib_helpchm.obj: ..\..\src\msw\helpchm.cpp
$(OBJS)\corelib_helpwin.obj: ..\..\src\msw\helpwin.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_mdig.obj: ..\..\src\generic\mdig.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -9130,16 +9116,6 @@ $(OBJS)\corelib_textctrl.obj: ..\..\src\univ\textctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\corelib_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**

72
build/msw/makefile.wat
View File

@@ -228,8 +228,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_textctrl.obj &
$(OBJS)\monodll_tglbtn.obj &
$(OBJS)\monodll_treectrl.obj &
$(OBJS)\monodll_colrdlgg.obj &
$(OBJS)\monodll_fontdlgg.obj &
$(OBJS)\monodll_fdrepdlg.obj &
$(OBJS)\monodll_fontdlg.obj &
$(OBJS)\monodll_helpchm.obj &
@@ -674,8 +672,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_textctrl.obj &
$(OBJS)\monolib_tglbtn.obj &
$(OBJS)\monolib_treectrl.obj &
$(OBJS)\monolib_colrdlgg.obj &
$(OBJS)\monolib_fontdlgg.obj &
$(OBJS)\monolib_fdrepdlg.obj &
$(OBJS)\monolib_fontdlg.obj &
$(OBJS)\monolib_helpchm.obj &
@@ -1106,8 +1102,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_textctrl.obj &
$(OBJS)\coredll_tglbtn.obj &
$(OBJS)\coredll_treectrl.obj &
$(OBJS)\coredll_colrdlgg.obj &
$(OBJS)\coredll_fontdlgg.obj &
$(OBJS)\coredll_fdrepdlg.obj &
$(OBJS)\coredll_fontdlg.obj &
$(OBJS)\coredll_helpchm.obj &
@@ -1510,8 +1504,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_textctrl.obj &
$(OBJS)\corelib_tglbtn.obj &
$(OBJS)\corelib_treectrl.obj &
$(OBJS)\corelib_colrdlgg.obj &
$(OBJS)\corelib_fontdlgg.obj &
$(OBJS)\corelib_fdrepdlg.obj &
$(OBJS)\corelib_fontdlg.obj &
$(OBJS)\corelib_helpchm.obj &
@@ -3903,12 +3895,18 @@ $(OBJS)\monodll_helpchm.obj : .AUTODEPEND ..\..\src\msw\helpchm.cpp
$(OBJS)\monodll_helpwin.obj : .AUTODEPEND ..\..\src\msw\helpwin.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_dirdlgg.obj : .AUTODEPEND ..\..\src\generic\dirdlgg.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_filedlgg.obj : .AUTODEPEND ..\..\src\generic\filedlgg.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_fontdlgg.obj : .AUTODEPEND ..\..\src\generic\fontdlgg.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_mdig.obj : .AUTODEPEND ..\..\src\generic\mdig.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -4665,16 +4663,6 @@ $(OBJS)\monodll_textctrl.obj : .AUTODEPEND ..\..\src\univ\textctrl.cpp
!endif
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_fontdlgg.obj : .AUTODEPEND ..\..\src\generic\fontdlgg.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
!ifeq WXUNIV 0
$(OBJS)\monodll_fdrepdlg.obj : .AUTODEPEND ..\..\src\msw\fdrepdlg.cpp
@@ -5479,12 +5467,18 @@ $(OBJS)\monolib_helpchm.obj : .AUTODEPEND ..\..\src\msw\helpchm.cpp
$(OBJS)\monolib_helpwin.obj : .AUTODEPEND ..\..\src\msw\helpwin.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_dirdlgg.obj : .AUTODEPEND ..\..\src\generic\dirdlgg.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_filedlgg.obj : .AUTODEPEND ..\..\src\generic\filedlgg.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_fontdlgg.obj : .AUTODEPEND ..\..\src\generic\fontdlgg.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_mdig.obj : .AUTODEPEND ..\..\src\generic\mdig.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -6241,16 +6235,6 @@ $(OBJS)\monolib_textctrl.obj : .AUTODEPEND ..\..\src\univ\textctrl.cpp
!endif
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_fontdlgg.obj : .AUTODEPEND ..\..\src\generic\fontdlgg.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
!ifeq WXUNIV 0
$(OBJS)\monolib_fdrepdlg.obj : .AUTODEPEND ..\..\src\msw\fdrepdlg.cpp
@@ -7331,12 +7315,18 @@ $(OBJS)\coredll_helpchm.obj : .AUTODEPEND ..\..\src\msw\helpchm.cpp
$(OBJS)\coredll_helpwin.obj : .AUTODEPEND ..\..\src\msw\helpwin.cpp
$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
$(OBJS)\coredll_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp
$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
$(OBJS)\coredll_dirdlgg.obj : .AUTODEPEND ..\..\src\generic\dirdlgg.cpp
$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
$(OBJS)\coredll_filedlgg.obj : .AUTODEPEND ..\..\src\generic\filedlgg.cpp
$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
$(OBJS)\coredll_fontdlgg.obj : .AUTODEPEND ..\..\src\generic\fontdlgg.cpp
$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
$(OBJS)\coredll_mdig.obj : .AUTODEPEND ..\..\src\generic\mdig.cpp
$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -7970,16 +7960,6 @@ $(OBJS)\coredll_textctrl.obj : .AUTODEPEND ..\..\src\univ\textctrl.cpp
!endif
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp
$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_fontdlgg.obj : .AUTODEPEND ..\..\src\generic\fontdlgg.cpp
$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
!ifeq WXUNIV 0
$(OBJS)\coredll_fdrepdlg.obj : .AUTODEPEND ..\..\src\msw\fdrepdlg.cpp
@@ -8562,12 +8542,18 @@ $(OBJS)\corelib_helpchm.obj : .AUTODEPEND ..\..\src\msw\helpchm.cpp
$(OBJS)\corelib_helpwin.obj : .AUTODEPEND ..\..\src\msw\helpwin.cpp
$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
$(OBJS)\corelib_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp
$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
$(OBJS)\corelib_dirdlgg.obj : .AUTODEPEND ..\..\src\generic\dirdlgg.cpp
$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
$(OBJS)\corelib_filedlgg.obj : .AUTODEPEND ..\..\src\generic\filedlgg.cpp
$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
$(OBJS)\corelib_fontdlgg.obj : .AUTODEPEND ..\..\src\generic\fontdlgg.cpp
$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
$(OBJS)\corelib_mdig.obj : .AUTODEPEND ..\..\src\generic\mdig.cpp
$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -9201,16 +9187,6 @@ $(OBJS)\corelib_textctrl.obj : .AUTODEPEND ..\..\src\univ\textctrl.cpp
!endif
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp
$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_fontdlgg.obj : .AUTODEPEND ..\..\src\generic\fontdlgg.cpp
$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
!ifeq WXUNIV 0
$(OBJS)\corelib_fdrepdlg.obj : .AUTODEPEND ..\..\src\msw\fdrepdlg.cpp

118
build/msw/wx_core.dsp
View File

@@ -4012,6 +4012,65 @@ SOURCE=..\..\src\generic\choicdgg.cpp
# Begin Source File
SOURCE=..\..\src\generic\colrdlgg.cpp
!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 Debug"
# PROP Exclude_From_Build 1
!ENDIF
# End Source File
# Begin Source File
@@ -4217,6 +4276,65 @@ SOURCE=..\..\src\generic\filedlgg.cpp
# Begin Source File
SOURCE=..\..\src\generic\fontdlgg.cpp
!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 Debug"
# PROP Exclude_From_Build 1
!ENDIF
# End Source File
# Begin Source File