From 25c0717a43f93ef3901a1e28762753902569da5b Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 2 Aug 2003 14:34:42 +0000 Subject: [PATCH] moved wxWave, wxJoystick and wxTaskBarIcon to wxAdvanced git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22490 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/makefile.bcc | 132 ++++-------- build/makefile.gcc | 132 ++++-------- build/makefile.vc | 132 ++++-------- build/makefile.wat | 132 ++++-------- src/gtk1/joystick.cpp | 368 --------------------------------- src/gtk1/wave.cpp | 228 -------------------- src/{gtk => unix}/joystick.cpp | 0 src/{gtk => unix}/wave.cpp | 0 8 files changed, 168 insertions(+), 956 deletions(-) delete mode 100644 src/gtk1/joystick.cpp delete mode 100644 src/gtk1/wave.cpp rename src/{gtk => unix}/joystick.cpp (100%) rename src/{gtk => unix}/wave.cpp (100%) diff --git a/build/makefile.bcc b/build/makefile.bcc index 4f61f04c31..1cd555743f 100644 --- a/build/makefile.bcc +++ b/build/makefile.bcc @@ -38,7 +38,11 @@ ADVDLL_OBJECTS = \ $(OBJS)\advdll_sashwin.obj \ $(OBJS)\advdll_splash.obj \ $(OBJS)\advdll_tipdlg.obj \ - $(OBJS)\advdll_wizard.obj + $(OBJS)\advdll_wizard.obj \ + $(OBJS)\advdll_taskbarcmn.obj \ + $(OBJS)\advdll_joystick.obj \ + $(OBJS)\advdll_taskbar.obj \ + $(OBJS)\advdll_wave.obj ADVLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \ @@ -57,7 +61,11 @@ ADVLIB_OBJECTS = \ $(OBJS)\advlib_sashwin.obj \ $(OBJS)\advlib_splash.obj \ $(OBJS)\advlib_tipdlg.obj \ - $(OBJS)\advlib_wizard.obj + $(OBJS)\advlib_wizard.obj \ + $(OBJS)\advlib_taskbarcmn.obj \ + $(OBJS)\advlib_joystick.obj \ + $(OBJS)\advlib_taskbar.obj \ + $(OBJS)\advlib_wave.obj BASEDLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \ @@ -818,7 +826,6 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_1_OBJECTS = \ - $(OBJS)\monolib_taskbarcmn.obj \ $(OBJS)\monolib_app.obj \ $(OBJS)\monolib_bitmap.obj \ $(OBJS)\monolib_brush.obj \ @@ -846,7 +853,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_helpchm.obj \ $(OBJS)\monolib_helpwin.obj \ $(OBJS)\monolib_icon.obj \ - $(OBJS)\monolib_joystick.obj \ $(OBJS)\monolib_minifram.obj \ $(OBJS)\monolib_automtn.obj \ $(OBJS)\monolib_dataobj.obj \ @@ -860,13 +866,11 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_region.obj \ $(OBJS)\monolib_renderer.obj \ $(OBJS)\monolib_settings.obj \ - $(OBJS)\monolib_taskbar.obj \ $(OBJS)\monolib_timer.obj \ $(OBJS)\monolib_tooltip.obj \ $(OBJS)\monolib_toplevel.obj \ $(OBJS)\monolib_utilsgui.obj \ $(OBJS)\monolib_uxtheme.obj \ - $(OBJS)\monolib_wave.obj \ $(OBJS)\monolib_window.obj \ $(OBJS)\monolib_statusbr.obj \ $(OBJS)\monolib_accel.obj \ @@ -1011,7 +1015,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" ____CORE_SRC_FILENAMES_1_OBJECTS = \ - $(OBJS)\monolib_taskbarcmn.obj \ $(OBJS)\monolib_app.obj \ $(OBJS)\monolib_bitmap.obj \ $(OBJS)\monolib_brush.obj \ @@ -1039,7 +1042,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_helpchm.obj \ $(OBJS)\monolib_helpwin.obj \ $(OBJS)\monolib_icon.obj \ - $(OBJS)\monolib_joystick.obj \ $(OBJS)\monolib_minifram.obj \ $(OBJS)\monolib_automtn.obj \ $(OBJS)\monolib_dataobj.obj \ @@ -1053,13 +1055,11 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_region.obj \ $(OBJS)\monolib_renderer.obj \ $(OBJS)\monolib_settings.obj \ - $(OBJS)\monolib_taskbar.obj \ $(OBJS)\monolib_timer.obj \ $(OBJS)\monolib_tooltip.obj \ $(OBJS)\monolib_toplevel.obj \ $(OBJS)\monolib_utilsgui.obj \ $(OBJS)\monolib_uxtheme.obj \ - $(OBJS)\monolib_wave.obj \ $(OBJS)\monolib_window.obj \ $(OBJS)\monolib_textctrl.obj \ $(OBJS)\monolib_accel.obj \ @@ -1204,7 +1204,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_2_OBJECTS = \ - $(OBJS)\coredll_taskbarcmn.obj \ $(OBJS)\coredll_app.obj \ $(OBJS)\coredll_bitmap.obj \ $(OBJS)\coredll_brush.obj \ @@ -1232,7 +1231,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_helpchm.obj \ $(OBJS)\coredll_helpwin.obj \ $(OBJS)\coredll_icon.obj \ - $(OBJS)\coredll_joystick.obj \ $(OBJS)\coredll_minifram.obj \ $(OBJS)\coredll_automtn.obj \ $(OBJS)\coredll_dataobj.obj \ @@ -1246,13 +1244,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_region.obj \ $(OBJS)\coredll_renderer.obj \ $(OBJS)\coredll_settings.obj \ - $(OBJS)\coredll_taskbar.obj \ $(OBJS)\coredll_timer.obj \ $(OBJS)\coredll_tooltip.obj \ $(OBJS)\coredll_toplevel.obj \ $(OBJS)\coredll_utilsgui.obj \ $(OBJS)\coredll_uxtheme.obj \ - $(OBJS)\coredll_wave.obj \ $(OBJS)\coredll_window.obj \ $(OBJS)\coredll_statusbr.obj \ $(OBJS)\coredll_accel.obj \ @@ -1397,7 +1393,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" ____CORE_SRC_FILENAMES_2_OBJECTS = \ - $(OBJS)\coredll_taskbarcmn.obj \ $(OBJS)\coredll_app.obj \ $(OBJS)\coredll_bitmap.obj \ $(OBJS)\coredll_brush.obj \ @@ -1425,7 +1420,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_helpchm.obj \ $(OBJS)\coredll_helpwin.obj \ $(OBJS)\coredll_icon.obj \ - $(OBJS)\coredll_joystick.obj \ $(OBJS)\coredll_minifram.obj \ $(OBJS)\coredll_automtn.obj \ $(OBJS)\coredll_dataobj.obj \ @@ -1439,13 +1433,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_region.obj \ $(OBJS)\coredll_renderer.obj \ $(OBJS)\coredll_settings.obj \ - $(OBJS)\coredll_taskbar.obj \ $(OBJS)\coredll_timer.obj \ $(OBJS)\coredll_tooltip.obj \ $(OBJS)\coredll_toplevel.obj \ $(OBJS)\coredll_utilsgui.obj \ $(OBJS)\coredll_uxtheme.obj \ - $(OBJS)\coredll_wave.obj \ $(OBJS)\coredll_window.obj \ $(OBJS)\coredll_textctrl.obj \ $(OBJS)\coredll_accel.obj \ @@ -1590,7 +1582,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_3_OBJECTS = \ - $(OBJS)\corelib_taskbarcmn.obj \ $(OBJS)\corelib_app.obj \ $(OBJS)\corelib_bitmap.obj \ $(OBJS)\corelib_brush.obj \ @@ -1618,7 +1609,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_helpchm.obj \ $(OBJS)\corelib_helpwin.obj \ $(OBJS)\corelib_icon.obj \ - $(OBJS)\corelib_joystick.obj \ $(OBJS)\corelib_minifram.obj \ $(OBJS)\corelib_automtn.obj \ $(OBJS)\corelib_dataobj.obj \ @@ -1632,13 +1622,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_region.obj \ $(OBJS)\corelib_renderer.obj \ $(OBJS)\corelib_settings.obj \ - $(OBJS)\corelib_taskbar.obj \ $(OBJS)\corelib_timer.obj \ $(OBJS)\corelib_tooltip.obj \ $(OBJS)\corelib_toplevel.obj \ $(OBJS)\corelib_utilsgui.obj \ $(OBJS)\corelib_uxtheme.obj \ - $(OBJS)\corelib_wave.obj \ $(OBJS)\corelib_window.obj \ $(OBJS)\corelib_statusbr.obj \ $(OBJS)\corelib_accel.obj \ @@ -1783,7 +1771,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" ____CORE_SRC_FILENAMES_3_OBJECTS = \ - $(OBJS)\corelib_taskbarcmn.obj \ $(OBJS)\corelib_app.obj \ $(OBJS)\corelib_bitmap.obj \ $(OBJS)\corelib_brush.obj \ @@ -1811,7 +1798,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_helpchm.obj \ $(OBJS)\corelib_helpwin.obj \ $(OBJS)\corelib_icon.obj \ - $(OBJS)\corelib_joystick.obj \ $(OBJS)\corelib_minifram.obj \ $(OBJS)\corelib_automtn.obj \ $(OBJS)\corelib_dataobj.obj \ @@ -1825,13 +1811,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_region.obj \ $(OBJS)\corelib_renderer.obj \ $(OBJS)\corelib_settings.obj \ - $(OBJS)\corelib_taskbar.obj \ $(OBJS)\corelib_timer.obj \ $(OBJS)\corelib_tooltip.obj \ $(OBJS)\corelib_toplevel.obj \ $(OBJS)\corelib_utilsgui.obj \ $(OBJS)\corelib_uxtheme.obj \ - $(OBJS)\corelib_wave.obj \ $(OBJS)\corelib_window.obj \ $(OBJS)\corelib_textctrl.obj \ $(OBJS)\corelib_accel.obj \ @@ -1976,7 +1960,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_OBJECTS = \ - $(OBJS)\monodll_taskbarcmn.obj \ $(OBJS)\monodll_app.obj \ $(OBJS)\monodll_bitmap.obj \ $(OBJS)\monodll_brush.obj \ @@ -2004,7 +1987,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_helpchm.obj \ $(OBJS)\monodll_helpwin.obj \ $(OBJS)\monodll_icon.obj \ - $(OBJS)\monodll_joystick.obj \ $(OBJS)\monodll_minifram.obj \ $(OBJS)\monodll_automtn.obj \ $(OBJS)\monodll_dataobj.obj \ @@ -2018,13 +2000,11 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_region.obj \ $(OBJS)\monodll_renderer.obj \ $(OBJS)\monodll_settings.obj \ - $(OBJS)\monodll_taskbar.obj \ $(OBJS)\monodll_timer.obj \ $(OBJS)\monodll_tooltip.obj \ $(OBJS)\monodll_toplevel.obj \ $(OBJS)\monodll_utilsgui.obj \ $(OBJS)\monodll_uxtheme.obj \ - $(OBJS)\monodll_wave.obj \ $(OBJS)\monodll_window.obj \ $(OBJS)\monodll_statusbr.obj \ $(OBJS)\monodll_accel.obj \ @@ -2169,7 +2149,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" ____CORE_SRC_FILENAMES_OBJECTS = \ - $(OBJS)\monodll_taskbarcmn.obj \ $(OBJS)\monodll_app.obj \ $(OBJS)\monodll_bitmap.obj \ $(OBJS)\monodll_brush.obj \ @@ -2197,7 +2176,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_helpchm.obj \ $(OBJS)\monodll_helpwin.obj \ $(OBJS)\monodll_icon.obj \ - $(OBJS)\monodll_joystick.obj \ $(OBJS)\monodll_minifram.obj \ $(OBJS)\monodll_automtn.obj \ $(OBJS)\monodll_dataobj.obj \ @@ -2211,13 +2189,11 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_region.obj \ $(OBJS)\monodll_renderer.obj \ $(OBJS)\monodll_settings.obj \ - $(OBJS)\monodll_taskbar.obj \ $(OBJS)\monodll_timer.obj \ $(OBJS)\monodll_tooltip.obj \ $(OBJS)\monodll_toplevel.obj \ $(OBJS)\monodll_utilsgui.obj \ $(OBJS)\monodll_uxtheme.obj \ - $(OBJS)\monodll_wave.obj \ $(OBJS)\monodll_window.obj \ $(OBJS)\monodll_textctrl.obj \ $(OBJS)\monodll_accel.obj \ @@ -2375,6 +2351,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_splash.obj \ $(OBJS)\monolib_tipdlg.obj \ $(OBJS)\monolib_wizard.obj \ + $(OBJS)\monolib_taskbarcmn.obj \ + $(OBJS)\monolib_joystick.obj \ + $(OBJS)\monolib_taskbar.obj \ + $(OBJS)\monolib_wave.obj \ $(OBJS)\monolib_helpbest.obj \ $(OBJS)\monolib_helpctrl.obj \ $(OBJS)\monolib_helpdata.obj \ @@ -2413,6 +2393,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_splash.obj \ $(OBJS)\monodll_tipdlg.obj \ $(OBJS)\monodll_wizard.obj \ + $(OBJS)\monodll_taskbarcmn.obj \ + $(OBJS)\monodll_joystick.obj \ + $(OBJS)\monodll_taskbar.obj \ + $(OBJS)\monodll_wave.obj \ $(OBJS)\monodll_helpbest.obj \ $(OBJS)\monodll_helpctrl.obj \ $(OBJS)\monodll_helpdata.obj \ @@ -2543,6 +2527,9 @@ $(OBJS)\advdll_gridsel.obj: ..\src\generic\gridsel.cpp $(OBJS)\advdll_helpext.obj: ..\src\generic\helpext.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** +$(OBJS)\advdll_joystick.obj: ..\src\msw\joystick.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** + $(OBJS)\advdll_laywin.obj: ..\src\generic\laywin.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** @@ -2552,9 +2539,18 @@ $(OBJS)\advdll_sashwin.obj: ..\src\generic\sashwin.cpp $(OBJS)\advdll_splash.obj: ..\src\generic\splash.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** +$(OBJS)\advdll_taskbar.obj: ..\src\msw\taskbar.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_taskbarcmn.obj: ..\src\common\taskbarcmn.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** + $(OBJS)\advdll_tipdlg.obj: ..\src\generic\tipdlg.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** +$(OBJS)\advdll_wave.obj: ..\src\msw\wave.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** + $(OBJS)\advdll_wizard.obj: ..\src\generic\wizard.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** @@ -2582,6 +2578,9 @@ $(OBJS)\advlib_gridsel.obj: ..\src\generic\gridsel.cpp $(OBJS)\advlib_helpext.obj: ..\src\generic\helpext.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** +$(OBJS)\advlib_joystick.obj: ..\src\msw\joystick.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** + $(OBJS)\advlib_laywin.obj: ..\src\generic\laywin.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** @@ -2591,9 +2590,18 @@ $(OBJS)\advlib_sashwin.obj: ..\src\generic\sashwin.cpp $(OBJS)\advlib_splash.obj: ..\src\generic\splash.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** +$(OBJS)\advlib_taskbar.obj: ..\src\msw\taskbar.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_taskbarcmn.obj: ..\src\common\taskbarcmn.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** + $(OBJS)\advlib_tipdlg.obj: ..\src\generic\tipdlg.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** +$(OBJS)\advlib_wave.obj: ..\src\msw\wave.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** + $(OBJS)\advlib_wizard.obj: ..\src\generic\wizard.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** @@ -3609,11 +3617,6 @@ $(OBJS)\coredll_inpcons.obj: ..\src\univ\inpcons.cpp $(OBJS)\coredll_inphand.obj: ..\src\univ\inphand.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_joystick.obj: ..\src\msw\joystick.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_layout.obj: ..\src\common\layout.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -3976,16 +3979,6 @@ $(OBJS)\coredll_tabctrl.obj: ..\src\msw\tabctrl.cpp $(OBJS)\coredll_tabg.obj: ..\src\generic\tabg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_taskbar.obj: ..\src\msw\taskbar.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_taskbarcmn.obj: ..\src\common\taskbarcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - $(OBJS)\coredll_tbar95.obj: ..\src\msw\tbar95.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -4120,11 +4113,6 @@ $(OBJS)\coredll_vscroll.obj: ..\src\generic\vscroll.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_wave.obj: ..\src\msw\wave.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - $(OBJS)\coredll_win32.obj: ..\src\univ\themes\win32.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -4732,11 +4720,6 @@ $(OBJS)\corelib_inpcons.obj: ..\src\univ\inpcons.cpp $(OBJS)\corelib_inphand.obj: ..\src\univ\inphand.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_joystick.obj: ..\src\msw\joystick.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_layout.obj: ..\src\common\layout.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -5099,16 +5082,6 @@ $(OBJS)\corelib_tabctrl.obj: ..\src\msw\tabctrl.cpp $(OBJS)\corelib_tabg.obj: ..\src\generic\tabg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_taskbar.obj: ..\src\msw\taskbar.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_taskbarcmn.obj: ..\src\common\taskbarcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - $(OBJS)\corelib_tbar95.obj: ..\src\msw\tbar95.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -5243,11 +5216,6 @@ $(OBJS)\corelib_vscroll.obj: ..\src\generic\vscroll.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_wave.obj: ..\src\msw\wave.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - $(OBJS)\corelib_win32.obj: ..\src\univ\themes\win32.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -6167,10 +6135,8 @@ $(OBJS)\monodll_intl.obj: ..\src\common\intl.cpp $(OBJS)\monodll_ipcbase.obj: ..\src\common\ipcbase.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_joystick.obj: ..\src\msw\joystick.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monodll_layout.obj: ..\src\common\layout.cpp @@ -6648,15 +6614,11 @@ $(OBJS)\monodll_tabctrl.obj: ..\src\msw\tabctrl.cpp $(OBJS)\monodll_tabg.obj: ..\src\generic\tabg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_taskbar.obj: ..\src\msw\taskbar.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) $** -!endif $(OBJS)\monodll_tbar95.obj: ..\src\msw\tbar95.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -6825,10 +6787,8 @@ $(OBJS)\monodll_vscroll.obj: ..\src\generic\vscroll.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_wave.obj: ..\src\msw\wave.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif $(OBJS)\monodll_wfstream.obj: ..\src\common\wfstream.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -7620,10 +7580,8 @@ $(OBJS)\monolib_intl.obj: ..\src\common\intl.cpp $(OBJS)\monolib_ipcbase.obj: ..\src\common\ipcbase.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_joystick.obj: ..\src\msw\joystick.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monolib_layout.obj: ..\src\common\layout.cpp @@ -8101,15 +8059,11 @@ $(OBJS)\monolib_tabctrl.obj: ..\src\msw\tabctrl.cpp $(OBJS)\monolib_tabg.obj: ..\src\generic\tabg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_taskbar.obj: ..\src\msw\taskbar.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) $** -!endif $(OBJS)\monolib_tbar95.obj: ..\src\msw\tbar95.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -8278,10 +8232,8 @@ $(OBJS)\monolib_vscroll.obj: ..\src\generic\vscroll.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_wave.obj: ..\src\msw\wave.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif $(OBJS)\monolib_wfstream.obj: ..\src\common\wfstream.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** diff --git a/build/makefile.gcc b/build/makefile.gcc index 6fc15cb1aa..04fb87c93d 100644 --- a/build/makefile.gcc +++ b/build/makefile.gcc @@ -30,7 +30,11 @@ ADVDLL_OBJECTS = \ $(OBJS)\advdll_sashwin.o \ $(OBJS)\advdll_splash.o \ $(OBJS)\advdll_tipdlg.o \ - $(OBJS)\advdll_wizard.o + $(OBJS)\advdll_wizard.o \ + $(OBJS)\advdll_taskbarcmn.o \ + $(OBJS)\advdll_joystick.o \ + $(OBJS)\advdll_taskbar.o \ + $(OBJS)\advdll_wave.o ADVLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \ @@ -49,7 +53,11 @@ ADVLIB_OBJECTS = \ $(OBJS)\advlib_sashwin.o \ $(OBJS)\advlib_splash.o \ $(OBJS)\advlib_tipdlg.o \ - $(OBJS)\advlib_wizard.o + $(OBJS)\advlib_wizard.o \ + $(OBJS)\advlib_taskbarcmn.o \ + $(OBJS)\advlib_joystick.o \ + $(OBJS)\advlib_taskbar.o \ + $(OBJS)\advlib_wave.o BASEDLL_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\include -I$(LIBDIRNAME) -I..\src\tiff \ @@ -807,7 +815,6 @@ endif ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) ____CORE_SRC_FILENAMES_1_OBJECTS = \ - $(OBJS)\monolib_taskbarcmn.o \ $(OBJS)\monolib_app.o \ $(OBJS)\monolib_bitmap.o \ $(OBJS)\monolib_brush.o \ @@ -835,7 +842,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_helpchm.o \ $(OBJS)\monolib_helpwin.o \ $(OBJS)\monolib_icon.o \ - $(OBJS)\monolib_joystick.o \ $(OBJS)\monolib_minifram.o \ $(OBJS)\monolib_automtn.o \ $(OBJS)\monolib_dataobj.o \ @@ -849,13 +855,11 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_region.o \ $(OBJS)\monolib_renderer.o \ $(OBJS)\monolib_settings.o \ - $(OBJS)\monolib_taskbar.o \ $(OBJS)\monolib_timer.o \ $(OBJS)\monolib_tooltip.o \ $(OBJS)\monolib_toplevel.o \ $(OBJS)\monolib_utilsgui.o \ $(OBJS)\monolib_uxtheme.o \ - $(OBJS)\monolib_wave.o \ $(OBJS)\monolib_window.o \ $(OBJS)\monolib_statusbr.o \ $(OBJS)\monolib_accel.o \ @@ -1002,7 +1006,6 @@ endif ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),1) ____CORE_SRC_FILENAMES_1_OBJECTS = \ - $(OBJS)\monolib_taskbarcmn.o \ $(OBJS)\monolib_app.o \ $(OBJS)\monolib_bitmap.o \ $(OBJS)\monolib_brush.o \ @@ -1030,7 +1033,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_helpchm.o \ $(OBJS)\monolib_helpwin.o \ $(OBJS)\monolib_icon.o \ - $(OBJS)\monolib_joystick.o \ $(OBJS)\monolib_minifram.o \ $(OBJS)\monolib_automtn.o \ $(OBJS)\monolib_dataobj.o \ @@ -1044,13 +1046,11 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_region.o \ $(OBJS)\monolib_renderer.o \ $(OBJS)\monolib_settings.o \ - $(OBJS)\monolib_taskbar.o \ $(OBJS)\monolib_timer.o \ $(OBJS)\monolib_tooltip.o \ $(OBJS)\monolib_toplevel.o \ $(OBJS)\monolib_utilsgui.o \ $(OBJS)\monolib_uxtheme.o \ - $(OBJS)\monolib_wave.o \ $(OBJS)\monolib_window.o \ $(OBJS)\monolib_textctrl.o \ $(OBJS)\monolib_accel.o \ @@ -1197,7 +1197,6 @@ endif ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) ____CORE_SRC_FILENAMES_2_OBJECTS = \ - $(OBJS)\coredll_taskbarcmn.o \ $(OBJS)\coredll_app.o \ $(OBJS)\coredll_bitmap.o \ $(OBJS)\coredll_brush.o \ @@ -1225,7 +1224,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_helpchm.o \ $(OBJS)\coredll_helpwin.o \ $(OBJS)\coredll_icon.o \ - $(OBJS)\coredll_joystick.o \ $(OBJS)\coredll_minifram.o \ $(OBJS)\coredll_automtn.o \ $(OBJS)\coredll_dataobj.o \ @@ -1239,13 +1237,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_region.o \ $(OBJS)\coredll_renderer.o \ $(OBJS)\coredll_settings.o \ - $(OBJS)\coredll_taskbar.o \ $(OBJS)\coredll_timer.o \ $(OBJS)\coredll_tooltip.o \ $(OBJS)\coredll_toplevel.o \ $(OBJS)\coredll_utilsgui.o \ $(OBJS)\coredll_uxtheme.o \ - $(OBJS)\coredll_wave.o \ $(OBJS)\coredll_window.o \ $(OBJS)\coredll_statusbr.o \ $(OBJS)\coredll_accel.o \ @@ -1392,7 +1388,6 @@ endif ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),1) ____CORE_SRC_FILENAMES_2_OBJECTS = \ - $(OBJS)\coredll_taskbarcmn.o \ $(OBJS)\coredll_app.o \ $(OBJS)\coredll_bitmap.o \ $(OBJS)\coredll_brush.o \ @@ -1420,7 +1415,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_helpchm.o \ $(OBJS)\coredll_helpwin.o \ $(OBJS)\coredll_icon.o \ - $(OBJS)\coredll_joystick.o \ $(OBJS)\coredll_minifram.o \ $(OBJS)\coredll_automtn.o \ $(OBJS)\coredll_dataobj.o \ @@ -1434,13 +1428,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_region.o \ $(OBJS)\coredll_renderer.o \ $(OBJS)\coredll_settings.o \ - $(OBJS)\coredll_taskbar.o \ $(OBJS)\coredll_timer.o \ $(OBJS)\coredll_tooltip.o \ $(OBJS)\coredll_toplevel.o \ $(OBJS)\coredll_utilsgui.o \ $(OBJS)\coredll_uxtheme.o \ - $(OBJS)\coredll_wave.o \ $(OBJS)\coredll_window.o \ $(OBJS)\coredll_textctrl.o \ $(OBJS)\coredll_accel.o \ @@ -1587,7 +1579,6 @@ endif ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) ____CORE_SRC_FILENAMES_3_OBJECTS = \ - $(OBJS)\corelib_taskbarcmn.o \ $(OBJS)\corelib_app.o \ $(OBJS)\corelib_bitmap.o \ $(OBJS)\corelib_brush.o \ @@ -1615,7 +1606,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_helpchm.o \ $(OBJS)\corelib_helpwin.o \ $(OBJS)\corelib_icon.o \ - $(OBJS)\corelib_joystick.o \ $(OBJS)\corelib_minifram.o \ $(OBJS)\corelib_automtn.o \ $(OBJS)\corelib_dataobj.o \ @@ -1629,13 +1619,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_region.o \ $(OBJS)\corelib_renderer.o \ $(OBJS)\corelib_settings.o \ - $(OBJS)\corelib_taskbar.o \ $(OBJS)\corelib_timer.o \ $(OBJS)\corelib_tooltip.o \ $(OBJS)\corelib_toplevel.o \ $(OBJS)\corelib_utilsgui.o \ $(OBJS)\corelib_uxtheme.o \ - $(OBJS)\corelib_wave.o \ $(OBJS)\corelib_window.o \ $(OBJS)\corelib_statusbr.o \ $(OBJS)\corelib_accel.o \ @@ -1782,7 +1770,6 @@ endif ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),1) ____CORE_SRC_FILENAMES_3_OBJECTS = \ - $(OBJS)\corelib_taskbarcmn.o \ $(OBJS)\corelib_app.o \ $(OBJS)\corelib_bitmap.o \ $(OBJS)\corelib_brush.o \ @@ -1810,7 +1797,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_helpchm.o \ $(OBJS)\corelib_helpwin.o \ $(OBJS)\corelib_icon.o \ - $(OBJS)\corelib_joystick.o \ $(OBJS)\corelib_minifram.o \ $(OBJS)\corelib_automtn.o \ $(OBJS)\corelib_dataobj.o \ @@ -1824,13 +1810,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_region.o \ $(OBJS)\corelib_renderer.o \ $(OBJS)\corelib_settings.o \ - $(OBJS)\corelib_taskbar.o \ $(OBJS)\corelib_timer.o \ $(OBJS)\corelib_tooltip.o \ $(OBJS)\corelib_toplevel.o \ $(OBJS)\corelib_utilsgui.o \ $(OBJS)\corelib_uxtheme.o \ - $(OBJS)\corelib_wave.o \ $(OBJS)\corelib_window.o \ $(OBJS)\corelib_textctrl.o \ $(OBJS)\corelib_accel.o \ @@ -1977,7 +1961,6 @@ endif ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),0) ____CORE_SRC_FILENAMES_OBJECTS = \ - $(OBJS)\monodll_taskbarcmn.o \ $(OBJS)\monodll_app.o \ $(OBJS)\monodll_bitmap.o \ $(OBJS)\monodll_brush.o \ @@ -2005,7 +1988,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_helpchm.o \ $(OBJS)\monodll_helpwin.o \ $(OBJS)\monodll_icon.o \ - $(OBJS)\monodll_joystick.o \ $(OBJS)\monodll_minifram.o \ $(OBJS)\monodll_automtn.o \ $(OBJS)\monodll_dataobj.o \ @@ -2019,13 +2001,11 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_region.o \ $(OBJS)\monodll_renderer.o \ $(OBJS)\monodll_settings.o \ - $(OBJS)\monodll_taskbar.o \ $(OBJS)\monodll_timer.o \ $(OBJS)\monodll_tooltip.o \ $(OBJS)\monodll_toplevel.o \ $(OBJS)\monodll_utilsgui.o \ $(OBJS)\monodll_uxtheme.o \ - $(OBJS)\monodll_wave.o \ $(OBJS)\monodll_window.o \ $(OBJS)\monodll_statusbr.o \ $(OBJS)\monodll_accel.o \ @@ -2172,7 +2152,6 @@ endif ifeq ($(USE_GUI),1) ifeq ($(WXUNIV),1) ____CORE_SRC_FILENAMES_OBJECTS = \ - $(OBJS)\monodll_taskbarcmn.o \ $(OBJS)\monodll_app.o \ $(OBJS)\monodll_bitmap.o \ $(OBJS)\monodll_brush.o \ @@ -2200,7 +2179,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_helpchm.o \ $(OBJS)\monodll_helpwin.o \ $(OBJS)\monodll_icon.o \ - $(OBJS)\monodll_joystick.o \ $(OBJS)\monodll_minifram.o \ $(OBJS)\monodll_automtn.o \ $(OBJS)\monodll_dataobj.o \ @@ -2214,13 +2192,11 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_region.o \ $(OBJS)\monodll_renderer.o \ $(OBJS)\monodll_settings.o \ - $(OBJS)\monodll_taskbar.o \ $(OBJS)\monodll_timer.o \ $(OBJS)\monodll_tooltip.o \ $(OBJS)\monodll_toplevel.o \ $(OBJS)\monodll_utilsgui.o \ $(OBJS)\monodll_uxtheme.o \ - $(OBJS)\monodll_wave.o \ $(OBJS)\monodll_window.o \ $(OBJS)\monodll_textctrl.o \ $(OBJS)\monodll_accel.o \ @@ -2379,6 +2355,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_splash.o \ $(OBJS)\monolib_tipdlg.o \ $(OBJS)\monolib_wizard.o \ + $(OBJS)\monolib_taskbarcmn.o \ + $(OBJS)\monolib_joystick.o \ + $(OBJS)\monolib_taskbar.o \ + $(OBJS)\monolib_wave.o \ $(OBJS)\monolib_helpbest.o \ $(OBJS)\monolib_helpctrl.o \ $(OBJS)\monolib_helpdata.o \ @@ -2417,6 +2397,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_splash.o \ $(OBJS)\monodll_tipdlg.o \ $(OBJS)\monodll_wizard.o \ + $(OBJS)\monodll_taskbarcmn.o \ + $(OBJS)\monodll_joystick.o \ + $(OBJS)\monodll_taskbar.o \ + $(OBJS)\monodll_wave.o \ $(OBJS)\monodll_helpbest.o \ $(OBJS)\monodll_helpctrl.o \ $(OBJS)\monodll_helpdata.o \ @@ -2595,6 +2579,9 @@ $(OBJS)\advdll_gridsel.o: ..\src\generic\gridsel.cpp $(OBJS)\advdll_helpext.o: ..\src\generic\helpext.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< +$(OBJS)\advdll_joystick.o: ..\src\msw\joystick.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< + $(OBJS)\advdll_laywin.o: ..\src\generic\laywin.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< @@ -2604,9 +2591,18 @@ $(OBJS)\advdll_sashwin.o: ..\src\generic\sashwin.cpp $(OBJS)\advdll_splash.o: ..\src\generic\splash.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< +$(OBJS)\advdll_taskbar.o: ..\src\msw\taskbar.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< + +$(OBJS)\advdll_taskbarcmn.o: ..\src\common\taskbarcmn.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< + $(OBJS)\advdll_tipdlg.o: ..\src\generic\tipdlg.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< +$(OBJS)\advdll_wave.o: ..\src\msw\wave.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< + $(OBJS)\advdll_wizard.o: ..\src\generic\wizard.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< @@ -2634,6 +2630,9 @@ $(OBJS)\advlib_gridsel.o: ..\src\generic\gridsel.cpp $(OBJS)\advlib_helpext.o: ..\src\generic\helpext.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< +$(OBJS)\advlib_joystick.o: ..\src\msw\joystick.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< + $(OBJS)\advlib_laywin.o: ..\src\generic\laywin.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< @@ -2643,9 +2642,18 @@ $(OBJS)\advlib_sashwin.o: ..\src\generic\sashwin.cpp $(OBJS)\advlib_splash.o: ..\src\generic\splash.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< +$(OBJS)\advlib_taskbar.o: ..\src\msw\taskbar.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< + +$(OBJS)\advlib_taskbarcmn.o: ..\src\common\taskbarcmn.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< + $(OBJS)\advlib_tipdlg.o: ..\src\generic\tipdlg.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< +$(OBJS)\advlib_wave.o: ..\src\msw\wave.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< + $(OBJS)\advlib_wizard.o: ..\src\generic\wizard.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< @@ -3705,11 +3713,6 @@ $(OBJS)\coredll_inpcons.o: ..\src\univ\inpcons.cpp $(OBJS)\coredll_inphand.o: ..\src\univ\inphand.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_joystick.o: ..\src\msw\joystick.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\coredll_layout.o: ..\src\common\layout.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -4124,16 +4127,6 @@ $(OBJS)\coredll_tabctrl.o: ..\src\msw\tabctrl.cpp $(OBJS)\coredll_tabg.o: ..\src\generic\tabg.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_taskbar.o: ..\src\msw\taskbar.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_taskbarcmn.o: ..\src\common\taskbarcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -endif - $(OBJS)\coredll_tbar95.o: ..\src\msw\tbar95.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -4272,11 +4265,6 @@ $(OBJS)\coredll_vscroll.o: ..\src\generic\vscroll.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_wave.o: ..\src\msw\wave.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -endif - $(OBJS)\coredll_win32.o: ..\src\univ\themes\win32.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -4928,11 +4916,6 @@ $(OBJS)\corelib_inpcons.o: ..\src\univ\inpcons.cpp $(OBJS)\corelib_inphand.o: ..\src\univ\inphand.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_joystick.o: ..\src\msw\joystick.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\corelib_layout.o: ..\src\common\layout.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -5347,16 +5330,6 @@ $(OBJS)\corelib_tabctrl.o: ..\src\msw\tabctrl.cpp $(OBJS)\corelib_tabg.o: ..\src\generic\tabg.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_taskbar.o: ..\src\msw\taskbar.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_taskbarcmn.o: ..\src\common\taskbarcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -endif - $(OBJS)\corelib_tbar95.o: ..\src\msw\tbar95.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -5495,11 +5468,6 @@ $(OBJS)\corelib_vscroll.o: ..\src\generic\vscroll.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_wave.o: ..\src\msw\wave.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -endif - $(OBJS)\corelib_win32.o: ..\src\univ\themes\win32.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -6463,10 +6431,8 @@ $(OBJS)\monodll_intl.o: ..\src\common\intl.cpp $(OBJS)\monodll_ipcbase.o: ..\src\common\ipcbase.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -ifeq ($(USE_GUI),1) $(OBJS)\monodll_joystick.o: ..\src\msw\joystick.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif ifeq ($(USE_GUI),1) $(OBJS)\monodll_layout.o: ..\src\common\layout.cpp @@ -6996,15 +6962,11 @@ $(OBJS)\monodll_tabctrl.o: ..\src\msw\tabctrl.cpp $(OBJS)\monodll_tabg.o: ..\src\generic\tabg.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -ifeq ($(USE_GUI),1) $(OBJS)\monodll_taskbar.o: ..\src\msw\taskbar.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif -ifeq ($(USE_GUI),1) $(OBJS)\monodll_taskbarcmn.o: ..\src\common\taskbarcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif $(OBJS)\monodll_tbar95.o: ..\src\msw\tbar95.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -7177,10 +7139,8 @@ $(OBJS)\monodll_vscroll.o: ..\src\generic\vscroll.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) $(OBJS)\monodll_wave.o: ..\src\msw\wave.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif $(OBJS)\monodll_wfstream.o: ..\src\common\wfstream.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -8016,10 +7976,8 @@ $(OBJS)\monolib_intl.o: ..\src\common\intl.cpp $(OBJS)\monolib_ipcbase.o: ..\src\common\ipcbase.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -ifeq ($(USE_GUI),1) $(OBJS)\monolib_joystick.o: ..\src\msw\joystick.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -endif ifeq ($(USE_GUI),1) $(OBJS)\monolib_layout.o: ..\src\common\layout.cpp @@ -8549,15 +8507,11 @@ $(OBJS)\monolib_tabctrl.o: ..\src\msw\tabctrl.cpp $(OBJS)\monolib_tabg.o: ..\src\generic\tabg.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -ifeq ($(USE_GUI),1) $(OBJS)\monolib_taskbar.o: ..\src\msw\taskbar.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -endif -ifeq ($(USE_GUI),1) $(OBJS)\monolib_taskbarcmn.o: ..\src\common\taskbarcmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -endif $(OBJS)\monolib_tbar95.o: ..\src\msw\tbar95.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -8730,10 +8684,8 @@ $(OBJS)\monolib_vscroll.o: ..\src\generic\vscroll.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) $(OBJS)\monolib_wave.o: ..\src\msw\wave.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -endif $(OBJS)\monolib_wfstream.o: ..\src\common\wfstream.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< diff --git a/build/makefile.vc b/build/makefile.vc index cd61868369..c65996cfa8 100644 --- a/build/makefile.vc +++ b/build/makefile.vc @@ -33,7 +33,11 @@ ADVDLL_OBJECTS = \ $(OBJS)\advdll_sashwin.obj \ $(OBJS)\advdll_splash.obj \ $(OBJS)\advdll_tipdlg.obj \ - $(OBJS)\advdll_wizard.obj + $(OBJS)\advdll_wizard.obj \ + $(OBJS)\advdll_taskbarcmn.obj \ + $(OBJS)\advdll_joystick.obj \ + $(OBJS)\advdll_taskbar.obj \ + $(OBJS)\advdll_wave.obj ADVLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_132) /DWIN32 \ $(__DEBUGINFO_30) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.pdb \ @@ -55,7 +59,11 @@ ADVLIB_OBJECTS = \ $(OBJS)\advlib_sashwin.obj \ $(OBJS)\advlib_splash.obj \ $(OBJS)\advlib_tipdlg.obj \ - $(OBJS)\advlib_wizard.obj + $(OBJS)\advlib_wizard.obj \ + $(OBJS)\advlib_taskbarcmn.obj \ + $(OBJS)\advlib_joystick.obj \ + $(OBJS)\advlib_taskbar.obj \ + $(OBJS)\advlib_wave.obj BASEDLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_69) /DWIN32 \ $(__DEBUGINFO_30) \ /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \ @@ -1090,7 +1098,6 @@ __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_1_OBJECTS = \ - $(OBJS)\monolib_taskbarcmn.obj \ $(OBJS)\monolib_app.obj \ $(OBJS)\monolib_bitmap.obj \ $(OBJS)\monolib_brush.obj \ @@ -1118,7 +1125,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_helpchm.obj \ $(OBJS)\monolib_helpwin.obj \ $(OBJS)\monolib_icon.obj \ - $(OBJS)\monolib_joystick.obj \ $(OBJS)\monolib_minifram.obj \ $(OBJS)\monolib_automtn.obj \ $(OBJS)\monolib_dataobj.obj \ @@ -1132,13 +1138,11 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_region.obj \ $(OBJS)\monolib_renderer.obj \ $(OBJS)\monolib_settings.obj \ - $(OBJS)\monolib_taskbar.obj \ $(OBJS)\monolib_timer.obj \ $(OBJS)\monolib_tooltip.obj \ $(OBJS)\monolib_toplevel.obj \ $(OBJS)\monolib_utilsgui.obj \ $(OBJS)\monolib_uxtheme.obj \ - $(OBJS)\monolib_wave.obj \ $(OBJS)\monolib_window.obj \ $(OBJS)\monolib_statusbr.obj \ $(OBJS)\monolib_accel.obj \ @@ -1283,7 +1287,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" ____CORE_SRC_FILENAMES_1_OBJECTS = \ - $(OBJS)\monolib_taskbarcmn.obj \ $(OBJS)\monolib_app.obj \ $(OBJS)\monolib_bitmap.obj \ $(OBJS)\monolib_brush.obj \ @@ -1311,7 +1314,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_helpchm.obj \ $(OBJS)\monolib_helpwin.obj \ $(OBJS)\monolib_icon.obj \ - $(OBJS)\monolib_joystick.obj \ $(OBJS)\monolib_minifram.obj \ $(OBJS)\monolib_automtn.obj \ $(OBJS)\monolib_dataobj.obj \ @@ -1325,13 +1327,11 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_region.obj \ $(OBJS)\monolib_renderer.obj \ $(OBJS)\monolib_settings.obj \ - $(OBJS)\monolib_taskbar.obj \ $(OBJS)\monolib_timer.obj \ $(OBJS)\monolib_tooltip.obj \ $(OBJS)\monolib_toplevel.obj \ $(OBJS)\monolib_utilsgui.obj \ $(OBJS)\monolib_uxtheme.obj \ - $(OBJS)\monolib_wave.obj \ $(OBJS)\monolib_window.obj \ $(OBJS)\monolib_textctrl.obj \ $(OBJS)\monolib_accel.obj \ @@ -1476,7 +1476,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_2_OBJECTS = \ - $(OBJS)\coredll_taskbarcmn.obj \ $(OBJS)\coredll_app.obj \ $(OBJS)\coredll_bitmap.obj \ $(OBJS)\coredll_brush.obj \ @@ -1504,7 +1503,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_helpchm.obj \ $(OBJS)\coredll_helpwin.obj \ $(OBJS)\coredll_icon.obj \ - $(OBJS)\coredll_joystick.obj \ $(OBJS)\coredll_minifram.obj \ $(OBJS)\coredll_automtn.obj \ $(OBJS)\coredll_dataobj.obj \ @@ -1518,13 +1516,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_region.obj \ $(OBJS)\coredll_renderer.obj \ $(OBJS)\coredll_settings.obj \ - $(OBJS)\coredll_taskbar.obj \ $(OBJS)\coredll_timer.obj \ $(OBJS)\coredll_tooltip.obj \ $(OBJS)\coredll_toplevel.obj \ $(OBJS)\coredll_utilsgui.obj \ $(OBJS)\coredll_uxtheme.obj \ - $(OBJS)\coredll_wave.obj \ $(OBJS)\coredll_window.obj \ $(OBJS)\coredll_statusbr.obj \ $(OBJS)\coredll_accel.obj \ @@ -1669,7 +1665,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" ____CORE_SRC_FILENAMES_2_OBJECTS = \ - $(OBJS)\coredll_taskbarcmn.obj \ $(OBJS)\coredll_app.obj \ $(OBJS)\coredll_bitmap.obj \ $(OBJS)\coredll_brush.obj \ @@ -1697,7 +1692,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_helpchm.obj \ $(OBJS)\coredll_helpwin.obj \ $(OBJS)\coredll_icon.obj \ - $(OBJS)\coredll_joystick.obj \ $(OBJS)\coredll_minifram.obj \ $(OBJS)\coredll_automtn.obj \ $(OBJS)\coredll_dataobj.obj \ @@ -1711,13 +1705,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_region.obj \ $(OBJS)\coredll_renderer.obj \ $(OBJS)\coredll_settings.obj \ - $(OBJS)\coredll_taskbar.obj \ $(OBJS)\coredll_timer.obj \ $(OBJS)\coredll_tooltip.obj \ $(OBJS)\coredll_toplevel.obj \ $(OBJS)\coredll_utilsgui.obj \ $(OBJS)\coredll_uxtheme.obj \ - $(OBJS)\coredll_wave.obj \ $(OBJS)\coredll_window.obj \ $(OBJS)\coredll_textctrl.obj \ $(OBJS)\coredll_accel.obj \ @@ -1862,7 +1854,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_3_OBJECTS = \ - $(OBJS)\corelib_taskbarcmn.obj \ $(OBJS)\corelib_app.obj \ $(OBJS)\corelib_bitmap.obj \ $(OBJS)\corelib_brush.obj \ @@ -1890,7 +1881,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_helpchm.obj \ $(OBJS)\corelib_helpwin.obj \ $(OBJS)\corelib_icon.obj \ - $(OBJS)\corelib_joystick.obj \ $(OBJS)\corelib_minifram.obj \ $(OBJS)\corelib_automtn.obj \ $(OBJS)\corelib_dataobj.obj \ @@ -1904,13 +1894,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_region.obj \ $(OBJS)\corelib_renderer.obj \ $(OBJS)\corelib_settings.obj \ - $(OBJS)\corelib_taskbar.obj \ $(OBJS)\corelib_timer.obj \ $(OBJS)\corelib_tooltip.obj \ $(OBJS)\corelib_toplevel.obj \ $(OBJS)\corelib_utilsgui.obj \ $(OBJS)\corelib_uxtheme.obj \ - $(OBJS)\corelib_wave.obj \ $(OBJS)\corelib_window.obj \ $(OBJS)\corelib_statusbr.obj \ $(OBJS)\corelib_accel.obj \ @@ -2055,7 +2043,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" ____CORE_SRC_FILENAMES_3_OBJECTS = \ - $(OBJS)\corelib_taskbarcmn.obj \ $(OBJS)\corelib_app.obj \ $(OBJS)\corelib_bitmap.obj \ $(OBJS)\corelib_brush.obj \ @@ -2083,7 +2070,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_helpchm.obj \ $(OBJS)\corelib_helpwin.obj \ $(OBJS)\corelib_icon.obj \ - $(OBJS)\corelib_joystick.obj \ $(OBJS)\corelib_minifram.obj \ $(OBJS)\corelib_automtn.obj \ $(OBJS)\corelib_dataobj.obj \ @@ -2097,13 +2083,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_region.obj \ $(OBJS)\corelib_renderer.obj \ $(OBJS)\corelib_settings.obj \ - $(OBJS)\corelib_taskbar.obj \ $(OBJS)\corelib_timer.obj \ $(OBJS)\corelib_tooltip.obj \ $(OBJS)\corelib_toplevel.obj \ $(OBJS)\corelib_utilsgui.obj \ $(OBJS)\corelib_uxtheme.obj \ - $(OBJS)\corelib_wave.obj \ $(OBJS)\corelib_window.obj \ $(OBJS)\corelib_textctrl.obj \ $(OBJS)\corelib_accel.obj \ @@ -2248,7 +2232,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_OBJECTS = \ - $(OBJS)\monodll_taskbarcmn.obj \ $(OBJS)\monodll_app.obj \ $(OBJS)\monodll_bitmap.obj \ $(OBJS)\monodll_brush.obj \ @@ -2276,7 +2259,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_helpchm.obj \ $(OBJS)\monodll_helpwin.obj \ $(OBJS)\monodll_icon.obj \ - $(OBJS)\monodll_joystick.obj \ $(OBJS)\monodll_minifram.obj \ $(OBJS)\monodll_automtn.obj \ $(OBJS)\monodll_dataobj.obj \ @@ -2290,13 +2272,11 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_region.obj \ $(OBJS)\monodll_renderer.obj \ $(OBJS)\monodll_settings.obj \ - $(OBJS)\monodll_taskbar.obj \ $(OBJS)\monodll_timer.obj \ $(OBJS)\monodll_tooltip.obj \ $(OBJS)\monodll_toplevel.obj \ $(OBJS)\monodll_utilsgui.obj \ $(OBJS)\monodll_uxtheme.obj \ - $(OBJS)\monodll_wave.obj \ $(OBJS)\monodll_window.obj \ $(OBJS)\monodll_statusbr.obj \ $(OBJS)\monodll_accel.obj \ @@ -2441,7 +2421,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" ____CORE_SRC_FILENAMES_OBJECTS = \ - $(OBJS)\monodll_taskbarcmn.obj \ $(OBJS)\monodll_app.obj \ $(OBJS)\monodll_bitmap.obj \ $(OBJS)\monodll_brush.obj \ @@ -2469,7 +2448,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_helpchm.obj \ $(OBJS)\monodll_helpwin.obj \ $(OBJS)\monodll_icon.obj \ - $(OBJS)\monodll_joystick.obj \ $(OBJS)\monodll_minifram.obj \ $(OBJS)\monodll_automtn.obj \ $(OBJS)\monodll_dataobj.obj \ @@ -2483,13 +2461,11 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_region.obj \ $(OBJS)\monodll_renderer.obj \ $(OBJS)\monodll_settings.obj \ - $(OBJS)\monodll_taskbar.obj \ $(OBJS)\monodll_timer.obj \ $(OBJS)\monodll_tooltip.obj \ $(OBJS)\monodll_toplevel.obj \ $(OBJS)\monodll_utilsgui.obj \ $(OBJS)\monodll_uxtheme.obj \ - $(OBJS)\monodll_wave.obj \ $(OBJS)\monodll_window.obj \ $(OBJS)\monodll_textctrl.obj \ $(OBJS)\monodll_accel.obj \ @@ -2857,6 +2833,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_splash.obj \ $(OBJS)\monolib_tipdlg.obj \ $(OBJS)\monolib_wizard.obj \ + $(OBJS)\monolib_taskbarcmn.obj \ + $(OBJS)\monolib_joystick.obj \ + $(OBJS)\monolib_taskbar.obj \ + $(OBJS)\monolib_wave.obj \ $(OBJS)\monolib_helpbest.obj \ $(OBJS)\monolib_helpctrl.obj \ $(OBJS)\monolib_helpdata.obj \ @@ -2895,6 +2875,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_splash.obj \ $(OBJS)\monodll_tipdlg.obj \ $(OBJS)\monodll_wizard.obj \ + $(OBJS)\monodll_taskbarcmn.obj \ + $(OBJS)\monodll_joystick.obj \ + $(OBJS)\monodll_taskbar.obj \ + $(OBJS)\monodll_wave.obj \ $(OBJS)\monodll_helpbest.obj \ $(OBJS)\monodll_helpctrl.obj \ $(OBJS)\monodll_helpdata.obj \ @@ -3025,6 +3009,9 @@ $(OBJS)\advdll_gridsel.obj: ..\src\generic\gridsel.cpp $(OBJS)\advdll_helpext.obj: ..\src\generic\helpext.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** +$(OBJS)\advdll_joystick.obj: ..\src\msw\joystick.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + $(OBJS)\advdll_laywin.obj: ..\src\generic\laywin.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** @@ -3034,9 +3021,18 @@ $(OBJS)\advdll_sashwin.obj: ..\src\generic\sashwin.cpp $(OBJS)\advdll_splash.obj: ..\src\generic\splash.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** +$(OBJS)\advdll_taskbar.obj: ..\src\msw\taskbar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + +$(OBJS)\advdll_taskbarcmn.obj: ..\src\common\taskbarcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + $(OBJS)\advdll_tipdlg.obj: ..\src\generic\tipdlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** +$(OBJS)\advdll_wave.obj: ..\src\msw\wave.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + $(OBJS)\advdll_wizard.obj: ..\src\generic\wizard.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** @@ -3064,6 +3060,9 @@ $(OBJS)\advlib_gridsel.obj: ..\src\generic\gridsel.cpp $(OBJS)\advlib_helpext.obj: ..\src\generic\helpext.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** +$(OBJS)\advlib_joystick.obj: ..\src\msw\joystick.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + $(OBJS)\advlib_laywin.obj: ..\src\generic\laywin.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** @@ -3073,9 +3072,18 @@ $(OBJS)\advlib_sashwin.obj: ..\src\generic\sashwin.cpp $(OBJS)\advlib_splash.obj: ..\src\generic\splash.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** +$(OBJS)\advlib_taskbar.obj: ..\src\msw\taskbar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + +$(OBJS)\advlib_taskbarcmn.obj: ..\src\common\taskbarcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + $(OBJS)\advlib_tipdlg.obj: ..\src\generic\tipdlg.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** +$(OBJS)\advlib_wave.obj: ..\src\msw\wave.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + $(OBJS)\advlib_wizard.obj: ..\src\generic\wizard.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** @@ -4091,11 +4099,6 @@ $(OBJS)\coredll_inpcons.obj: ..\src\univ\inpcons.cpp $(OBJS)\coredll_inphand.obj: ..\src\univ\inphand.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_joystick.obj: ..\src\msw\joystick.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_layout.obj: ..\src\common\layout.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -4458,16 +4461,6 @@ $(OBJS)\coredll_tabctrl.obj: ..\src\msw\tabctrl.cpp $(OBJS)\coredll_tabg.obj: ..\src\generic\tabg.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_taskbar.obj: ..\src\msw\taskbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_taskbarcmn.obj: ..\src\common\taskbarcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - $(OBJS)\coredll_tbar95.obj: ..\src\msw\tbar95.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -4602,11 +4595,6 @@ $(OBJS)\coredll_vscroll.obj: ..\src\generic\vscroll.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_wave.obj: ..\src\msw\wave.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - $(OBJS)\coredll_win32.obj: ..\src\univ\themes\win32.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -5214,11 +5202,6 @@ $(OBJS)\corelib_inpcons.obj: ..\src\univ\inpcons.cpp $(OBJS)\corelib_inphand.obj: ..\src\univ\inphand.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_joystick.obj: ..\src\msw\joystick.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_layout.obj: ..\src\common\layout.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -5581,16 +5564,6 @@ $(OBJS)\corelib_tabctrl.obj: ..\src\msw\tabctrl.cpp $(OBJS)\corelib_tabg.obj: ..\src\generic\tabg.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_taskbar.obj: ..\src\msw\taskbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_taskbarcmn.obj: ..\src\common\taskbarcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - $(OBJS)\corelib_tbar95.obj: ..\src\msw\tbar95.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -5725,11 +5698,6 @@ $(OBJS)\corelib_vscroll.obj: ..\src\generic\vscroll.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_wave.obj: ..\src\msw\wave.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - $(OBJS)\corelib_win32.obj: ..\src\univ\themes\win32.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -6649,10 +6617,8 @@ $(OBJS)\monodll_intl.obj: ..\src\common\intl.cpp $(OBJS)\monodll_ipcbase.obj: ..\src\common\ipcbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_joystick.obj: ..\src\msw\joystick.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monodll_layout.obj: ..\src\common\layout.cpp @@ -7130,15 +7096,11 @@ $(OBJS)\monodll_tabctrl.obj: ..\src\msw\tabctrl.cpp $(OBJS)\monodll_tabg.obj: ..\src\generic\tabg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_taskbar.obj: ..\src\msw\taskbar.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) $** -!endif $(OBJS)\monodll_tbar95.obj: ..\src\msw\tbar95.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -7307,10 +7269,8 @@ $(OBJS)\monodll_vscroll.obj: ..\src\generic\vscroll.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monodll_wave.obj: ..\src\msw\wave.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif $(OBJS)\monodll_wfstream.obj: ..\src\common\wfstream.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -8102,10 +8062,8 @@ $(OBJS)\monolib_intl.obj: ..\src\common\intl.cpp $(OBJS)\monolib_ipcbase.obj: ..\src\common\ipcbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_joystick.obj: ..\src\msw\joystick.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif !if "$(USE_GUI)" == "1" $(OBJS)\monolib_layout.obj: ..\src\common\layout.cpp @@ -8583,15 +8541,11 @@ $(OBJS)\monolib_tabctrl.obj: ..\src\msw\tabctrl.cpp $(OBJS)\monolib_tabg.obj: ..\src\generic\tabg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_taskbar.obj: ..\src\msw\taskbar.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) $** -!endif $(OBJS)\monolib_tbar95.obj: ..\src\msw\tbar95.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -8760,10 +8714,8 @@ $(OBJS)\monolib_vscroll.obj: ..\src\generic\vscroll.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" $(OBJS)\monolib_wave.obj: ..\src\msw\wave.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif $(OBJS)\monolib_wfstream.obj: ..\src\common\wfstream.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** diff --git a/build/makefile.wat b/build/makefile.wat index 56eb7b8889..f461f96c1d 100644 --- a/build/makefile.wat +++ b/build/makefile.wat @@ -157,7 +157,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = !ifeq USE_GUI 1 !ifeq WXUNIV 0 ____CORE_SRC_FILENAMES_1_OBJECTS = & - $(OBJS)\monolib_taskbarcmn.obj & $(OBJS)\monolib_app.obj & $(OBJS)\monolib_bitmap.obj & $(OBJS)\monolib_brush.obj & @@ -185,7 +184,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_helpchm.obj & $(OBJS)\monolib_helpwin.obj & $(OBJS)\monolib_icon.obj & - $(OBJS)\monolib_joystick.obj & $(OBJS)\monolib_minifram.obj & $(OBJS)\monolib_automtn.obj & $(OBJS)\monolib_dataobj.obj & @@ -199,13 +197,11 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_region.obj & $(OBJS)\monolib_renderer.obj & $(OBJS)\monolib_settings.obj & - $(OBJS)\monolib_taskbar.obj & $(OBJS)\monolib_timer.obj & $(OBJS)\monolib_tooltip.obj & $(OBJS)\monolib_toplevel.obj & $(OBJS)\monolib_utilsgui.obj & $(OBJS)\monolib_uxtheme.obj & - $(OBJS)\monolib_wave.obj & $(OBJS)\monolib_window.obj & $(OBJS)\monolib_statusbr.obj & $(OBJS)\monolib_accel.obj & @@ -352,7 +348,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & !ifeq USE_GUI 1 !ifeq WXUNIV 1 ____CORE_SRC_FILENAMES_1_OBJECTS = & - $(OBJS)\monolib_taskbarcmn.obj & $(OBJS)\monolib_app.obj & $(OBJS)\monolib_bitmap.obj & $(OBJS)\monolib_brush.obj & @@ -380,7 +375,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_helpchm.obj & $(OBJS)\monolib_helpwin.obj & $(OBJS)\monolib_icon.obj & - $(OBJS)\monolib_joystick.obj & $(OBJS)\monolib_minifram.obj & $(OBJS)\monolib_automtn.obj & $(OBJS)\monolib_dataobj.obj & @@ -394,13 +388,11 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_region.obj & $(OBJS)\monolib_renderer.obj & $(OBJS)\monolib_settings.obj & - $(OBJS)\monolib_taskbar.obj & $(OBJS)\monolib_timer.obj & $(OBJS)\monolib_tooltip.obj & $(OBJS)\monolib_toplevel.obj & $(OBJS)\monolib_utilsgui.obj & $(OBJS)\monolib_uxtheme.obj & - $(OBJS)\monolib_wave.obj & $(OBJS)\monolib_window.obj & $(OBJS)\monolib_textctrl.obj & $(OBJS)\monolib_accel.obj & @@ -548,7 +540,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = !ifeq USE_GUI 1 !ifeq WXUNIV 0 ____CORE_SRC_FILENAMES_2_OBJECTS = & - $(OBJS)\coredll_taskbarcmn.obj & $(OBJS)\coredll_app.obj & $(OBJS)\coredll_bitmap.obj & $(OBJS)\coredll_brush.obj & @@ -576,7 +567,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_helpchm.obj & $(OBJS)\coredll_helpwin.obj & $(OBJS)\coredll_icon.obj & - $(OBJS)\coredll_joystick.obj & $(OBJS)\coredll_minifram.obj & $(OBJS)\coredll_automtn.obj & $(OBJS)\coredll_dataobj.obj & @@ -590,13 +580,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_region.obj & $(OBJS)\coredll_renderer.obj & $(OBJS)\coredll_settings.obj & - $(OBJS)\coredll_taskbar.obj & $(OBJS)\coredll_timer.obj & $(OBJS)\coredll_tooltip.obj & $(OBJS)\coredll_toplevel.obj & $(OBJS)\coredll_utilsgui.obj & $(OBJS)\coredll_uxtheme.obj & - $(OBJS)\coredll_wave.obj & $(OBJS)\coredll_window.obj & $(OBJS)\coredll_statusbr.obj & $(OBJS)\coredll_accel.obj & @@ -743,7 +731,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & !ifeq USE_GUI 1 !ifeq WXUNIV 1 ____CORE_SRC_FILENAMES_2_OBJECTS = & - $(OBJS)\coredll_taskbarcmn.obj & $(OBJS)\coredll_app.obj & $(OBJS)\coredll_bitmap.obj & $(OBJS)\coredll_brush.obj & @@ -771,7 +758,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_helpchm.obj & $(OBJS)\coredll_helpwin.obj & $(OBJS)\coredll_icon.obj & - $(OBJS)\coredll_joystick.obj & $(OBJS)\coredll_minifram.obj & $(OBJS)\coredll_automtn.obj & $(OBJS)\coredll_dataobj.obj & @@ -785,13 +771,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_region.obj & $(OBJS)\coredll_renderer.obj & $(OBJS)\coredll_settings.obj & - $(OBJS)\coredll_taskbar.obj & $(OBJS)\coredll_timer.obj & $(OBJS)\coredll_tooltip.obj & $(OBJS)\coredll_toplevel.obj & $(OBJS)\coredll_utilsgui.obj & $(OBJS)\coredll_uxtheme.obj & - $(OBJS)\coredll_wave.obj & $(OBJS)\coredll_window.obj & $(OBJS)\coredll_textctrl.obj & $(OBJS)\coredll_accel.obj & @@ -939,7 +923,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = !ifeq USE_GUI 1 !ifeq WXUNIV 0 ____CORE_SRC_FILENAMES_3_OBJECTS = & - $(OBJS)\corelib_taskbarcmn.obj & $(OBJS)\corelib_app.obj & $(OBJS)\corelib_bitmap.obj & $(OBJS)\corelib_brush.obj & @@ -967,7 +950,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_helpchm.obj & $(OBJS)\corelib_helpwin.obj & $(OBJS)\corelib_icon.obj & - $(OBJS)\corelib_joystick.obj & $(OBJS)\corelib_minifram.obj & $(OBJS)\corelib_automtn.obj & $(OBJS)\corelib_dataobj.obj & @@ -981,13 +963,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_region.obj & $(OBJS)\corelib_renderer.obj & $(OBJS)\corelib_settings.obj & - $(OBJS)\corelib_taskbar.obj & $(OBJS)\corelib_timer.obj & $(OBJS)\corelib_tooltip.obj & $(OBJS)\corelib_toplevel.obj & $(OBJS)\corelib_utilsgui.obj & $(OBJS)\corelib_uxtheme.obj & - $(OBJS)\corelib_wave.obj & $(OBJS)\corelib_window.obj & $(OBJS)\corelib_statusbr.obj & $(OBJS)\corelib_accel.obj & @@ -1134,7 +1114,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & !ifeq USE_GUI 1 !ifeq WXUNIV 1 ____CORE_SRC_FILENAMES_3_OBJECTS = & - $(OBJS)\corelib_taskbarcmn.obj & $(OBJS)\corelib_app.obj & $(OBJS)\corelib_bitmap.obj & $(OBJS)\corelib_brush.obj & @@ -1162,7 +1141,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_helpchm.obj & $(OBJS)\corelib_helpwin.obj & $(OBJS)\corelib_icon.obj & - $(OBJS)\corelib_joystick.obj & $(OBJS)\corelib_minifram.obj & $(OBJS)\corelib_automtn.obj & $(OBJS)\corelib_dataobj.obj & @@ -1176,13 +1154,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_region.obj & $(OBJS)\corelib_renderer.obj & $(OBJS)\corelib_settings.obj & - $(OBJS)\corelib_taskbar.obj & $(OBJS)\corelib_timer.obj & $(OBJS)\corelib_tooltip.obj & $(OBJS)\corelib_toplevel.obj & $(OBJS)\corelib_utilsgui.obj & $(OBJS)\corelib_uxtheme.obj & - $(OBJS)\corelib_wave.obj & $(OBJS)\corelib_window.obj & $(OBJS)\corelib_textctrl.obj & $(OBJS)\corelib_accel.obj & @@ -1330,7 +1306,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = !ifeq USE_GUI 1 !ifeq WXUNIV 0 ____CORE_SRC_FILENAMES_OBJECTS = & - $(OBJS)\monodll_taskbarcmn.obj & $(OBJS)\monodll_app.obj & $(OBJS)\monodll_bitmap.obj & $(OBJS)\monodll_brush.obj & @@ -1358,7 +1333,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_helpchm.obj & $(OBJS)\monodll_helpwin.obj & $(OBJS)\monodll_icon.obj & - $(OBJS)\monodll_joystick.obj & $(OBJS)\monodll_minifram.obj & $(OBJS)\monodll_automtn.obj & $(OBJS)\monodll_dataobj.obj & @@ -1372,13 +1346,11 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_region.obj & $(OBJS)\monodll_renderer.obj & $(OBJS)\monodll_settings.obj & - $(OBJS)\monodll_taskbar.obj & $(OBJS)\monodll_timer.obj & $(OBJS)\monodll_tooltip.obj & $(OBJS)\monodll_toplevel.obj & $(OBJS)\monodll_utilsgui.obj & $(OBJS)\monodll_uxtheme.obj & - $(OBJS)\monodll_wave.obj & $(OBJS)\monodll_window.obj & $(OBJS)\monodll_statusbr.obj & $(OBJS)\monodll_accel.obj & @@ -1525,7 +1497,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & !ifeq USE_GUI 1 !ifeq WXUNIV 1 ____CORE_SRC_FILENAMES_OBJECTS = & - $(OBJS)\monodll_taskbarcmn.obj & $(OBJS)\monodll_app.obj & $(OBJS)\monodll_bitmap.obj & $(OBJS)\monodll_brush.obj & @@ -1553,7 +1524,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_helpchm.obj & $(OBJS)\monodll_helpwin.obj & $(OBJS)\monodll_icon.obj & - $(OBJS)\monodll_joystick.obj & $(OBJS)\monodll_minifram.obj & $(OBJS)\monodll_automtn.obj & $(OBJS)\monodll_dataobj.obj & @@ -1567,13 +1537,11 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_region.obj & $(OBJS)\monodll_renderer.obj & $(OBJS)\monodll_settings.obj & - $(OBJS)\monodll_taskbar.obj & $(OBJS)\monodll_timer.obj & $(OBJS)\monodll_tooltip.obj & $(OBJS)\monodll_toplevel.obj & $(OBJS)\monodll_utilsgui.obj & $(OBJS)\monodll_uxtheme.obj & - $(OBJS)\monodll_wave.obj & $(OBJS)\monodll_window.obj & $(OBJS)\monodll_textctrl.obj & $(OBJS)\monodll_accel.obj & @@ -1733,6 +1701,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_splash.obj & $(OBJS)\monolib_tipdlg.obj & $(OBJS)\monolib_wizard.obj & + $(OBJS)\monolib_taskbarcmn.obj & + $(OBJS)\monolib_joystick.obj & + $(OBJS)\monolib_taskbar.obj & + $(OBJS)\monolib_wave.obj & $(OBJS)\monolib_helpbest.obj & $(OBJS)\monolib_helpctrl.obj & $(OBJS)\monolib_helpdata.obj & @@ -1772,6 +1744,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_splash.obj & $(OBJS)\monodll_tipdlg.obj & $(OBJS)\monodll_wizard.obj & + $(OBJS)\monodll_taskbarcmn.obj & + $(OBJS)\monodll_joystick.obj & + $(OBJS)\monodll_taskbar.obj & + $(OBJS)\monodll_wave.obj & $(OBJS)\monodll_helpbest.obj & $(OBJS)\monodll_helpctrl.obj & $(OBJS)\monodll_helpdata.obj & @@ -1957,7 +1933,11 @@ ADVDLL_OBJECTS = & $(OBJS)\advdll_sashwin.obj & $(OBJS)\advdll_splash.obj & $(OBJS)\advdll_tipdlg.obj & - $(OBJS)\advdll_wizard.obj + $(OBJS)\advdll_wizard.obj & + $(OBJS)\advdll_taskbarcmn.obj & + $(OBJS)\advdll_joystick.obj & + $(OBJS)\advdll_taskbar.obj & + $(OBJS)\advdll_wave.obj ADVLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff & @@ -1976,7 +1956,11 @@ ADVLIB_OBJECTS = & $(OBJS)\advlib_sashwin.obj & $(OBJS)\advlib_splash.obj & $(OBJS)\advlib_tipdlg.obj & - $(OBJS)\advlib_wizard.obj + $(OBJS)\advlib_wizard.obj & + $(OBJS)\advlib_taskbarcmn.obj & + $(OBJS)\advlib_joystick.obj & + $(OBJS)\advlib_taskbar.obj & + $(OBJS)\advlib_wave.obj BASEDLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm & $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=..\include -i=$(LIBDIRNAME) -i=..\src\tiff & @@ -2687,6 +2671,9 @@ $(OBJS)\advdll_gridsel.obj : .AUTODEPEND ..\src\generic\gridsel.cpp $(OBJS)\advdll_helpext.obj : .AUTODEPEND ..\src\generic\helpext.cpp $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< +$(OBJS)\advdll_joystick.obj : .AUTODEPEND ..\src\msw\joystick.cpp + $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + $(OBJS)\advdll_laywin.obj : .AUTODEPEND ..\src\generic\laywin.cpp $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< @@ -2696,9 +2683,18 @@ $(OBJS)\advdll_sashwin.obj : .AUTODEPEND ..\src\generic\sashwin.cpp $(OBJS)\advdll_splash.obj : .AUTODEPEND ..\src\generic\splash.cpp $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< +$(OBJS)\advdll_taskbar.obj : .AUTODEPEND ..\src\msw\taskbar.cpp + $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + +$(OBJS)\advdll_taskbarcmn.obj : .AUTODEPEND ..\src\common\taskbarcmn.cpp + $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + $(OBJS)\advdll_tipdlg.obj : .AUTODEPEND ..\src\generic\tipdlg.cpp $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< +$(OBJS)\advdll_wave.obj : .AUTODEPEND ..\src\msw\wave.cpp + $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + $(OBJS)\advdll_wizard.obj : .AUTODEPEND ..\src\generic\wizard.cpp $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< @@ -2726,6 +2722,9 @@ $(OBJS)\advlib_gridsel.obj : .AUTODEPEND ..\src\generic\gridsel.cpp $(OBJS)\advlib_helpext.obj : .AUTODEPEND ..\src\generic\helpext.cpp $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< +$(OBJS)\advlib_joystick.obj : .AUTODEPEND ..\src\msw\joystick.cpp + $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + $(OBJS)\advlib_laywin.obj : .AUTODEPEND ..\src\generic\laywin.cpp $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< @@ -2735,9 +2734,18 @@ $(OBJS)\advlib_sashwin.obj : .AUTODEPEND ..\src\generic\sashwin.cpp $(OBJS)\advlib_splash.obj : .AUTODEPEND ..\src\generic\splash.cpp $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< +$(OBJS)\advlib_taskbar.obj : .AUTODEPEND ..\src\msw\taskbar.cpp + $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + +$(OBJS)\advlib_taskbarcmn.obj : .AUTODEPEND ..\src\common\taskbarcmn.cpp + $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + $(OBJS)\advlib_tipdlg.obj : .AUTODEPEND ..\src\generic\tipdlg.cpp $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< +$(OBJS)\advlib_wave.obj : .AUTODEPEND ..\src\msw\wave.cpp + $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + $(OBJS)\advlib_wizard.obj : .AUTODEPEND ..\src\generic\wizard.cpp $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< @@ -3797,11 +3805,6 @@ $(OBJS)\coredll_inpcons.obj : .AUTODEPEND ..\src\univ\inpcons.cpp $(OBJS)\coredll_inphand.obj : .AUTODEPEND ..\src\univ\inphand.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!ifeq USE_GUI 1 -$(OBJS)\coredll_joystick.obj : .AUTODEPEND ..\src\msw\joystick.cpp - $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\coredll_layout.obj : .AUTODEPEND ..\src\common\layout.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -4216,16 +4219,6 @@ $(OBJS)\coredll_tabctrl.obj : .AUTODEPEND ..\src\msw\tabctrl.cpp $(OBJS)\coredll_tabg.obj : .AUTODEPEND ..\src\generic\tabg.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!ifeq USE_GUI 1 -$(OBJS)\coredll_taskbar.obj : .AUTODEPEND ..\src\msw\taskbar.cpp - $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_taskbarcmn.obj : .AUTODEPEND ..\src\common\taskbarcmn.cpp - $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - $(OBJS)\coredll_tbar95.obj : .AUTODEPEND ..\src\msw\tbar95.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -4364,11 +4357,6 @@ $(OBJS)\coredll_vscroll.obj : .AUTODEPEND ..\src\generic\vscroll.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\coredll_wave.obj : .AUTODEPEND ..\src\msw\wave.cpp - $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - $(OBJS)\coredll_win32.obj : .AUTODEPEND ..\src\univ\themes\win32.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -5020,11 +5008,6 @@ $(OBJS)\corelib_inpcons.obj : .AUTODEPEND ..\src\univ\inpcons.cpp $(OBJS)\corelib_inphand.obj : .AUTODEPEND ..\src\univ\inphand.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!ifeq USE_GUI 1 -$(OBJS)\corelib_joystick.obj : .AUTODEPEND ..\src\msw\joystick.cpp - $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\corelib_layout.obj : .AUTODEPEND ..\src\common\layout.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -5439,16 +5422,6 @@ $(OBJS)\corelib_tabctrl.obj : .AUTODEPEND ..\src\msw\tabctrl.cpp $(OBJS)\corelib_tabg.obj : .AUTODEPEND ..\src\generic\tabg.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!ifeq USE_GUI 1 -$(OBJS)\corelib_taskbar.obj : .AUTODEPEND ..\src\msw\taskbar.cpp - $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_taskbarcmn.obj : .AUTODEPEND ..\src\common\taskbarcmn.cpp - $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - $(OBJS)\corelib_tbar95.obj : .AUTODEPEND ..\src\msw\tbar95.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -5587,11 +5560,6 @@ $(OBJS)\corelib_vscroll.obj : .AUTODEPEND ..\src\generic\vscroll.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\corelib_wave.obj : .AUTODEPEND ..\src\msw\wave.cpp - $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - $(OBJS)\corelib_win32.obj : .AUTODEPEND ..\src\univ\themes\win32.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -6555,10 +6523,8 @@ $(OBJS)\monodll_intl.obj : .AUTODEPEND ..\src\common\intl.cpp $(OBJS)\monodll_ipcbase.obj : .AUTODEPEND ..\src\common\ipcbase.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!ifeq USE_GUI 1 $(OBJS)\monodll_joystick.obj : .AUTODEPEND ..\src\msw\joystick.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif !ifeq USE_GUI 1 $(OBJS)\monodll_layout.obj : .AUTODEPEND ..\src\common\layout.cpp @@ -7088,15 +7054,11 @@ $(OBJS)\monodll_tabctrl.obj : .AUTODEPEND ..\src\msw\tabctrl.cpp $(OBJS)\monodll_tabg.obj : .AUTODEPEND ..\src\generic\tabg.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!ifeq USE_GUI 1 $(OBJS)\monodll_taskbar.obj : .AUTODEPEND ..\src\msw\taskbar.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif -!ifeq USE_GUI 1 $(OBJS)\monodll_taskbarcmn.obj : .AUTODEPEND ..\src\common\taskbarcmn.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif $(OBJS)\monodll_tbar95.obj : .AUTODEPEND ..\src\msw\tbar95.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -7269,10 +7231,8 @@ $(OBJS)\monodll_vscroll.obj : .AUTODEPEND ..\src\generic\vscroll.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 $(OBJS)\monodll_wave.obj : .AUTODEPEND ..\src\msw\wave.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif $(OBJS)\monodll_wfstream.obj : .AUTODEPEND ..\src\common\wfstream.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -8108,10 +8068,8 @@ $(OBJS)\monolib_intl.obj : .AUTODEPEND ..\src\common\intl.cpp $(OBJS)\monolib_ipcbase.obj : .AUTODEPEND ..\src\common\ipcbase.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!ifeq USE_GUI 1 $(OBJS)\monolib_joystick.obj : .AUTODEPEND ..\src\msw\joystick.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif !ifeq USE_GUI 1 $(OBJS)\monolib_layout.obj : .AUTODEPEND ..\src\common\layout.cpp @@ -8641,15 +8599,11 @@ $(OBJS)\monolib_tabctrl.obj : .AUTODEPEND ..\src\msw\tabctrl.cpp $(OBJS)\monolib_tabg.obj : .AUTODEPEND ..\src\generic\tabg.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!ifeq USE_GUI 1 $(OBJS)\monolib_taskbar.obj : .AUTODEPEND ..\src\msw\taskbar.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif -!ifeq USE_GUI 1 $(OBJS)\monolib_taskbarcmn.obj : .AUTODEPEND ..\src\common\taskbarcmn.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif $(OBJS)\monolib_tbar95.obj : .AUTODEPEND ..\src\msw\tbar95.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -8822,10 +8776,8 @@ $(OBJS)\monolib_vscroll.obj : .AUTODEPEND ..\src\generic\vscroll.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 $(OBJS)\monolib_wave.obj : .AUTODEPEND ..\src\msw\wave.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif $(OBJS)\monolib_wfstream.obj : .AUTODEPEND ..\src\common\wfstream.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< diff --git a/src/gtk1/joystick.cpp b/src/gtk1/joystick.cpp deleted file mode 100644 index 710841201a..0000000000 --- a/src/gtk1/joystick.cpp +++ /dev/null @@ -1,368 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: joystick.cpp -// Purpose: wxJoystick class -// Author: Ported to Linux by Guilhem Lavaux -// Modified by: -// Created: 05/23/98 -// RCS-ID: $Id$ -// Copyright: (c) Guilhem Lavaux -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ -#pragma implementation "joystick.h" -#endif - -#include "wx/defs.h" - -#if wxUSE_JOYSTICK - -#include "wx/joystick.h" - -#include -#include -#include -#include -#include -#include -#include - -#include "wx/event.h" -#include "wx/window.h" - -#define JOYSTICK_AXE_MAX 32767 -#define JOYSTICK_AXE_MIN -32767 - -IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject) - -wxJoystick::wxJoystick(int joystick) -{ - wxString dev_name; - // Assume it's the same device name on all Linux systems ... - dev_name.Printf( wxT("/dev/js%d"), (joystick == wxJOYSTICK1) ? 0 : 1); // FIXME Unicode? - - m_joystick = open(dev_name.fn_str(), O_RDWR); - m_lastposition = wxPoint(-1, -1); - for (int i=0;i<15;i++) - m_axe[i] = 0; - if (m_joystick != -1) - Create(); -} - -//////////////////////////////////////////////////////////////////////////// -// Background thread -//////////////////////////////////////////////////////////////////////////// -void *wxJoystick::Entry(void) -{ - struct js_event j_evt; - wxJoystickEvent jwx_event; - fd_set read_fds; - struct timeval time_out = {0, 0}; - - FD_ZERO(&read_fds); - while (1) { - TestDestroy(); - - if (m_polling) { - FD_SET(m_joystick, &read_fds); - select(m_joystick+1, &read_fds, NULL, NULL, &time_out); - if (FD_ISSET(m_joystick, &read_fds)) - read(m_joystick, &j_evt, sizeof(j_evt)); - else - j_evt.type = 0; - } else { - read(m_joystick, &j_evt, sizeof(j_evt)); - } - - if ((j_evt.type & JS_EVENT_AXIS) == JS_EVENT_AXIS) { - switch (j_evt.number) { - case 1: - m_lastposition.x = j_evt.value; - jwx_event.SetEventType(wxEVT_JOY_MOVE); - break; - case 2: - m_lastposition.y = j_evt.value; - jwx_event.SetEventType(wxEVT_JOY_MOVE); - break; - case 3: - m_axe[3] = j_evt.value; - jwx_event.SetEventType(wxEVT_JOY_ZMOVE); - break; - default: - m_axe[j_evt.number] = j_evt.value; - jwx_event.SetEventType(wxEVT_JOY_MOVE); - break; - } - jwx_event.SetPosition(m_lastposition); - jwx_event.SetZPosition(m_axe[3]); - } - if ((j_evt.type & JS_EVENT_BUTTON) == JS_EVENT_BUTTON) { - register int mask = 1 << j_evt.number; - char button = m_buttons & mask; - - m_buttons &= ~mask; - if (button) { - jwx_event.SetEventType(wxEVT_JOY_BUTTON_UP); - } else { - jwx_event.SetEventType(wxEVT_JOY_BUTTON_DOWN); - m_buttons |= mask; - } - - jwx_event.SetButtonState(m_buttons); - jwx_event.SetButtonChange(j_evt.number); - } - } - if (m_catchwin) - m_catchwin->ProcessEvent(jwx_event); - if (m_polling) - usleep(m_polling*1000); -} - -//////////////////////////////////////////////////////////////////////////// -// State -//////////////////////////////////////////////////////////////////////////// - -wxPoint wxJoystick::GetPosition(void) const -{ - return m_lastposition; -} - -int wxJoystick::GetZPosition(void) const -{ - return m_axe[3]; -} - -int wxJoystick::GetButtonState(void) const -{ - return m_buttons; -} - -int wxJoystick::GetPOVPosition(void) const -{ - return -1; -} - -int wxJoystick::GetPOVCTSPosition(void) const -{ - return -1; -} - -int wxJoystick::GetRudderPosition(void) const -{ - return m_axe[4]; -} - -int wxJoystick::GetUPosition(void) const -{ - return m_axe[5]; -} - -int wxJoystick::GetVPosition(void) const -{ - return m_axe[6]; -} - -int wxJoystick::GetMovementThreshold(void) const -{ - return 0; -} - -void wxJoystick::SetMovementThreshold(int threshold) -{ -} - -//////////////////////////////////////////////////////////////////////////// -// Capabilities -//////////////////////////////////////////////////////////////////////////// - -bool wxJoystick::IsOk(void) const -{ - return (m_joystick != -1); -} - -int wxJoystick::GetNumberJoysticks(void) const -{ - wxString dev_name; - int fd, j; - - for (j=0;j<2;j++) { - dev_name.Printf(wxT("/dev/js%d"), j); - fd = open(dev_name.fn_str(), O_RDONLY); - if (fd == -1) - return j; - close(fd); - } - return j; -} - -int wxJoystick::GetManufacturerId(void) const -{ - return 0; -} - -int wxJoystick::GetProductId(void) const -{ - return 0; -} - -wxString wxJoystick::GetProductName(void) const -{ - wxString dev_name; - // 2002-08-20 johan@linkdata.se - // Return the device name in lieu of a better one - dev_name.Printf( wxT("/dev/js%d"), (m_joystick == wxJOYSTICK1) ? 0 : 1); // FIXME Unicode? - return dev_name; -} - -int wxJoystick::GetXMin(void) const -{ - return JOYSTICK_AXE_MAX; -} - -int wxJoystick::GetYMin(void) const -{ - return JOYSTICK_AXE_MAX; -} - -int wxJoystick::GetZMin(void) const -{ - return JOYSTICK_AXE_MAX; -} - -int wxJoystick::GetXMax(void) const -{ - return JOYSTICK_AXE_MAX; -} - -int wxJoystick::GetYMax(void) const -{ - return JOYSTICK_AXE_MAX; -} - -int wxJoystick::GetZMax(void) const -{ - return JOYSTICK_AXE_MAX; -} - -int wxJoystick::GetNumberButtons(void) const -{ - int nb; - - ioctl(m_joystick, JSIOCGBUTTONS, &nb); - - return nb; -} - -int wxJoystick::GetNumberAxes(void) const -{ - int nb; - - ioctl(m_joystick, JSIOCGAXES, &nb); - - return nb; -} - -int wxJoystick::GetMaxButtons(void) const -{ - return 15; // internal -} - -int wxJoystick::GetMaxAxes(void) const -{ - return 15; // internal -} - -int wxJoystick::GetPollingMin(void) const -{ - return -1; -} - -int wxJoystick::GetPollingMax(void) const -{ - return -1; -} - -int wxJoystick::GetRudderMin(void) const -{ - return JOYSTICK_AXE_MIN; -} - -int wxJoystick::GetRudderMax(void) const -{ - return JOYSTICK_AXE_MAX; -} - -int wxJoystick::GetUMin(void) const -{ - return JOYSTICK_AXE_MIN; -} - -int wxJoystick::GetUMax(void) const -{ - return JOYSTICK_AXE_MAX; -} - -int wxJoystick::GetVMin(void) const -{ - return JOYSTICK_AXE_MIN; -} - -int wxJoystick::GetVMax(void) const -{ - return JOYSTICK_AXE_MAX; -} - -bool wxJoystick::HasRudder(void) const -{ - return GetNumberAxes() >= 4; -} - -bool wxJoystick::HasZ(void) const -{ - return GetNumberAxes() >= 3; -} - -bool wxJoystick::HasU(void) const -{ - return GetNumberAxes() >= 5; -} - -bool wxJoystick::HasV(void) const -{ - return GetNumberAxes() >= 6; -} - -bool wxJoystick::HasPOV(void) const -{ - return FALSE; -} - -bool wxJoystick::HasPOV4Dir(void) const -{ - return FALSE; -} - -bool wxJoystick::HasPOVCTS(void) const -{ - return FALSE; -} - -//////////////////////////////////////////////////////////////////////////// -// Operations -//////////////////////////////////////////////////////////////////////////// - -bool wxJoystick::SetCapture(wxWindow* win, int pollingFreq) -{ - m_catchwin = win; - m_polling = pollingFreq; - return TRUE; -} - -bool wxJoystick::ReleaseCapture(void) -{ - m_catchwin = NULL; - m_polling = 0; - return TRUE; -} -#endif // wxUSE_JOYSTICK - diff --git a/src/gtk1/wave.cpp b/src/gtk1/wave.cpp deleted file mode 100644 index 747514360d..0000000000 --- a/src/gtk1/wave.cpp +++ /dev/null @@ -1,228 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wave.cpp -// Purpose: wxWave -// Author: Marcel Rasche -// Modified by: -// Created: 25/10/98 -// RCS-ID: $Id$ -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ -#pragma implementation "wave.h" -#endif - -#include "wx/setup.h" - -#if wxUSE_WAVE - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#if defined(__BORLANDC__) -#pragma hdrstop -#endif - -#include -#include -#include -#include -#include - -#ifndef WX_PRECOMP -#include "wx/wx.h" -#endif - -#include "wx/file.h" -#include "wx/wave.h" - -//----------------------------------------------------------------- -// wxWave -//----------------------------------------------------------------- - -wxWave::wxWave() - : m_waveData(NULL), m_waveLength(0), m_isResource(FALSE) -{ -} - -wxWave::wxWave(const wxString& sFileName, bool isResource) - : m_waveData(NULL), m_waveLength(0), m_isResource(isResource) -{ - Create(sFileName, isResource); -} - -wxWave::wxWave(int size, const wxByte* data) - : m_waveData(NULL), m_waveLength(0), m_isResource(FALSE) -{ - Create(size, data); -} - -wxWave::~wxWave() -{ - Free(); -} - -bool wxWave::Create(const wxString& fileName, bool isResource) -{ - Free(); - - if (isResource) - { - // todo - return (m_waveData ? TRUE : FALSE); - } - else - { - m_isResource = FALSE; - - wxFile fileWave; - if (!fileWave.Open(fileName, wxFile::read)) - { - return FALSE; - } - - m_waveLength = (int) fileWave.Length(); - - m_waveData = new wxByte[m_waveLength]; - if (!m_waveData) - { - return FALSE; - } - - fileWave.Read(m_waveData, m_waveLength); - - return TRUE; - } -} - -bool wxWave::Create(int size, const wxByte* data) -{ - Free(); - m_isResource = FALSE; - m_waveLength=size; - m_waveData = new wxByte[size]; - if (!m_waveData) - { - return FALSE; - } - - for (int i=0; i 65536) - return FALSE; - if ( ioctl(dev,SNDCTL_DSP_SAMPLESIZE,&iDataBits) < 0 ) - return FALSE; - if ( ioctl(dev,SNDCTL_DSP_STEREO,&iChannel) < 0 ) - return FALSE; - if ( ioctl(dev,SNDCTL_DSP_SPEED,&ulSamplingRate) < 0 ) - return FALSE; - - return TRUE; -} -#endif - diff --git a/src/gtk/joystick.cpp b/src/unix/joystick.cpp similarity index 100% rename from src/gtk/joystick.cpp rename to src/unix/joystick.cpp diff --git a/src/gtk/wave.cpp b/src/unix/wave.cpp similarity index 100% rename from src/gtk/wave.cpp rename to src/unix/wave.cpp -- 2.45.2