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

Universal build fix.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-06-01 13:18:10 +00:00
parent 5b34e14106
commit 24bbfc6292
8 changed files with 387 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
build/msw/makefile.bcc
View File

@@ -1430,11 +1430,14 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_automtn.obj \
$(OBJS)\monodll_uuid.obj \
$(OBJS)\monodll_accel.obj \
$(OBJS)\monodll_clrpickerg.obj \
$(OBJS)\monodll_colrdlgg.obj \
$(OBJS)\monodll_dirdlgg.obj \
$(OBJS)\monodll_fdrepdlg.obj \
$(OBJS)\monodll_filedlgg.obj \
$(OBJS)\monodll_filepickerg.obj \
$(OBJS)\monodll_fontdlgg.obj \
$(OBJS)\monodll_fontpickerg.obj \
$(OBJS)\monodll_imaglist.obj \
$(OBJS)\monodll_listctrl.obj \
$(OBJS)\monodll_mdig.obj \
@@ -1999,11 +2002,14 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_automtn.obj \
$(OBJS)\monolib_uuid.obj \
$(OBJS)\monolib_accel.obj \
$(OBJS)\monolib_clrpickerg.obj \
$(OBJS)\monolib_colrdlgg.obj \
$(OBJS)\monolib_dirdlgg.obj \
$(OBJS)\monolib_fdrepdlg.obj \
$(OBJS)\monolib_filedlgg.obj \
$(OBJS)\monolib_filepickerg.obj \
$(OBJS)\monolib_fontdlgg.obj \
$(OBJS)\monolib_fontpickerg.obj \
$(OBJS)\monolib_imaglist.obj \
$(OBJS)\monolib_listctrl.obj \
$(OBJS)\monolib_mdig.obj \
@@ -2496,11 +2502,14 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_automtn.obj \
$(OBJS)\coredll_uuid.obj \
$(OBJS)\coredll_accel.obj \
$(OBJS)\coredll_clrpickerg.obj \
$(OBJS)\coredll_colrdlgg.obj \
$(OBJS)\coredll_dirdlgg.obj \
$(OBJS)\coredll_fdrepdlg.obj \
$(OBJS)\coredll_filedlgg.obj \
$(OBJS)\coredll_filepickerg.obj \
$(OBJS)\coredll_fontdlgg.obj \
$(OBJS)\coredll_fontpickerg.obj \
$(OBJS)\coredll_imaglist.obj \
$(OBJS)\coredll_listctrl.obj \
$(OBJS)\coredll_mdig.obj \
@@ -2920,11 +2929,14 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_automtn.obj \
$(OBJS)\corelib_uuid.obj \
$(OBJS)\corelib_accel.obj \
$(OBJS)\corelib_clrpickerg.obj \
$(OBJS)\corelib_colrdlgg.obj \
$(OBJS)\corelib_dirdlgg.obj \
$(OBJS)\corelib_fdrepdlg.obj \
$(OBJS)\corelib_filedlgg.obj \
$(OBJS)\corelib_filepickerg.obj \
$(OBJS)\corelib_fontdlgg.obj \
$(OBJS)\corelib_fontpickerg.obj \
$(OBJS)\corelib_imaglist.obj \
$(OBJS)\corelib_listctrl.obj \
$(OBJS)\corelib_mdig.obj \
@@ -4457,15 +4469,6 @@ $(OBJS)\monodll_gsocket.obj: ..\..\src\msw\gsocket.cpp
$(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_colordlg.obj: ..\..\src\msw\colordlg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -5099,6 +5102,21 @@ $(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\monodll_statusbr.obj: ..\..\src\generic\statusbr.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -6308,15 +6326,6 @@ $(OBJS)\monolib_gsocket.obj: ..\..\src\msw\gsocket.cpp
$(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_colordlg.obj: ..\..\src\msw\colordlg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -6950,6 +6959,21 @@ $(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\monolib_statusbr.obj: ..\..\src\generic\statusbr.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -8477,15 +8501,6 @@ $(OBJS)\coredll_mslu.obj: ..\..\src\msw\mslu.cpp
$(OBJS)\coredll_volume.obj: ..\..\src\msw\volume.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
$(OBJS)\coredll_colordlg.obj: ..\..\src\msw\colordlg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -8861,6 +8876,21 @@ $(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\coredll_statusbr.obj: ..\..\src\generic\statusbr.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -9690,15 +9720,6 @@ $(OBJS)\corelib_mslu.obj: ..\..\src\msw\mslu.cpp
$(OBJS)\corelib_volume.obj: ..\..\src\msw\volume.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
$(OBJS)\corelib_colordlg.obj: ..\..\src\msw\colordlg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -10074,6 +10095,21 @@ $(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
$(OBJS)\corelib_statusbr.obj: ..\..\src\generic\statusbr.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**