From: Vadim Zeitlin Date: Sun, 5 Nov 2006 00:03:13 +0000 (+0000) Subject: fixed typo in files.bkl which broke wxUniv link (why oh why didn't bakefile tell... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/15a6b8966884f478b394fb521705141f6f8ba439 fixed typo in files.bkl which broke wxUniv link (why oh why didn't bakefile tell me I forgot a bracket?) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/Makefile.in b/Makefile.in index 2d189bec8f..d554e2c2c3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -4887,7 +4887,8 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS = \ monodll_splash.o \ monodll_tipdlg.o \ monodll_wizard.o \ - $(__ADVANCED_PLATFORM_SRC_OBJECTS) + $(__ADVANCED_PLATFORM_SRC_OBJECTS) \ + monodll_animateg.o @COND_WXUNIV_1@__ADVANCED_SRC_OBJECTS = $(COND_WXUNIV_1___ADVANCED_SRC_OBJECTS) @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS \ @COND_TOOLKIT_MSW@ = monodll_datectrl.o @@ -6645,7 +6646,8 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_1 = \ monolib_splash.o \ monolib_tipdlg.o \ monolib_wizard.o \ - $(__ADVANCED_PLATFORM_SRC_OBJECTS_0) + $(__ADVANCED_PLATFORM_SRC_OBJECTS_0) \ + monolib_animateg.o @COND_WXUNIV_1@__ADVANCED_SRC_OBJECTS_1 = $(COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_1) @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 \ @COND_TOOLKIT_MSW@ = monolib_datectrl.o @@ -10121,7 +10123,8 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_2 = \ advdll_splash.o \ advdll_tipdlg.o \ advdll_wizard.o \ - $(__ADVANCED_PLATFORM_SRC_OBJECTS_8) + $(__ADVANCED_PLATFORM_SRC_OBJECTS_8) \ + advdll_animateg.o @COND_WXUNIV_1@__ADVANCED_SRC_OBJECTS_2 = $(COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_2) @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 \ @COND_TOOLKIT_MSW@ = advdll_datectrl.o @@ -10184,7 +10187,8 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3 = \ advlib_splash.o \ advlib_tipdlg.o \ advlib_wizard.o \ - $(__ADVANCED_PLATFORM_SRC_OBJECTS_9) + $(__ADVANCED_PLATFORM_SRC_OBJECTS_9) \ + advlib_animateg.o @COND_WXUNIV_1@__ADVANCED_SRC_OBJECTS_3 = $(COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3) @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 \ @COND_TOOLKIT_MSW@ = advlib_datectrl.o @@ -16389,6 +16393,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp +@COND_USE_GUI_1_WXUNIV_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp + @COND_TOOLKIT_MSW_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp @@ -20484,6 +20491,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp +@COND_USE_GUI_1_WXUNIV_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp + @COND_TOOLKIT_MSW_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp @@ -27861,6 +27871,9 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_PM@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp +@COND_WXUNIV_1@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP) +@COND_WXUNIV_1@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp + @COND_TOOLKIT_MSW@advdll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp @@ -28080,6 +28093,9 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_PM@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp +@COND_WXUNIV_1@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP) +@COND_WXUNIV_1@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp + @COND_TOOLKIT_MSW@advlib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 7333fdbeb6..819f5a2225 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -3372,7 +3372,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! $(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC) $(ADVANCED_PLATFORM_NATIVE_SRC) - $(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC) $(ADVANCED_UNIV_SRC + $(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC) $(ADVANCED_UNIV_SRC) $(ADVANCED_CMN_HDR) $(ADVANCED_CMN_NATIVE_HDR) $(ADVANCED_PLATFORM_HDR) $(ADVANCED_PLATFORM_NATIVE_HDR) diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 441d2a4101..81810207bc 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -1809,7 +1809,8 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_aboutdlg.obj \ $(OBJS)\monodll_sound.obj \ $(OBJS)\monodll_taskbar.obj \ - $(OBJS)\monodll_joystick.obj + $(OBJS)\monodll_joystick.obj \ + $(OBJS)\monodll_animateg.obj !endif !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0" __monolib___depname = \ @@ -2420,7 +2421,8 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_aboutdlg.obj \ $(OBJS)\monolib_sound.obj \ $(OBJS)\monolib_taskbar.obj \ - $(OBJS)\monolib_joystick.obj + $(OBJS)\monolib_joystick.obj \ + $(OBJS)\monolib_animateg.obj !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" __basedll___depname = \ @@ -3391,7 +3393,8 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_aboutdlg.obj \ $(OBJS)\advdll_sound.obj \ $(OBJS)\advdll_taskbar.obj \ - $(OBJS)\advdll_joystick.obj + $(OBJS)\advdll_joystick.obj \ + $(OBJS)\advdll_animateg.obj !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" __advlib___depname = \ @@ -3452,7 +3455,8 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_aboutdlg.obj \ $(OBJS)\advlib_sound.obj \ $(OBJS)\advlib_taskbar.obj \ - $(OBJS)\advlib_joystick.obj + $(OBJS)\advlib_joystick.obj \ + $(OBJS)\advlib_animateg.obj !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1" __mediadll___depname = \ @@ -6465,6 +6469,11 @@ $(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -8449,6 +8458,11 @@ $(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -11694,6 +11708,11 @@ $(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp $(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** +!if "$(WXUNIV)" == "1" +$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** +!endif + $(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** @@ -11775,6 +11794,11 @@ $(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp $(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** +!if "$(WXUNIV)" == "1" +$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** +!endif + $(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 02fb681ffb..f43bd6f374 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1822,7 +1822,8 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_aboutdlg.o \ $(OBJS)\monodll_sound.o \ $(OBJS)\monodll_taskbar.o \ - $(OBJS)\monodll_joystick.o + $(OBJS)\monodll_joystick.o \ + $(OBJS)\monodll_animateg.o endif ifeq ($(MONOLITHIC),1) ifeq ($(SHARED),0) @@ -2439,7 +2440,8 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_aboutdlg.o \ $(OBJS)\monolib_sound.o \ $(OBJS)\monolib_taskbar.o \ - $(OBJS)\monolib_joystick.o + $(OBJS)\monolib_joystick.o \ + $(OBJS)\monolib_animateg.o endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) @@ -3438,7 +3440,8 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_aboutdlg.o \ $(OBJS)\advdll_sound.o \ $(OBJS)\advdll_taskbar.o \ - $(OBJS)\advdll_joystick.o + $(OBJS)\advdll_joystick.o \ + $(OBJS)\advdll_animateg.o endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),0) @@ -3503,7 +3506,8 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_aboutdlg.o \ $(OBJS)\advlib_sound.o \ $(OBJS)\advlib_taskbar.o \ - $(OBJS)\advlib_joystick.o + $(OBJS)\advlib_joystick.o \ + $(OBJS)\advlib_animateg.o endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),1) @@ -6682,6 +6686,13 @@ $(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_taskbarcmn.o: ../../src/common/taskbarcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -8766,6 +8777,13 @@ $(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_taskbarcmn.o: ../../src/common/taskbarcmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -12211,6 +12229,11 @@ $(OBJS)\advdll_wizard.o: ../../src/generic/wizard.cpp $(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_taskbarcmn.o: ../../src/common/taskbarcmn.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< @@ -12292,6 +12315,11 @@ $(OBJS)\advlib_wizard.o: ../../src/generic/wizard.cpp $(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_taskbarcmn.o: ../../src/common/taskbarcmn.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 8a1244d9fe..db05d08fe7 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -1976,7 +1976,8 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_aboutdlg.obj \ $(OBJS)\monodll_sound.obj \ $(OBJS)\monodll_taskbar.obj \ - $(OBJS)\monodll_joystick.obj + $(OBJS)\monodll_joystick.obj \ + $(OBJS)\monodll_animateg.obj !endif !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0" __monolib___depname = \ @@ -2593,7 +2594,8 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_aboutdlg.obj \ $(OBJS)\monolib_sound.obj \ $(OBJS)\monolib_taskbar.obj \ - $(OBJS)\monolib_joystick.obj + $(OBJS)\monolib_joystick.obj \ + $(OBJS)\monolib_animateg.obj !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" __basedll___depname = \ @@ -3606,7 +3608,8 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_aboutdlg.obj \ $(OBJS)\advdll_sound.obj \ $(OBJS)\advdll_taskbar.obj \ - $(OBJS)\advdll_joystick.obj + $(OBJS)\advdll_joystick.obj \ + $(OBJS)\advdll_animateg.obj !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" __advlib___depname = \ @@ -3673,7 +3676,8 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_aboutdlg.obj \ $(OBJS)\advlib_sound.obj \ $(OBJS)\advlib_taskbar.obj \ - $(OBJS)\advlib_joystick.obj + $(OBJS)\advlib_joystick.obj \ + $(OBJS)\advlib_animateg.obj !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1" __mediadll___depname = \ @@ -6798,6 +6802,11 @@ $(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -8782,6 +8791,11 @@ $(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" +$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -12027,6 +12041,11 @@ $(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp $(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** +!if "$(WXUNIV)" == "1" +$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** +!endif + $(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** @@ -12108,6 +12127,11 @@ $(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp $(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** +!if "$(WXUNIV)" == "1" +$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** +!endif + $(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index 7c96f6dc08..d781aba9d4 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -707,7 +707,8 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_aboutdlg.obj & $(OBJS)\monodll_sound.obj & $(OBJS)\monodll_taskbar.obj & - $(OBJS)\monodll_joystick.obj + $(OBJS)\monodll_joystick.obj & + $(OBJS)\monodll_animateg.obj !endif __monolib___depname = !ifeq MONOLITHIC 1 @@ -1328,7 +1329,8 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_aboutdlg.obj & $(OBJS)\monolib_sound.obj & $(OBJS)\monolib_taskbar.obj & - $(OBJS)\monolib_joystick.obj + $(OBJS)\monolib_joystick.obj & + $(OBJS)\monolib_animateg.obj !endif __basedll___depname = !ifeq MONOLITHIC 0 @@ -2337,7 +2339,8 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\advdll_aboutdlg.obj & $(OBJS)\advdll_sound.obj & $(OBJS)\advdll_taskbar.obj & - $(OBJS)\advdll_joystick.obj + $(OBJS)\advdll_joystick.obj & + $(OBJS)\advdll_animateg.obj !endif __advlib___depname = !ifeq MONOLITHIC 0 @@ -2404,7 +2407,8 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\advlib_aboutdlg.obj & $(OBJS)\advlib_sound.obj & $(OBJS)\advlib_taskbar.obj & - $(OBJS)\advlib_joystick.obj + $(OBJS)\advlib_joystick.obj & + $(OBJS)\advlib_animateg.obj !endif __mediadll___depname = !ifeq MONOLITHIC 0 @@ -6910,6 +6914,13 @@ $(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_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -8994,6 +9005,13 @@ $(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_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -12439,6 +12457,11 @@ $(OBJS)\advdll_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp $(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_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< @@ -12520,6 +12543,11 @@ $(OBJS)\advlib_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp $(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_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< diff --git a/build/msw/wx_adv.dsp b/build/msw/wx_adv.dsp index ebbc6c1ff7..44d87f91bf 100644 --- a/build/msw/wx_adv.dsp +++ b/build/msw/wx_adv.dsp @@ -625,6 +625,57 @@ SOURCE=..\..\src\generic\aboutdlgg.cpp # Begin Source File SOURCE=..\..\src\generic\animateg.cpp + +!IF "$(CFG)" == "adv - Win32 DLL Universal Unicode Release" + + +!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug" + + +!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Release" + + +!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug" + + +!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Release" + + +!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Debug" + + +!ELSEIF "$(CFG)" == "adv - Win32 DLL Release" + + +!ELSEIF "$(CFG)" == "adv - Win32 DLL Debug" + + +!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Release" + + +!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Debug" + + +!ELSEIF "$(CFG)" == "adv - Win32 Universal Release" + + +!ELSEIF "$(CFG)" == "adv - Win32 Universal Debug" + + +!ELSEIF "$(CFG)" == "adv - Win32 Unicode Release" + + +!ELSEIF "$(CFG)" == "adv - Win32 Unicode Debug" + + +!ELSEIF "$(CFG)" == "adv - Win32 Release" + + +!ELSEIF "$(CFG)" == "adv - Win32 Debug" + + +!ENDIF + # End Source File # Begin Source File