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

move generic animation sources to ADVANCED_MSW_NATIVE_SRC/HDR from ADVANCED_MSW_SRC/HDR to avoid having duplicated entries in wxMSW/Univ build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-02-04 10:02:48 +00:00
parent cff6c9a81a
commit 5d2d4a2ef2
7 changed files with 216 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/bakefiles/files.bkl
View File

@@ -2875,14 +2875,12 @@ src/osx/iphone/window.mm
<set var="ADVANCED_MSW_SRC" hints="files">
src/common/taskbarcmn.cpp
src/generic/animateg.cpp
src/msw/aboutdlg.cpp
src/msw/notifmsg.cpp
src/msw/sound.cpp
src/msw/taskbar.cpp
</set>
<set var="ADVANCED_MSW_HDR" hints="files">
wx/generic/animate.h
wx/msw/notifmsg.h
wx/msw/sound.h
wx/msw/taskbar.h
@@ -2890,12 +2888,14 @@ src/osx/iphone/window.mm
<!-- not used with wxUniv -->
<set var="ADVANCED_MSW_NATIVE_SRC" hints="files">
src/generic/animateg.cpp
src/msw/bmpcbox.cpp
src/msw/calctrl.cpp
src/msw/datecontrols.cpp
src/msw/datectrl.cpp
</set>
<set var="ADVANCED_MSW_NATIVE_HDR" hints="files">
wx/generic/animate.h
wx/msw/bmpcbox.h
wx/msw/calctrl.h
wx/msw/datecontrols.h

64
build/msw/makefile.bcc
View File

@@ -2031,12 +2031,12 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_tipdlg.obj \
$(OBJS)\monodll_wizard.obj \
$(OBJS)\monodll_taskbarcmn.obj \
$(OBJS)\monodll_animateg.obj \
$(OBJS)\monodll_aboutdlg.obj \
$(OBJS)\monodll_notifmsg.obj \
$(OBJS)\monodll_sound.obj \
$(OBJS)\monodll_taskbar.obj \
$(OBJS)\monodll_joystick.obj \
$(OBJS)\monodll_animateg.obj \
$(OBJS)\monodll_bmpcbox.obj \
$(OBJS)\monodll_calctrl.obj \
$(OBJS)\monodll_datecontrols.obj \
@@ -2070,7 +2070,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_tipdlg.obj \
$(OBJS)\monodll_wizard.obj \
$(OBJS)\monodll_taskbarcmn.obj \
$(OBJS)\monodll_animateg.obj \
$(OBJS)\monodll_aboutdlg.obj \
$(OBJS)\monodll_notifmsg.obj \
$(OBJS)\monodll_sound.obj \
@@ -2713,12 +2712,12 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_tipdlg.obj \
$(OBJS)\monolib_wizard.obj \
$(OBJS)\monolib_taskbarcmn.obj \
$(OBJS)\monolib_animateg.obj \
$(OBJS)\monolib_aboutdlg.obj \
$(OBJS)\monolib_notifmsg.obj \
$(OBJS)\monolib_sound.obj \
$(OBJS)\monolib_taskbar.obj \
$(OBJS)\monolib_joystick.obj \
$(OBJS)\monolib_animateg.obj \
$(OBJS)\monolib_bmpcbox.obj \
$(OBJS)\monolib_calctrl.obj \
$(OBJS)\monolib_datecontrols.obj \
@@ -2752,7 +2751,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_tipdlg.obj \
$(OBJS)\monolib_wizard.obj \
$(OBJS)\monolib_taskbarcmn.obj \
$(OBJS)\monolib_animateg.obj \
$(OBJS)\monolib_aboutdlg.obj \
$(OBJS)\monolib_notifmsg.obj \
$(OBJS)\monolib_sound.obj \
@@ -3794,12 +3792,12 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_tipdlg.obj \
$(OBJS)\advdll_wizard.obj \
$(OBJS)\advdll_taskbarcmn.obj \
$(OBJS)\advdll_animateg.obj \
$(OBJS)\advdll_aboutdlg.obj \
$(OBJS)\advdll_notifmsg.obj \
$(OBJS)\advdll_sound.obj \
$(OBJS)\advdll_taskbar.obj \
$(OBJS)\advdll_joystick.obj \
$(OBJS)\advdll_animateg.obj \
$(OBJS)\advdll_bmpcbox.obj \
$(OBJS)\advdll_calctrl.obj \
$(OBJS)\advdll_datecontrols.obj \
@@ -3833,7 +3831,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_tipdlg.obj \
$(OBJS)\advdll_wizard.obj \
$(OBJS)\advdll_taskbarcmn.obj \
$(OBJS)\advdll_animateg.obj \
$(OBJS)\advdll_aboutdlg.obj \
$(OBJS)\advdll_notifmsg.obj \
$(OBJS)\advdll_sound.obj \
@@ -3873,12 +3870,12 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_tipdlg.obj \
$(OBJS)\advlib_wizard.obj \
$(OBJS)\advlib_taskbarcmn.obj \
$(OBJS)\advlib_animateg.obj \
$(OBJS)\advlib_aboutdlg.obj \
$(OBJS)\advlib_notifmsg.obj \
$(OBJS)\advlib_sound.obj \
$(OBJS)\advlib_taskbar.obj \
$(OBJS)\advlib_joystick.obj \
$(OBJS)\advlib_animateg.obj \
$(OBJS)\advlib_bmpcbox.obj \
$(OBJS)\advlib_calctrl.obj \
$(OBJS)\advlib_datecontrols.obj \
@@ -3912,7 +3909,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_tipdlg.obj \
$(OBJS)\advlib_wizard.obj \
$(OBJS)\advlib_taskbarcmn.obj \
$(OBJS)\advlib_animateg.obj \
$(OBJS)\advlib_aboutdlg.obj \
$(OBJS)\advlib_notifmsg.obj \
$(OBJS)\advlib_sound.obj \
@@ -7579,16 +7575,6 @@ $(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
@@ -7614,6 +7600,11 @@ $(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\joystick.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
!endif
$(OBJS)\monodll_version.res: ..\..\src\msw\version.rc
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_BASE=1 -dWXMAKINGDLL -i..\..\src\stc\scintilla\include -i..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS ..\..\src\msw\version.rc
@@ -9802,16 +9793,6 @@ $(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
@@ -9837,6 +9818,11 @@ $(OBJS)\monolib_joystick.obj: ..\..\src\msw\joystick.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
!endif
$(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
@@ -13386,14 +13372,6 @@ $(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp
$(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
!if "$(WXUNIV)" == "1"
$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
!endif
$(OBJS)\advdll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
@@ -13409,6 +13387,9 @@ $(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp
$(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\joystick.cpp
$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
$(OBJS)\advlib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp
@@ -13502,14 +13483,6 @@ $(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp
$(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
!if "$(WXUNIV)" == "1"
$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
!endif
$(OBJS)\advlib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
@@ -13525,6 +13498,9 @@ $(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp
$(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp
$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
$(OBJS)\mediadll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp

68
build/msw/makefile.gcc
View File

@@ -2052,12 +2052,12 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_tipdlg.o \
$(OBJS)\monodll_wizard.o \
$(OBJS)\monodll_taskbarcmn.o \
$(OBJS)\monodll_animateg.o \
$(OBJS)\monodll_aboutdlg.o \
$(OBJS)\monodll_notifmsg.o \
$(OBJS)\monodll_sound.o \
$(OBJS)\monodll_taskbar.o \
$(OBJS)\monodll_joystick.o \
$(OBJS)\monodll_animateg.o \
$(OBJS)\monodll_bmpcbox.o \
$(OBJS)\monodll_calctrl.o \
$(OBJS)\monodll_datecontrols.o \
@@ -2091,7 +2091,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_tipdlg.o \
$(OBJS)\monodll_wizard.o \
$(OBJS)\monodll_taskbarcmn.o \
$(OBJS)\monodll_animateg.o \
$(OBJS)\monodll_aboutdlg.o \
$(OBJS)\monodll_notifmsg.o \
$(OBJS)\monodll_sound.o \
@@ -2740,12 +2739,12 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_tipdlg.o \
$(OBJS)\monolib_wizard.o \
$(OBJS)\monolib_taskbarcmn.o \
$(OBJS)\monolib_animateg.o \
$(OBJS)\monolib_aboutdlg.o \
$(OBJS)\monolib_notifmsg.o \
$(OBJS)\monolib_sound.o \
$(OBJS)\monolib_taskbar.o \
$(OBJS)\monolib_joystick.o \
$(OBJS)\monolib_animateg.o \
$(OBJS)\monolib_bmpcbox.o \
$(OBJS)\monolib_calctrl.o \
$(OBJS)\monolib_datecontrols.o \
@@ -2779,7 +2778,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_tipdlg.o \
$(OBJS)\monolib_wizard.o \
$(OBJS)\monolib_taskbarcmn.o \
$(OBJS)\monolib_animateg.o \
$(OBJS)\monolib_aboutdlg.o \
$(OBJS)\monolib_notifmsg.o \
$(OBJS)\monolib_sound.o \
@@ -3849,12 +3847,12 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_tipdlg.o \
$(OBJS)\advdll_wizard.o \
$(OBJS)\advdll_taskbarcmn.o \
$(OBJS)\advdll_animateg.o \
$(OBJS)\advdll_aboutdlg.o \
$(OBJS)\advdll_notifmsg.o \
$(OBJS)\advdll_sound.o \
$(OBJS)\advdll_taskbar.o \
$(OBJS)\advdll_joystick.o \
$(OBJS)\advdll_animateg.o \
$(OBJS)\advdll_bmpcbox.o \
$(OBJS)\advdll_calctrl.o \
$(OBJS)\advdll_datecontrols.o \
@@ -3888,7 +3886,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_tipdlg.o \
$(OBJS)\advdll_wizard.o \
$(OBJS)\advdll_taskbarcmn.o \
$(OBJS)\advdll_animateg.o \
$(OBJS)\advdll_aboutdlg.o \
$(OBJS)\advdll_notifmsg.o \
$(OBJS)\advdll_sound.o \
@@ -3932,12 +3929,12 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_tipdlg.o \
$(OBJS)\advlib_wizard.o \
$(OBJS)\advlib_taskbarcmn.o \
$(OBJS)\advlib_animateg.o \
$(OBJS)\advlib_aboutdlg.o \
$(OBJS)\advlib_notifmsg.o \
$(OBJS)\advlib_sound.o \
$(OBJS)\advlib_taskbar.o \
$(OBJS)\advlib_joystick.o \
$(OBJS)\advlib_animateg.o \
$(OBJS)\advlib_bmpcbox.o \
$(OBJS)\advlib_calctrl.o \
$(OBJS)\advlib_datecontrols.o \
@@ -3971,7 +3968,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_tipdlg.o \
$(OBJS)\advlib_wizard.o \
$(OBJS)\advlib_taskbarcmn.o \
$(OBJS)\advlib_animateg.o \
$(OBJS)\advlib_aboutdlg.o \
$(OBJS)\advlib_notifmsg.o \
$(OBJS)\advlib_sound.o \
@@ -7843,18 +7839,6 @@ $(OBJS)\monodll_taskbarcmn.o: ../../src/common/taskbarcmn.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_animateg.o: ../../src/generic/animateg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
ifeq ($(WXUNIV),1)
$(OBJS)\monodll_animateg.o: ../../src/generic/animateg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_aboutdlg.o: ../../src/msw/aboutdlg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -7880,6 +7864,11 @@ $(OBJS)\monodll_joystick.o: ../../src/msw/joystick.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_animateg.o: ../../src/generic/animateg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
$(OBJS)\monodll_version_rc.o: ../../src/msw/version.rc
windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) --include-dir $(SETUPHDIR) --include-dir ../../include --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define wxUSE_BASE=1 --define WXMAKINGDLL --include-dir ../../src/stc/scintilla/include --include-dir ../../src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS
@@ -10180,18 +10169,6 @@ $(OBJS)\monolib_taskbarcmn.o: ../../src/common/taskbarcmn.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_animateg.o: ../../src/generic/animateg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
ifeq ($(WXUNIV),1)
$(OBJS)\monolib_animateg.o: ../../src/generic/animateg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_aboutdlg.o: ../../src/msw/aboutdlg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -10217,6 +10194,11 @@ $(OBJS)\monolib_joystick.o: ../../src/msw/joystick.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_animateg.o: ../../src/generic/animateg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
$(OBJS)\basedll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -13990,14 +13972,6 @@ $(OBJS)\advdll_wizard.o: ../../src/generic/wizard.cpp
$(OBJS)\advdll_taskbarcmn.o: ../../src/common/taskbarcmn.cpp
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\advdll_animateg.o: ../../src/generic/animateg.cpp
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
ifeq ($(WXUNIV),1)
$(OBJS)\advdll_animateg.o: ../../src/generic/animateg.cpp
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
endif
$(OBJS)\advdll_aboutdlg.o: ../../src/msw/aboutdlg.cpp
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -14013,6 +13987,9 @@ $(OBJS)\advdll_taskbar.o: ../../src/msw/taskbar.cpp
$(OBJS)\advdll_joystick.o: ../../src/msw/joystick.cpp
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\advdll_animateg.o: ../../src/generic/animateg.cpp
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\advlib_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -14106,14 +14083,6 @@ $(OBJS)\advlib_wizard.o: ../../src/generic/wizard.cpp
$(OBJS)\advlib_taskbarcmn.o: ../../src/common/taskbarcmn.cpp
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\advlib_animateg.o: ../../src/generic/animateg.cpp
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
ifeq ($(WXUNIV),1)
$(OBJS)\advlib_animateg.o: ../../src/generic/animateg.cpp
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
endif
$(OBJS)\advlib_aboutdlg.o: ../../src/msw/aboutdlg.cpp
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -14129,6 +14098,9 @@ $(OBJS)\advlib_taskbar.o: ../../src/msw/taskbar.cpp
$(OBJS)\advlib_joystick.o: ../../src/msw/joystick.cpp
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\advlib_animateg.o: ../../src/generic/animateg.cpp
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\mediadll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(MEDIADLL_CXXFLAGS) $(CPPDEPS) $<

64
build/msw/makefile.vc
View File

@@ -2211,12 +2211,12 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_tipdlg.obj \
$(OBJS)\monodll_wizard.obj \
$(OBJS)\monodll_taskbarcmn.obj \
$(OBJS)\monodll_animateg.obj \
$(OBJS)\monodll_aboutdlg.obj \
$(OBJS)\monodll_notifmsg.obj \
$(OBJS)\monodll_sound.obj \
$(OBJS)\monodll_taskbar.obj \
$(OBJS)\monodll_joystick.obj \
$(OBJS)\monodll_animateg.obj \
$(OBJS)\monodll_bmpcbox.obj \
$(OBJS)\monodll_calctrl.obj \
$(OBJS)\monodll_datecontrols.obj \
@@ -2250,7 +2250,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_tipdlg.obj \
$(OBJS)\monodll_wizard.obj \
$(OBJS)\monodll_taskbarcmn.obj \
$(OBJS)\monodll_animateg.obj \
$(OBJS)\monodll_aboutdlg.obj \
$(OBJS)\monodll_notifmsg.obj \
$(OBJS)\monodll_sound.obj \
@@ -2899,12 +2898,12 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_tipdlg.obj \
$(OBJS)\monolib_wizard.obj \
$(OBJS)\monolib_taskbarcmn.obj \
$(OBJS)\monolib_animateg.obj \
$(OBJS)\monolib_aboutdlg.obj \
$(OBJS)\monolib_notifmsg.obj \
$(OBJS)\monolib_sound.obj \
$(OBJS)\monolib_taskbar.obj \
$(OBJS)\monolib_joystick.obj \
$(OBJS)\monolib_animateg.obj \
$(OBJS)\monolib_bmpcbox.obj \
$(OBJS)\monolib_calctrl.obj \
$(OBJS)\monolib_datecontrols.obj \
@@ -2938,7 +2937,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_tipdlg.obj \
$(OBJS)\monolib_wizard.obj \
$(OBJS)\monolib_taskbarcmn.obj \
$(OBJS)\monolib_animateg.obj \
$(OBJS)\monolib_aboutdlg.obj \
$(OBJS)\monolib_notifmsg.obj \
$(OBJS)\monolib_sound.obj \
@@ -4022,12 +4020,12 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_tipdlg.obj \
$(OBJS)\advdll_wizard.obj \
$(OBJS)\advdll_taskbarcmn.obj \
$(OBJS)\advdll_animateg.obj \
$(OBJS)\advdll_aboutdlg.obj \
$(OBJS)\advdll_notifmsg.obj \
$(OBJS)\advdll_sound.obj \
$(OBJS)\advdll_taskbar.obj \
$(OBJS)\advdll_joystick.obj \
$(OBJS)\advdll_animateg.obj \
$(OBJS)\advdll_bmpcbox.obj \
$(OBJS)\advdll_calctrl.obj \
$(OBJS)\advdll_datecontrols.obj \
@@ -4061,7 +4059,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_tipdlg.obj \
$(OBJS)\advdll_wizard.obj \
$(OBJS)\advdll_taskbarcmn.obj \
$(OBJS)\advdll_animateg.obj \
$(OBJS)\advdll_aboutdlg.obj \
$(OBJS)\advdll_notifmsg.obj \
$(OBJS)\advdll_sound.obj \
@@ -4107,12 +4104,12 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_tipdlg.obj \
$(OBJS)\advlib_wizard.obj \
$(OBJS)\advlib_taskbarcmn.obj \
$(OBJS)\advlib_animateg.obj \
$(OBJS)\advlib_aboutdlg.obj \
$(OBJS)\advlib_notifmsg.obj \
$(OBJS)\advlib_sound.obj \
$(OBJS)\advlib_taskbar.obj \
$(OBJS)\advlib_joystick.obj \
$(OBJS)\advlib_animateg.obj \
$(OBJS)\advlib_bmpcbox.obj \
$(OBJS)\advlib_calctrl.obj \
$(OBJS)\advlib_datecontrols.obj \
@@ -4146,7 +4143,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_tipdlg.obj \
$(OBJS)\advlib_wizard.obj \
$(OBJS)\advlib_taskbarcmn.obj \
$(OBJS)\advlib_animateg.obj \
$(OBJS)\advlib_aboutdlg.obj \
$(OBJS)\advlib_notifmsg.obj \
$(OBJS)\advlib_sound.obj \
@@ -7925,16 +7921,6 @@ $(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
@@ -7960,6 +7946,11 @@ $(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\joystick.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
!endif
$(OBJS)\monodll_version.res: ..\..\src\msw\version.rc
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_64) /d __WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_BASE=1 /d WXMAKINGDLL /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS ..\..\src\msw\version.rc
@@ -10148,16 +10139,6 @@ $(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
@@ -10183,6 +10164,11 @@ $(OBJS)\monolib_joystick.obj: ..\..\src\msw\joystick.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
!endif
$(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
@@ -13732,14 +13718,6 @@ $(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp
$(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
!if "$(WXUNIV)" == "1"
$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
!endif
$(OBJS)\advdll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
@@ -13755,6 +13733,9 @@ $(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp
$(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\joystick.cpp
$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
$(OBJS)\advlib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
@@ -13848,14 +13829,6 @@ $(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp
$(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
!if "$(WXUNIV)" == "1"
$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
!endif
$(OBJS)\advlib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
@@ -13871,6 +13844,9 @@ $(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp
$(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp
$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
$(OBJS)\mediadll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

68
build/msw/makefile.wat
View File

@@ -730,12 +730,12 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_tipdlg.obj &
$(OBJS)\monodll_wizard.obj &
$(OBJS)\monodll_taskbarcmn.obj &
$(OBJS)\monodll_animateg.obj &
$(OBJS)\monodll_aboutdlg.obj &
$(OBJS)\monodll_notifmsg.obj &
$(OBJS)\monodll_sound.obj &
$(OBJS)\monodll_taskbar.obj &
$(OBJS)\monodll_joystick.obj &
$(OBJS)\monodll_animateg.obj &
$(OBJS)\monodll_bmpcbox.obj &
$(OBJS)\monodll_calctrl.obj &
$(OBJS)\monodll_datecontrols.obj &
@@ -769,7 +769,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_tipdlg.obj &
$(OBJS)\monodll_wizard.obj &
$(OBJS)\monodll_taskbarcmn.obj &
$(OBJS)\monodll_animateg.obj &
$(OBJS)\monodll_aboutdlg.obj &
$(OBJS)\monodll_notifmsg.obj &
$(OBJS)\monodll_sound.obj &
@@ -1423,12 +1422,12 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_tipdlg.obj &
$(OBJS)\monolib_wizard.obj &
$(OBJS)\monolib_taskbarcmn.obj &
$(OBJS)\monolib_animateg.obj &
$(OBJS)\monolib_aboutdlg.obj &
$(OBJS)\monolib_notifmsg.obj &
$(OBJS)\monolib_sound.obj &
$(OBJS)\monolib_taskbar.obj &
$(OBJS)\monolib_joystick.obj &
$(OBJS)\monolib_animateg.obj &
$(OBJS)\monolib_bmpcbox.obj &
$(OBJS)\monolib_calctrl.obj &
$(OBJS)\monolib_datecontrols.obj &
@@ -1462,7 +1461,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_tipdlg.obj &
$(OBJS)\monolib_wizard.obj &
$(OBJS)\monolib_taskbarcmn.obj &
$(OBJS)\monolib_animateg.obj &
$(OBJS)\monolib_aboutdlg.obj &
$(OBJS)\monolib_notifmsg.obj &
$(OBJS)\monolib_sound.obj &
@@ -2548,12 +2546,12 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\advdll_tipdlg.obj &
$(OBJS)\advdll_wizard.obj &
$(OBJS)\advdll_taskbarcmn.obj &
$(OBJS)\advdll_animateg.obj &
$(OBJS)\advdll_aboutdlg.obj &
$(OBJS)\advdll_notifmsg.obj &
$(OBJS)\advdll_sound.obj &
$(OBJS)\advdll_taskbar.obj &
$(OBJS)\advdll_joystick.obj &
$(OBJS)\advdll_animateg.obj &
$(OBJS)\advdll_bmpcbox.obj &
$(OBJS)\advdll_calctrl.obj &
$(OBJS)\advdll_datecontrols.obj &
@@ -2587,7 +2585,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\advdll_tipdlg.obj &
$(OBJS)\advdll_wizard.obj &
$(OBJS)\advdll_taskbarcmn.obj &
$(OBJS)\advdll_animateg.obj &
$(OBJS)\advdll_aboutdlg.obj &
$(OBJS)\advdll_notifmsg.obj &
$(OBJS)\advdll_sound.obj &
@@ -2633,12 +2630,12 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\advlib_tipdlg.obj &
$(OBJS)\advlib_wizard.obj &
$(OBJS)\advlib_taskbarcmn.obj &
$(OBJS)\advlib_animateg.obj &
$(OBJS)\advlib_aboutdlg.obj &
$(OBJS)\advlib_notifmsg.obj &
$(OBJS)\advlib_sound.obj &
$(OBJS)\advlib_taskbar.obj &
$(OBJS)\advlib_joystick.obj &
$(OBJS)\advlib_animateg.obj &
$(OBJS)\advlib_bmpcbox.obj &
$(OBJS)\advlib_calctrl.obj &
$(OBJS)\advlib_datecontrols.obj &
@@ -2672,7 +2669,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\advlib_tipdlg.obj &
$(OBJS)\advlib_wizard.obj &
$(OBJS)\advlib_taskbarcmn.obj &
$(OBJS)\advlib_animateg.obj &
$(OBJS)\advlib_aboutdlg.obj &
$(OBJS)\advlib_notifmsg.obj &
$(OBJS)\advlib_sound.obj &
@@ -8088,18 +8084,6 @@ $(OBJS)\monodll_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
!ifeq WXUNIV 1
$(OBJS)\monodll_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_aboutdlg.obj : .AUTODEPEND ..\..\src\msw\aboutdlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -8125,6 +8109,11 @@ $(OBJS)\monodll_joystick.obj : .AUTODEPEND ..\..\src\msw\joystick.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
$(OBJS)\monodll_version.res : .AUTODEPEND ..\..\src\msw\version.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_wat$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_BASE=1 -dWXMAKINGDLL -i=..\..\src\stc\scintilla\include -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS $<
@@ -10425,18 +10414,6 @@ $(OBJS)\monolib_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
!ifeq WXUNIV 1
$(OBJS)\monolib_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_aboutdlg.obj : .AUTODEPEND ..\..\src\msw\aboutdlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -10462,6 +10439,11 @@ $(OBJS)\monolib_joystick.obj : .AUTODEPEND ..\..\src\msw\joystick.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
$(OBJS)\basedll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
@@ -14235,14 +14217,6 @@ $(OBJS)\advdll_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp
$(OBJS)\advdll_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
$(OBJS)\advdll_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
!ifeq WXUNIV 1
$(OBJS)\advdll_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
!endif
$(OBJS)\advdll_aboutdlg.obj : .AUTODEPEND ..\..\src\msw\aboutdlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
@@ -14258,6 +14232,9 @@ $(OBJS)\advdll_taskbar.obj : .AUTODEPEND ..\..\src\msw\taskbar.cpp
$(OBJS)\advdll_joystick.obj : .AUTODEPEND ..\..\src\msw\joystick.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
$(OBJS)\advdll_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
$(OBJS)\advlib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
@@ -14351,14 +14328,6 @@ $(OBJS)\advlib_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp
$(OBJS)\advlib_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
$(OBJS)\advlib_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
!ifeq WXUNIV 1
$(OBJS)\advlib_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
!endif
$(OBJS)\advlib_aboutdlg.obj : .AUTODEPEND ..\..\src\msw\aboutdlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
@@ -14374,6 +14343,9 @@ $(OBJS)\advlib_taskbar.obj : .AUTODEPEND ..\..\src\msw\taskbar.cpp
$(OBJS)\advlib_joystick.obj : .AUTODEPEND ..\..\src\msw\joystick.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
$(OBJS)\advlib_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
$(OBJS)\mediadll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MEDIADLL_CXXFLAGS) $<

27
build/msw/wx_adv.dsp
View File

@@ -482,33 +482,6 @@ SOURCE=..\..\src\generic\aboutdlgg.cpp
# Begin Source File
SOURCE=..\..\src\generic\animateg.cpp
!IF "$(CFG)" == "adv - Win32 DLL Universal Release"
!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug"
!ELSEIF "$(CFG)" == "adv - Win32 DLL Release"
!ELSEIF "$(CFG)" == "adv - Win32 DLL Debug"
!ELSEIF "$(CFG)" == "adv - Win32 Universal Release"
!ELSEIF "$(CFG)" == "adv - Win32 Universal Debug"
!ELSEIF "$(CFG)" == "adv - Win32 Release"
!ELSEIF "$(CFG)" == "adv - Win32 Debug"
!ENDIF
# End Source File
# Begin Source File