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

Use generic collapsible pane for wxUniv based builds.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-10-23 10:57:05 +00:00
parent 82df62ef8e
commit 810292c73d
7 changed files with 113 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.in
View File

@@ -3474,6 +3474,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \
COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \
$(__LOWLEVEL_SRC_OBJECTS_1) \ $(__LOWLEVEL_SRC_OBJECTS_1) \
monodll_accel.o \ monodll_accel.o \
monodll_collpaneg.o \
monodll_colrdlgg.o \ monodll_colrdlgg.o \
monodll_dirdlgg.o \ monodll_dirdlgg.o \
monodll_fdrepdlg.o \ monodll_fdrepdlg.o \
@@ -5220,6 +5221,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \
COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \
$(__LOWLEVEL_SRC_OBJECTS_3) \ $(__LOWLEVEL_SRC_OBJECTS_3) \
monolib_accel.o \ monolib_accel.o \
monolib_collpaneg.o \
monolib_colrdlgg.o \ monolib_colrdlgg.o \
monolib_dirdlgg.o \ monolib_dirdlgg.o \
monolib_fdrepdlg.o \ monolib_fdrepdlg.o \
@@ -7179,6 +7181,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \
COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \
$(__LOWLEVEL_SRC_OBJECTS_5) \ $(__LOWLEVEL_SRC_OBJECTS_5) \
coredll_accel.o \ coredll_accel.o \
coredll_collpaneg.o \
coredll_colrdlgg.o \ coredll_colrdlgg.o \
coredll_dirdlgg.o \ coredll_dirdlgg.o \
coredll_fdrepdlg.o \ coredll_fdrepdlg.o \
@@ -8610,6 +8613,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \
COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \
$(__LOWLEVEL_SRC_OBJECTS_7) \ $(__LOWLEVEL_SRC_OBJECTS_7) \
corelib_accel.o \ corelib_accel.o \
corelib_collpaneg.o \
corelib_colrdlgg.o \ corelib_colrdlgg.o \
corelib_dirdlgg.o \ corelib_dirdlgg.o \
corelib_fdrepdlg.o \ corelib_fdrepdlg.o \
@@ -14413,6 +14417,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
@COND_USE_GUI_1_WXUNIV_1@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
@@ -18475,6 +18482,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
@COND_USE_GUI_1_WXUNIV_1@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
@@ -22900,6 +22910,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
@COND_USE_GUI_1_WXUNIV_1@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
@@ -25822,6 +25835,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP) @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
@COND_USE_GUI_1_WXUNIV_1@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp

1
build/bakefiles/files.bkl
View File

@@ -2514,6 +2514,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<set var="UNIV_SRC" hints="files"> <set var="UNIV_SRC" hints="files">
src/generic/accel.cpp src/generic/accel.cpp
src/generic/collpaneg.cpp
src/generic/colrdlgg.cpp src/generic/colrdlgg.cpp
src/generic/dirdlgg.cpp src/generic/dirdlgg.cpp
src/generic/fdrepdlg.cpp src/generic/fdrepdlg.cpp

36
build/msw/makefile.bcc
View File

@@ -1547,6 +1547,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_automtn.obj \ $(OBJS)\monodll_automtn.obj \
$(OBJS)\monodll_uuid.obj \ $(OBJS)\monodll_uuid.obj \
$(OBJS)\monodll_accel.obj \ $(OBJS)\monodll_accel.obj \
$(OBJS)\monodll_collpaneg.obj \
$(OBJS)\monodll_colrdlgg.obj \ $(OBJS)\monodll_colrdlgg.obj \
$(OBJS)\monodll_dirdlgg.obj \ $(OBJS)\monodll_dirdlgg.obj \
$(OBJS)\monodll_fdrepdlg.obj \ $(OBJS)\monodll_fdrepdlg.obj \
@@ -2149,6 +2150,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_automtn.obj \ $(OBJS)\monolib_automtn.obj \
$(OBJS)\monolib_uuid.obj \ $(OBJS)\monolib_uuid.obj \
$(OBJS)\monolib_accel.obj \ $(OBJS)\monolib_accel.obj \
$(OBJS)\monolib_collpaneg.obj \
$(OBJS)\monolib_colrdlgg.obj \ $(OBJS)\monolib_colrdlgg.obj \
$(OBJS)\monolib_dirdlgg.obj \ $(OBJS)\monolib_dirdlgg.obj \
$(OBJS)\monolib_fdrepdlg.obj \ $(OBJS)\monolib_fdrepdlg.obj \
@@ -2662,6 +2664,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_automtn.obj \ $(OBJS)\coredll_automtn.obj \
$(OBJS)\coredll_uuid.obj \ $(OBJS)\coredll_uuid.obj \
$(OBJS)\coredll_accel.obj \ $(OBJS)\coredll_accel.obj \
$(OBJS)\coredll_collpaneg.obj \
$(OBJS)\coredll_colrdlgg.obj \ $(OBJS)\coredll_colrdlgg.obj \
$(OBJS)\coredll_dirdlgg.obj \ $(OBJS)\coredll_dirdlgg.obj \
$(OBJS)\coredll_fdrepdlg.obj \ $(OBJS)\coredll_fdrepdlg.obj \
@@ -3102,6 +3105,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_automtn.obj \ $(OBJS)\corelib_automtn.obj \
$(OBJS)\corelib_uuid.obj \ $(OBJS)\corelib_uuid.obj \
$(OBJS)\corelib_accel.obj \ $(OBJS)\corelib_accel.obj \
$(OBJS)\corelib_collpaneg.obj \
$(OBJS)\corelib_colrdlgg.obj \ $(OBJS)\corelib_colrdlgg.obj \
$(OBJS)\corelib_dirdlgg.obj \ $(OBJS)\corelib_dirdlgg.obj \
$(OBJS)\corelib_fdrepdlg.obj \ $(OBJS)\corelib_fdrepdlg.obj \
@@ -4724,9 +4728,6 @@ $(OBJS)\monodll_gsocket.obj: ..\..\src\msw\gsocket.cpp
$(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_colordlg.obj: ..\..\src\msw\colordlg.cpp $(OBJS)\monodll_colordlg.obj: ..\..\src\msw\colordlg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -5427,6 +5428,11 @@ $(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif !endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\monodll_statusbr.obj: ..\..\src\generic\statusbr.cpp $(OBJS)\monodll_statusbr.obj: ..\..\src\generic\statusbr.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -6664,9 +6670,6 @@ $(OBJS)\monolib_gsocket.obj: ..\..\src\msw\gsocket.cpp
$(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_colordlg.obj: ..\..\src\msw\colordlg.cpp $(OBJS)\monolib_colordlg.obj: ..\..\src\msw\colordlg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -7367,6 +7370,11 @@ $(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif !endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\monolib_statusbr.obj: ..\..\src\generic\statusbr.cpp $(OBJS)\monolib_statusbr.obj: ..\..\src\generic\statusbr.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -8925,9 +8933,6 @@ $(OBJS)\coredll_mslu.obj: ..\..\src\msw\mslu.cpp
$(OBJS)\coredll_volume.obj: ..\..\src\msw\volume.cpp $(OBJS)\coredll_volume.obj: ..\..\src\msw\volume.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_colordlg.obj: ..\..\src\msw\colordlg.cpp $(OBJS)\coredll_colordlg.obj: ..\..\src\msw\colordlg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -9319,6 +9324,11 @@ $(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif !endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\coredll_statusbr.obj: ..\..\src\generic\statusbr.cpp $(OBJS)\coredll_statusbr.obj: ..\..\src\generic\statusbr.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -10173,9 +10183,6 @@ $(OBJS)\corelib_mslu.obj: ..\..\src\msw\mslu.cpp
$(OBJS)\corelib_volume.obj: ..\..\src\msw\volume.cpp $(OBJS)\corelib_volume.obj: ..\..\src\msw\volume.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_colordlg.obj: ..\..\src\msw\colordlg.cpp $(OBJS)\corelib_colordlg.obj: ..\..\src\msw\colordlg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -10567,6 +10574,11 @@ $(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif !endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\corelib_statusbr.obj: ..\..\src\generic\statusbr.cpp $(OBJS)\corelib_statusbr.obj: ..\..\src\generic\statusbr.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**

36
build/msw/makefile.gcc
View File

@@ -1559,6 +1559,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_automtn.o \ $(OBJS)\monodll_automtn.o \
$(OBJS)\monodll_uuid.o \ $(OBJS)\monodll_uuid.o \
$(OBJS)\monodll_accel.o \ $(OBJS)\monodll_accel.o \
$(OBJS)\monodll_collpaneg.o \
$(OBJS)\monodll_colrdlgg.o \ $(OBJS)\monodll_colrdlgg.o \
$(OBJS)\monodll_dirdlgg.o \ $(OBJS)\monodll_dirdlgg.o \
$(OBJS)\monodll_fdrepdlg.o \ $(OBJS)\monodll_fdrepdlg.o \
@@ -2167,6 +2168,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_automtn.o \ $(OBJS)\monolib_automtn.o \
$(OBJS)\monolib_uuid.o \ $(OBJS)\monolib_uuid.o \
$(OBJS)\monolib_accel.o \ $(OBJS)\monolib_accel.o \
$(OBJS)\monolib_collpaneg.o \
$(OBJS)\monolib_colrdlgg.o \ $(OBJS)\monolib_colrdlgg.o \
$(OBJS)\monolib_dirdlgg.o \ $(OBJS)\monolib_dirdlgg.o \
$(OBJS)\monolib_fdrepdlg.o \ $(OBJS)\monolib_fdrepdlg.o \
@@ -2696,6 +2698,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_automtn.o \ $(OBJS)\coredll_automtn.o \
$(OBJS)\coredll_uuid.o \ $(OBJS)\coredll_uuid.o \
$(OBJS)\coredll_accel.o \ $(OBJS)\coredll_accel.o \
$(OBJS)\coredll_collpaneg.o \
$(OBJS)\coredll_colrdlgg.o \ $(OBJS)\coredll_colrdlgg.o \
$(OBJS)\coredll_dirdlgg.o \ $(OBJS)\coredll_dirdlgg.o \
$(OBJS)\coredll_fdrepdlg.o \ $(OBJS)\coredll_fdrepdlg.o \
@@ -3144,6 +3147,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_automtn.o \ $(OBJS)\corelib_automtn.o \
$(OBJS)\corelib_uuid.o \ $(OBJS)\corelib_uuid.o \
$(OBJS)\corelib_accel.o \ $(OBJS)\corelib_accel.o \
$(OBJS)\corelib_collpaneg.o \
$(OBJS)\corelib_colrdlgg.o \ $(OBJS)\corelib_colrdlgg.o \
$(OBJS)\corelib_dirdlgg.o \ $(OBJS)\corelib_dirdlgg.o \
$(OBJS)\corelib_fdrepdlg.o \ $(OBJS)\corelib_fdrepdlg.o \
@@ -4841,9 +4845,6 @@ $(OBJS)\monodll_gsocket.o: ../../src/msw/gsocket.cpp
$(OBJS)\monodll_urlmsw.o: ../../src/msw/urlmsw.cpp $(OBJS)\monodll_urlmsw.o: ../../src/msw/urlmsw.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_collpaneg.o: ../../src/generic/collpaneg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_colordlg.o: ../../src/msw/colordlg.cpp $(OBJS)\monodll_colordlg.o: ../../src/msw/colordlg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -5544,6 +5545,11 @@ $(OBJS)\monodll_uuid.o: ../../src/msw/ole/uuid.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_collpaneg.o: ../../src/generic/collpaneg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
ifeq ($(WXUNIV),0) ifeq ($(WXUNIV),0)
$(OBJS)\monodll_statusbr.o: ../../src/generic/statusbr.cpp $(OBJS)\monodll_statusbr.o: ../../src/generic/statusbr.cpp
@@ -6881,9 +6887,6 @@ $(OBJS)\monolib_gsocket.o: ../../src/msw/gsocket.cpp
$(OBJS)\monolib_urlmsw.o: ../../src/msw/urlmsw.cpp $(OBJS)\monolib_urlmsw.o: ../../src/msw/urlmsw.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_collpaneg.o: ../../src/generic/collpaneg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_colordlg.o: ../../src/msw/colordlg.cpp $(OBJS)\monolib_colordlg.o: ../../src/msw/colordlg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -7584,6 +7587,11 @@ $(OBJS)\monolib_uuid.o: ../../src/msw/ole/uuid.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_collpaneg.o: ../../src/generic/collpaneg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
ifeq ($(WXUNIV),0) ifeq ($(WXUNIV),0)
$(OBJS)\monolib_statusbr.o: ../../src/generic/statusbr.cpp $(OBJS)\monolib_statusbr.o: ../../src/generic/statusbr.cpp
@@ -9242,9 +9250,6 @@ $(OBJS)\coredll_mslu.o: ../../src/msw/mslu.cpp
$(OBJS)\coredll_volume.o: ../../src/msw/volume.cpp $(OBJS)\coredll_volume.o: ../../src/msw/volume.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\coredll_collpaneg.o: ../../src/generic/collpaneg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\coredll_colordlg.o: ../../src/msw/colordlg.cpp $(OBJS)\coredll_colordlg.o: ../../src/msw/colordlg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -9636,6 +9641,11 @@ $(OBJS)\coredll_uuid.o: ../../src/msw/ole/uuid.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_collpaneg.o: ../../src/generic/collpaneg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
ifeq ($(WXUNIV),0) ifeq ($(WXUNIV),0)
$(OBJS)\coredll_statusbr.o: ../../src/generic/statusbr.cpp $(OBJS)\coredll_statusbr.o: ../../src/generic/statusbr.cpp
@@ -10590,9 +10600,6 @@ $(OBJS)\corelib_mslu.o: ../../src/msw/mslu.cpp
$(OBJS)\corelib_volume.o: ../../src/msw/volume.cpp $(OBJS)\corelib_volume.o: ../../src/msw/volume.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\corelib_collpaneg.o: ../../src/generic/collpaneg.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\corelib_colordlg.o: ../../src/msw/colordlg.cpp $(OBJS)\corelib_colordlg.o: ../../src/msw/colordlg.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
@@ -10984,6 +10991,11 @@ $(OBJS)\corelib_uuid.o: ../../src/msw/ole/uuid.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_collpaneg.o: ../../src/generic/collpaneg.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
ifeq ($(WXUNIV),0) ifeq ($(WXUNIV),0)
$(OBJS)\corelib_statusbr.o: ../../src/generic/statusbr.cpp $(OBJS)\corelib_statusbr.o: ../../src/generic/statusbr.cpp

36
build/msw/makefile.vc
View File

@@ -1714,6 +1714,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_automtn.obj \ $(OBJS)\monodll_automtn.obj \
$(OBJS)\monodll_uuid.obj \ $(OBJS)\monodll_uuid.obj \
$(OBJS)\monodll_accel.obj \ $(OBJS)\monodll_accel.obj \
$(OBJS)\monodll_collpaneg.obj \
$(OBJS)\monodll_colrdlgg.obj \ $(OBJS)\monodll_colrdlgg.obj \
$(OBJS)\monodll_dirdlgg.obj \ $(OBJS)\monodll_dirdlgg.obj \
$(OBJS)\monodll_fdrepdlg.obj \ $(OBJS)\monodll_fdrepdlg.obj \
@@ -2322,6 +2323,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_automtn.obj \ $(OBJS)\monolib_automtn.obj \
$(OBJS)\monolib_uuid.obj \ $(OBJS)\monolib_uuid.obj \
$(OBJS)\monolib_accel.obj \ $(OBJS)\monolib_accel.obj \
$(OBJS)\monolib_collpaneg.obj \
$(OBJS)\monolib_colrdlgg.obj \ $(OBJS)\monolib_colrdlgg.obj \
$(OBJS)\monolib_dirdlgg.obj \ $(OBJS)\monolib_dirdlgg.obj \
$(OBJS)\monolib_fdrepdlg.obj \ $(OBJS)\monolib_fdrepdlg.obj \
@@ -2865,6 +2867,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_automtn.obj \ $(OBJS)\coredll_automtn.obj \
$(OBJS)\coredll_uuid.obj \ $(OBJS)\coredll_uuid.obj \
$(OBJS)\coredll_accel.obj \ $(OBJS)\coredll_accel.obj \
$(OBJS)\coredll_collpaneg.obj \
$(OBJS)\coredll_colrdlgg.obj \ $(OBJS)\coredll_colrdlgg.obj \
$(OBJS)\coredll_dirdlgg.obj \ $(OBJS)\coredll_dirdlgg.obj \
$(OBJS)\coredll_fdrepdlg.obj \ $(OBJS)\coredll_fdrepdlg.obj \
@@ -3311,6 +3314,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_automtn.obj \ $(OBJS)\corelib_automtn.obj \
$(OBJS)\corelib_uuid.obj \ $(OBJS)\corelib_uuid.obj \
$(OBJS)\corelib_accel.obj \ $(OBJS)\corelib_accel.obj \
$(OBJS)\corelib_collpaneg.obj \
$(OBJS)\corelib_colrdlgg.obj \ $(OBJS)\corelib_colrdlgg.obj \
$(OBJS)\corelib_dirdlgg.obj \ $(OBJS)\corelib_dirdlgg.obj \
$(OBJS)\corelib_fdrepdlg.obj \ $(OBJS)\corelib_fdrepdlg.obj \
@@ -5057,9 +5061,6 @@ $(OBJS)\monodll_gsocket.obj: ..\..\src\msw\gsocket.cpp
$(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_colordlg.obj: ..\..\src\msw\colordlg.cpp $(OBJS)\monodll_colordlg.obj: ..\..\src\msw\colordlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -5760,6 +5761,11 @@ $(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif !endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\monodll_statusbr.obj: ..\..\src\generic\statusbr.cpp $(OBJS)\monodll_statusbr.obj: ..\..\src\generic\statusbr.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6997,9 +7003,6 @@ $(OBJS)\monolib_gsocket.obj: ..\..\src\msw\gsocket.cpp
$(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp $(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_colordlg.obj: ..\..\src\msw\colordlg.cpp $(OBJS)\monolib_colordlg.obj: ..\..\src\msw\colordlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7700,6 +7703,11 @@ $(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif !endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\monolib_statusbr.obj: ..\..\src\generic\statusbr.cpp $(OBJS)\monolib_statusbr.obj: ..\..\src\generic\statusbr.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -9258,9 +9266,6 @@ $(OBJS)\coredll_mslu.obj: ..\..\src\msw\mslu.cpp
$(OBJS)\coredll_volume.obj: ..\..\src\msw\volume.cpp $(OBJS)\coredll_volume.obj: ..\..\src\msw\volume.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_colordlg.obj: ..\..\src\msw\colordlg.cpp $(OBJS)\coredll_colordlg.obj: ..\..\src\msw\colordlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -9652,6 +9657,11 @@ $(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
!endif !endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\coredll_statusbr.obj: ..\..\src\generic\statusbr.cpp $(OBJS)\coredll_statusbr.obj: ..\..\src\generic\statusbr.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -10506,9 +10516,6 @@ $(OBJS)\corelib_mslu.obj: ..\..\src\msw\mslu.cpp
$(OBJS)\corelib_volume.obj: ..\..\src\msw\volume.cpp $(OBJS)\corelib_volume.obj: ..\..\src\msw\volume.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_colordlg.obj: ..\..\src\msw\colordlg.cpp $(OBJS)\corelib_colordlg.obj: ..\..\src\msw\colordlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -10900,6 +10907,11 @@ $(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
!endif !endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\corelib_statusbr.obj: ..\..\src\generic\statusbr.cpp $(OBJS)\corelib_statusbr.obj: ..\..\src\generic\statusbr.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**

36
build/msw/makefile.wat
View File

@@ -475,6 +475,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_automtn.obj & $(OBJS)\monodll_automtn.obj &
$(OBJS)\monodll_uuid.obj & $(OBJS)\monodll_uuid.obj &
$(OBJS)\monodll_accel.obj & $(OBJS)\monodll_accel.obj &
$(OBJS)\monodll_collpaneg.obj &
$(OBJS)\monodll_colrdlgg.obj & $(OBJS)\monodll_colrdlgg.obj &
$(OBJS)\monodll_dirdlgg.obj & $(OBJS)\monodll_dirdlgg.obj &
$(OBJS)\monodll_fdrepdlg.obj & $(OBJS)\monodll_fdrepdlg.obj &
@@ -1087,6 +1088,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_automtn.obj & $(OBJS)\monolib_automtn.obj &
$(OBJS)\monolib_uuid.obj & $(OBJS)\monolib_uuid.obj &
$(OBJS)\monolib_accel.obj & $(OBJS)\monolib_accel.obj &
$(OBJS)\monolib_collpaneg.obj &
$(OBJS)\monolib_colrdlgg.obj & $(OBJS)\monolib_colrdlgg.obj &
$(OBJS)\monolib_dirdlgg.obj & $(OBJS)\monolib_dirdlgg.obj &
$(OBJS)\monolib_fdrepdlg.obj & $(OBJS)\monolib_fdrepdlg.obj &
@@ -1623,6 +1625,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_automtn.obj & $(OBJS)\coredll_automtn.obj &
$(OBJS)\coredll_uuid.obj & $(OBJS)\coredll_uuid.obj &
$(OBJS)\coredll_accel.obj & $(OBJS)\coredll_accel.obj &
$(OBJS)\coredll_collpaneg.obj &
$(OBJS)\coredll_colrdlgg.obj & $(OBJS)\coredll_colrdlgg.obj &
$(OBJS)\coredll_dirdlgg.obj & $(OBJS)\coredll_dirdlgg.obj &
$(OBJS)\coredll_fdrepdlg.obj & $(OBJS)\coredll_fdrepdlg.obj &
@@ -2073,6 +2076,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_automtn.obj & $(OBJS)\corelib_automtn.obj &
$(OBJS)\corelib_uuid.obj & $(OBJS)\corelib_uuid.obj &
$(OBJS)\corelib_accel.obj & $(OBJS)\corelib_accel.obj &
$(OBJS)\corelib_collpaneg.obj &
$(OBJS)\corelib_colrdlgg.obj & $(OBJS)\corelib_colrdlgg.obj &
$(OBJS)\corelib_dirdlgg.obj & $(OBJS)\corelib_dirdlgg.obj &
$(OBJS)\corelib_fdrepdlg.obj & $(OBJS)\corelib_fdrepdlg.obj &
@@ -5069,9 +5073,6 @@ $(OBJS)\monodll_gsocket.obj : .AUTODEPEND ..\..\src\msw\gsocket.cpp
$(OBJS)\monodll_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp $(OBJS)\monodll_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_collpaneg.obj : .AUTODEPEND ..\..\src\generic\collpaneg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp $(OBJS)\monodll_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -5772,6 +5773,11 @@ $(OBJS)\monodll_uuid.obj : .AUTODEPEND ..\..\src\msw\ole\uuid.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif !endif
!ifeq USE_GUI 1
$(OBJS)\monodll_collpaneg.obj : .AUTODEPEND ..\..\src\generic\collpaneg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
!ifeq WXUNIV 0 !ifeq WXUNIV 0
$(OBJS)\monodll_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp $(OBJS)\monodll_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp
@@ -7109,9 +7115,6 @@ $(OBJS)\monolib_gsocket.obj : .AUTODEPEND ..\..\src\msw\gsocket.cpp
$(OBJS)\monolib_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp $(OBJS)\monolib_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_collpaneg.obj : .AUTODEPEND ..\..\src\generic\collpaneg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp $(OBJS)\monolib_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -7812,6 +7815,11 @@ $(OBJS)\monolib_uuid.obj : .AUTODEPEND ..\..\src\msw\ole\uuid.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif !endif
!ifeq USE_GUI 1
$(OBJS)\monolib_collpaneg.obj : .AUTODEPEND ..\..\src\generic\collpaneg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
!ifeq WXUNIV 0 !ifeq WXUNIV 0
$(OBJS)\monolib_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp $(OBJS)\monolib_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp
@@ -9470,9 +9478,6 @@ $(OBJS)\coredll_mslu.obj : .AUTODEPEND ..\..\src\msw\mslu.cpp
$(OBJS)\coredll_volume.obj : .AUTODEPEND ..\..\src\msw\volume.cpp $(OBJS)\coredll_volume.obj : .AUTODEPEND ..\..\src\msw\volume.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
$(OBJS)\coredll_collpaneg.obj : .AUTODEPEND ..\..\src\generic\collpaneg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
$(OBJS)\coredll_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp $(OBJS)\coredll_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -9864,6 +9869,11 @@ $(OBJS)\coredll_uuid.obj : .AUTODEPEND ..\..\src\msw\ole\uuid.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif !endif
!ifeq USE_GUI 1
$(OBJS)\coredll_collpaneg.obj : .AUTODEPEND ..\..\src\generic\collpaneg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
!ifeq WXUNIV 0 !ifeq WXUNIV 0
$(OBJS)\coredll_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp $(OBJS)\coredll_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp
@@ -10818,9 +10828,6 @@ $(OBJS)\corelib_mslu.obj : .AUTODEPEND ..\..\src\msw\mslu.cpp
$(OBJS)\corelib_volume.obj : .AUTODEPEND ..\..\src\msw\volume.cpp $(OBJS)\corelib_volume.obj : .AUTODEPEND ..\..\src\msw\volume.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
$(OBJS)\corelib_collpaneg.obj : .AUTODEPEND ..\..\src\generic\collpaneg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
$(OBJS)\corelib_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp $(OBJS)\corelib_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -11212,6 +11219,11 @@ $(OBJS)\corelib_uuid.obj : .AUTODEPEND ..\..\src\msw\ole\uuid.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif !endif
!ifeq USE_GUI 1
$(OBJS)\corelib_collpaneg.obj : .AUTODEPEND ..\..\src\generic\collpaneg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
!ifeq WXUNIV 0 !ifeq WXUNIV 0
$(OBJS)\corelib_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp $(OBJS)\corelib_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp

59
build/msw/wx_core.dsp
View File

@@ -4083,65 +4083,6 @@ SOURCE=..\..\src\generic\clrpickerg.cpp
# Begin Source File # Begin Source File
SOURCE=..\..\src\generic\collpaneg.cpp SOURCE=..\..\src\generic\collpaneg.cpp
!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release"
!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug"
!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 Unicode Release"
!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug"
!ELSEIF "$(CFG)" == "core - Win32 Release"
!ELSEIF "$(CFG)" == "core - Win32 Debug"
!ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File