check for Python and disable automatic STC files updating which requires it if it's not available
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
parent
5d4ee50b0a
commit
d84e6f500e
91
Makefile.in
91
Makefile.in
@ -3297,7 +3297,8 @@ COND_TOOLKIT_OSX_COCOA_ADVANCED_PLATFORM_HDR = \
|
||||
wx/osx/joystick.h \
|
||||
wx/osx/sound.h \
|
||||
wx/osx/taskbarosx.h \
|
||||
wx/osx/core/joystick.h
|
||||
wx/osx/core/joystick.h \
|
||||
wx/osx/cocoa/dataview.h
|
||||
@COND_TOOLKIT_OSX_COCOA@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_OSX_COCOA_ADVANCED_PLATFORM_HDR)
|
||||
@COND_TOOLKIT_PM@ADVANCED_PLATFORM_HDR = \
|
||||
@COND_TOOLKIT_PM@ wx/generic/animate.h wx/os2/joystick.h wx/os2/sound.h
|
||||
@ -11789,6 +11790,7 @@ COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS = \
|
||||
monodll_checkbox_osx.o \
|
||||
monodll_checklst_osx.o \
|
||||
monodll_choice_osx.o \
|
||||
monodll_dataview_osx.o \
|
||||
monodll_dialog_osx.o \
|
||||
monodll_osx_fontutil.o \
|
||||
monodll_gauge_osx.o \
|
||||
@ -11820,6 +11822,7 @@ COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS = \
|
||||
monodll_window_osx.o \
|
||||
monodll_core_bitmap.o \
|
||||
monodll_core_colour.o \
|
||||
monodll_core_dataview.o \
|
||||
monodll_core_dcmemory.o \
|
||||
monodll_core_display.o \
|
||||
monodll_core_fontenum.o \
|
||||
@ -11889,6 +11892,7 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS = \
|
||||
monodll_animateg.o \
|
||||
monodll_carbon_sound.o \
|
||||
monodll_cocoa_aboutdlg.o \
|
||||
monodll_cocoa_dataview.o \
|
||||
monodll_osx_cocoa_taskbar.o \
|
||||
monodll_hidjoystick.o
|
||||
@COND_TOOLKIT_OSX_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS)
|
||||
@ -11963,6 +11967,7 @@ COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_17 = \
|
||||
monolib_checkbox_osx.o \
|
||||
monolib_checklst_osx.o \
|
||||
monolib_choice_osx.o \
|
||||
monolib_dataview_osx.o \
|
||||
monolib_dialog_osx.o \
|
||||
monolib_osx_fontutil.o \
|
||||
monolib_gauge_osx.o \
|
||||
@ -11994,6 +11999,7 @@ COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_17 = \
|
||||
monolib_window_osx.o \
|
||||
monolib_core_bitmap.o \
|
||||
monolib_core_colour.o \
|
||||
monolib_core_dataview.o \
|
||||
monolib_core_dcmemory.o \
|
||||
monolib_core_display.o \
|
||||
monolib_core_fontenum.o \
|
||||
@ -12063,6 +12069,7 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
|
||||
monolib_animateg.o \
|
||||
monolib_carbon_sound.o \
|
||||
monolib_cocoa_aboutdlg.o \
|
||||
monolib_cocoa_dataview.o \
|
||||
monolib_osx_cocoa_taskbar.o \
|
||||
monolib_hidjoystick.o
|
||||
@COND_TOOLKIT_OSX_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_0)
|
||||
@ -12137,6 +12144,7 @@ COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_1_1 = \
|
||||
coredll_checkbox_osx.o \
|
||||
coredll_checklst_osx.o \
|
||||
coredll_choice_osx.o \
|
||||
coredll_dataview_osx.o \
|
||||
coredll_dialog_osx.o \
|
||||
coredll_osx_fontutil.o \
|
||||
coredll_gauge_osx.o \
|
||||
@ -12168,6 +12176,7 @@ COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_1_1 = \
|
||||
coredll_window_osx.o \
|
||||
coredll_core_bitmap.o \
|
||||
coredll_core_colour.o \
|
||||
coredll_dataview.o \
|
||||
coredll_core_dcmemory.o \
|
||||
coredll_core_display.o \
|
||||
coredll_core_fontenum.o \
|
||||
@ -12231,6 +12240,7 @@ COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_1_4 = \
|
||||
corelib_checkbox_osx.o \
|
||||
corelib_checklst_osx.o \
|
||||
corelib_choice_osx.o \
|
||||
corelib_dataview_osx.o \
|
||||
corelib_dialog_osx.o \
|
||||
corelib_osx_fontutil.o \
|
||||
corelib_gauge_osx.o \
|
||||
@ -12262,6 +12272,7 @@ COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_1_4 = \
|
||||
corelib_window_osx.o \
|
||||
corelib_core_bitmap.o \
|
||||
corelib_core_colour.o \
|
||||
corelib_dataview.o \
|
||||
corelib_core_dcmemory.o \
|
||||
corelib_core_display.o \
|
||||
corelib_core_fontenum.o \
|
||||
@ -12331,6 +12342,7 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
|
||||
advdll_animateg.o \
|
||||
advdll_carbon_sound.o \
|
||||
advdll_cocoa_aboutdlg.o \
|
||||
advdll_cocoa_dataview.o \
|
||||
advdll_osx_cocoa_taskbar.o \
|
||||
advdll_hidjoystick.o
|
||||
@COND_TOOLKIT_OSX_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_8)
|
||||
@ -12411,6 +12423,7 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
|
||||
advlib_animateg.o \
|
||||
advlib_carbon_sound.o \
|
||||
advlib_cocoa_aboutdlg.o \
|
||||
advlib_cocoa_dataview.o \
|
||||
advlib_osx_cocoa_taskbar.o \
|
||||
advlib_hidjoystick.o
|
||||
@COND_TOOLKIT_OSX_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_9)
|
||||
@ -16735,6 +16748,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(MONODLL_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_dataview_osx.o: $(srcdir)/src/osx/dataview_osx.cpp $(MONODLL_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/dataview_osx.cpp
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_dataview_osx.o: $(srcdir)/src/osx/dataview_osx.cpp $(MONODLL_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/dataview_osx.cpp
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(MONODLL_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
|
||||
|
||||
@ -16921,6 +16940,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_core_colour.o: $(srcdir)/src/osx/core/colour.cpp $(MONODLL_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_core_dataview.o: $(srcdir)/src/osx/core/dataview.cpp $(MONODLL_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/dataview.cpp
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_core_dataview.o: $(srcdir)/src/osx/core/dataview.cpp $(MONODLL_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/dataview.cpp
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_core_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(MONODLL_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
|
||||
|
||||
@ -18574,6 +18599,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
|
||||
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_cocoa_aboutdlg.o: $(srcdir)/src/osx/cocoa/aboutdlg.mm $(MONODLL_ODEP)
|
||||
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/aboutdlg.mm
|
||||
|
||||
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_cocoa_dataview.o: $(srcdir)/src/osx/cocoa/dataview.mm $(MONODLL_ODEP)
|
||||
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dataview.mm
|
||||
|
||||
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_osx_cocoa_taskbar.o: $(srcdir)/src/osx/cocoa/taskbar.mm $(MONODLL_ODEP)
|
||||
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/taskbar.mm
|
||||
|
||||
@ -21445,6 +21473,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(MONOLIB_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_dataview_osx.o: $(srcdir)/src/osx/dataview_osx.cpp $(MONOLIB_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/dataview_osx.cpp
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_dataview_osx.o: $(srcdir)/src/osx/dataview_osx.cpp $(MONOLIB_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/dataview_osx.cpp
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(MONOLIB_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
|
||||
|
||||
@ -21631,6 +21665,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_core_colour.o: $(srcdir)/src/osx/core/colour.cpp $(MONOLIB_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_core_dataview.o: $(srcdir)/src/osx/core/dataview.cpp $(MONOLIB_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/dataview.cpp
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_core_dataview.o: $(srcdir)/src/osx/core/dataview.cpp $(MONOLIB_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/dataview.cpp
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_core_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(MONOLIB_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
|
||||
|
||||
@ -23284,6 +23324,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
|
||||
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_cocoa_aboutdlg.o: $(srcdir)/src/osx/cocoa/aboutdlg.mm $(MONOLIB_ODEP)
|
||||
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/aboutdlg.mm
|
||||
|
||||
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_cocoa_dataview.o: $(srcdir)/src/osx/cocoa/dataview.mm $(MONOLIB_ODEP)
|
||||
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dataview.mm
|
||||
|
||||
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_osx_cocoa_taskbar.o: $(srcdir)/src/osx/cocoa/taskbar.mm $(MONOLIB_ODEP)
|
||||
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/taskbar.mm
|
||||
|
||||
@ -26347,6 +26390,12 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(COREDLL_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_dataview_osx.o: $(srcdir)/src/osx/dataview_osx.cpp $(COREDLL_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/dataview_osx.cpp
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_dataview_osx.o: $(srcdir)/src/osx/dataview_osx.cpp $(COREDLL_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/dataview_osx.cpp
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(COREDLL_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
|
||||
|
||||
@ -26533,6 +26582,12 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_core_colour.o: $(srcdir)/src/osx/core/colour.cpp $(COREDLL_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_dataview.o: $(srcdir)/src/osx/core/dataview.cpp $(COREDLL_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/dataview.cpp
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_dataview.o: $(srcdir)/src/osx/core/dataview.cpp $(COREDLL_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/dataview.cpp
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_core_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(COREDLL_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
|
||||
|
||||
@ -29875,6 +29930,12 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(CORELIB_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_dataview_osx.o: $(srcdir)/src/osx/dataview_osx.cpp $(CORELIB_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/dataview_osx.cpp
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_dataview_osx.o: $(srcdir)/src/osx/dataview_osx.cpp $(CORELIB_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/dataview_osx.cpp
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(CORELIB_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
|
||||
|
||||
@ -30061,6 +30122,12 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_core_colour.o: $(srcdir)/src/osx/core/colour.cpp $(CORELIB_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_dataview.o: $(srcdir)/src/osx/core/dataview.cpp $(CORELIB_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/dataview.cpp
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_dataview.o: $(srcdir)/src/osx/core/dataview.cpp $(CORELIB_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/dataview.cpp
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_core_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(CORELIB_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
|
||||
|
||||
@ -31738,6 +31805,9 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
|
||||
@COND_TOOLKIT_OSX_COCOA@advdll_cocoa_aboutdlg.o: $(srcdir)/src/osx/cocoa/aboutdlg.mm $(ADVDLL_ODEP)
|
||||
@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(ADVDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/aboutdlg.mm
|
||||
|
||||
@COND_TOOLKIT_OSX_COCOA@advdll_cocoa_dataview.o: $(srcdir)/src/osx/cocoa/dataview.mm $(ADVDLL_ODEP)
|
||||
@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(ADVDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dataview.mm
|
||||
|
||||
@COND_TOOLKIT_OSX_COCOA@advdll_osx_cocoa_taskbar.o: $(srcdir)/src/osx/cocoa/taskbar.mm $(ADVDLL_ODEP)
|
||||
@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(ADVDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/taskbar.mm
|
||||
|
||||
@ -32047,6 +32117,9 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
|
||||
@COND_TOOLKIT_OSX_COCOA@advlib_cocoa_aboutdlg.o: $(srcdir)/src/osx/cocoa/aboutdlg.mm $(ADVLIB_ODEP)
|
||||
@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(ADVLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/aboutdlg.mm
|
||||
|
||||
@COND_TOOLKIT_OSX_COCOA@advlib_cocoa_dataview.o: $(srcdir)/src/osx/cocoa/dataview.mm $(ADVLIB_ODEP)
|
||||
@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(ADVLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dataview.mm
|
||||
|
||||
@COND_TOOLKIT_OSX_COCOA@advlib_osx_cocoa_taskbar.o: $(srcdir)/src/osx/cocoa/taskbar.mm $(ADVLIB_ODEP)
|
||||
@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(ADVLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/taskbar.mm
|
||||
|
||||
@ -33041,14 +33114,14 @@ sound_sdl_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp
|
||||
$(CXXC) -c -o $@ $(SOUND_SDL_CXXFLAGS) $(srcdir)/src/unix/sound_sdl.cpp
|
||||
|
||||
|
||||
@COND_USE_STC_1@$(srcdir)/include/wx/stc/stc.h: \
|
||||
@COND_USE_STC_1@$(srcdir)/src/stc/scintilla/include/Scintilla.iface \
|
||||
@COND_USE_STC_1@$(srcdir)/src/stc/stc.cpp.in \
|
||||
@COND_USE_STC_1@$(srcdir)/src/stc/stc.h.in \
|
||||
@COND_USE_STC_1@$(srcdir)/src/stc/gen_iface.py
|
||||
@COND_USE_STC_1@ cd $(srcdir)/src/stc && ./gen_iface.py
|
||||
@COND_USE_STC_1@monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
|
||||
@COND_USE_STC_1@ $(srcdir)/include/wx/stc/stc.h
|
||||
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/include/wx/stc/stc.h: \
|
||||
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/scintilla/include/Scintilla.iface \
|
||||
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/stc.cpp.in \
|
||||
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/stc.h.in \
|
||||
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/gen_iface.py
|
||||
@COND_PYTHON@@COND_USE_STC_1@ cd $(srcdir)/src/stc && ./gen_iface.py
|
||||
@COND_PYTHON@@COND_USE_STC_1@monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
|
||||
@COND_PYTHON@@COND_USE_STC_1@ $(srcdir)/include/wx/stc/stc.h
|
||||
|
||||
#
|
||||
# "make dist" target implementation:
|
||||
|
||||
@ -17,14 +17,14 @@
|
||||
|
||||
<!-- automatically update generated files -->
|
||||
<fragment format='autoconf'>
|
||||
@COND_USE_STC_1@$(srcdir)/include/wx/stc/stc.h: \
|
||||
@COND_USE_STC_1@$(srcdir)/src/stc/scintilla/include/Scintilla.iface \
|
||||
@COND_USE_STC_1@$(srcdir)/src/stc/stc.cpp.in \
|
||||
@COND_USE_STC_1@$(srcdir)/src/stc/stc.h.in \
|
||||
@COND_USE_STC_1@$(srcdir)/src/stc/gen_iface.py
|
||||
@COND_USE_STC_1@ cd $(srcdir)/src/stc && ./gen_iface.py
|
||||
@COND_USE_STC_1@monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
|
||||
@COND_USE_STC_1@ $(srcdir)/include/wx/stc/stc.h
|
||||
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/include/wx/stc/stc.h: \
|
||||
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/scintilla/include/Scintilla.iface \
|
||||
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/stc.cpp.in \
|
||||
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/stc.h.in \
|
||||
@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/gen_iface.py
|
||||
@COND_PYTHON@@COND_USE_STC_1@ cd $(srcdir)/src/stc && ./gen_iface.py
|
||||
@COND_PYTHON@@COND_USE_STC_1@monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
|
||||
@COND_PYTHON@@COND_USE_STC_1@ $(srcdir)/include/wx/stc/stc.h
|
||||
</fragment>
|
||||
|
||||
<lib id="wxscintilla" template="3rdparty_lib"
|
||||
|
||||
75
configure
vendored
75
configure
vendored
@ -709,6 +709,8 @@ GNOMEVFS_CFLAGS
|
||||
GNOMEVFS_LIBS
|
||||
HILDON_CFLAGS
|
||||
HILDON_LIBS
|
||||
PYTHON
|
||||
COND_PYTHON
|
||||
CAIRO_CFLAGS
|
||||
CAIRO_LIBS
|
||||
GST_CFLAGS
|
||||
@ -937,10 +939,8 @@ COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0
|
||||
COND_TOOLKIT_MSW_WXUNIV_0
|
||||
COND_TOOLKIT_OSX_CARBON
|
||||
COND_TOOLKIT_OSX_CARBON_USE_GUI_1
|
||||
COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0
|
||||
COND_TOOLKIT_OSX_COCOA
|
||||
COND_TOOLKIT_OSX_COCOA_USE_GUI_1
|
||||
COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0
|
||||
COND_TOOLKIT_OSX_IPHONE
|
||||
COND_TOOLKIT_PM
|
||||
COND_TOOLKIT_PM_USE_GUI_1
|
||||
@ -46195,6 +46195,51 @@ _ACEOF
|
||||
|
||||
USE_STC=1
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS stc"
|
||||
|
||||
# Extract the first word of "python", so it can be a program name with args.
|
||||
set dummy python; ac_word=$2
|
||||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_path_PYTHON+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
case $PYTHON in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
PYTHON=$ac_cv_path_PYTHON
|
||||
if test -n "$PYTHON"; then
|
||||
{ echo "$as_me:$LINENO: result: $PYTHON" >&5
|
||||
echo "${ECHO_T}$PYTHON" >&6; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
if test "x$PYTHON" = "x"; then
|
||||
COND_PYTHON="#"
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
if test "$wxUSE_MENUS" = "yes"; then
|
||||
@ -50146,11 +50191,6 @@ EOF
|
||||
COND_TOOLKIT_OSX_CARBON_USE_GUI_1=""
|
||||
fi
|
||||
|
||||
COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0="#"
|
||||
if test "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
|
||||
COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0=""
|
||||
fi
|
||||
|
||||
COND_TOOLKIT_OSX_COCOA="#"
|
||||
if test "x$TOOLKIT" = "xOSX_COCOA" ; then
|
||||
COND_TOOLKIT_OSX_COCOA=""
|
||||
@ -50161,11 +50201,6 @@ EOF
|
||||
COND_TOOLKIT_OSX_COCOA_USE_GUI_1=""
|
||||
fi
|
||||
|
||||
COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="#"
|
||||
if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
|
||||
COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0=""
|
||||
fi
|
||||
|
||||
COND_TOOLKIT_OSX_IPHONE="#"
|
||||
if test "x$TOOLKIT" = "xOSX_IPHONE" ; then
|
||||
COND_TOOLKIT_OSX_IPHONE=""
|
||||
@ -51657,10 +51692,10 @@ GNOMEVFS_CFLAGS!$GNOMEVFS_CFLAGS$ac_delim
|
||||
GNOMEVFS_LIBS!$GNOMEVFS_LIBS$ac_delim
|
||||
HILDON_CFLAGS!$HILDON_CFLAGS$ac_delim
|
||||
HILDON_LIBS!$HILDON_LIBS$ac_delim
|
||||
PYTHON!$PYTHON$ac_delim
|
||||
COND_PYTHON!$COND_PYTHON$ac_delim
|
||||
CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim
|
||||
CAIRO_LIBS!$CAIRO_LIBS$ac_delim
|
||||
GST_CFLAGS!$GST_CFLAGS$ac_delim
|
||||
GST_LIBS!$GST_LIBS$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@ -51702,6 +51737,8 @@ _ACEOF
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
GST_CFLAGS!$GST_CFLAGS$ac_delim
|
||||
GST_LIBS!$GST_LIBS$ac_delim
|
||||
ALL_WX_LIBS!$ALL_WX_LIBS$ac_delim
|
||||
BUILT_WX_LIBS!$BUILT_WX_LIBS$ac_delim
|
||||
STD_BASE_LIBS!$STD_BASE_LIBS$ac_delim
|
||||
@ -51797,8 +51834,6 @@ SETFILE!$SETFILE$ac_delim
|
||||
OBJCXXFLAGS!$OBJCXXFLAGS$ac_delim
|
||||
GCC_PCH!$GCC_PCH$ac_delim
|
||||
ICC_PCH!$ICC_PCH$ac_delim
|
||||
ICC_PCH_CREATE_SWITCH!$ICC_PCH_CREATE_SWITCH$ac_delim
|
||||
ICC_PCH_USE_SWITCH!$ICC_PCH_USE_SWITCH$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@ -51840,6 +51875,8 @@ _ACEOF
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
ICC_PCH_CREATE_SWITCH!$ICC_PCH_CREATE_SWITCH$ac_delim
|
||||
ICC_PCH_USE_SWITCH!$ICC_PCH_USE_SWITCH$ac_delim
|
||||
BK_MAKE_PCH!$BK_MAKE_PCH$ac_delim
|
||||
COND_BUILD_DEBUG!$COND_BUILD_DEBUG$ac_delim
|
||||
COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT!$COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT$ac_delim
|
||||
@ -51935,8 +51972,6 @@ COND_SHARED_0_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1$ac_de
|
||||
COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin$ac_delim
|
||||
COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin$ac_delim
|
||||
COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin$ac_delim
|
||||
COND_SHARED_0_USE_STC_1!$COND_SHARED_0_USE_STC_1$ac_delim
|
||||
COND_SHARED_0_wxUSE_EXPAT_builtin!$COND_SHARED_0_wxUSE_EXPAT_builtin$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@ -51978,6 +52013,8 @@ _ACEOF
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
COND_SHARED_0_USE_STC_1!$COND_SHARED_0_USE_STC_1$ac_delim
|
||||
COND_SHARED_0_wxUSE_EXPAT_builtin!$COND_SHARED_0_wxUSE_EXPAT_builtin$ac_delim
|
||||
COND_SHARED_0_wxUSE_REGEX_builtin!$COND_SHARED_0_wxUSE_REGEX_builtin$ac_delim
|
||||
COND_SHARED_0_wxUSE_ZLIB_builtin!$COND_SHARED_0_wxUSE_ZLIB_builtin$ac_delim
|
||||
COND_SHARED_1!$COND_SHARED_1$ac_delim
|
||||
@ -52008,10 +52045,8 @@ COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0$ac_deli
|
||||
COND_TOOLKIT_MSW_WXUNIV_0!$COND_TOOLKIT_MSW_WXUNIV_0$ac_delim
|
||||
COND_TOOLKIT_OSX_CARBON!$COND_TOOLKIT_OSX_CARBON$ac_delim
|
||||
COND_TOOLKIT_OSX_CARBON_USE_GUI_1!$COND_TOOLKIT_OSX_CARBON_USE_GUI_1$ac_delim
|
||||
COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0$ac_delim
|
||||
COND_TOOLKIT_OSX_COCOA!$COND_TOOLKIT_OSX_COCOA$ac_delim
|
||||
COND_TOOLKIT_OSX_COCOA_USE_GUI_1!$COND_TOOLKIT_OSX_COCOA_USE_GUI_1$ac_delim
|
||||
COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
|
||||
COND_TOOLKIT_OSX_IPHONE!$COND_TOOLKIT_OSX_IPHONE$ac_delim
|
||||
COND_TOOLKIT_PM!$COND_TOOLKIT_PM$ac_delim
|
||||
COND_TOOLKIT_PM_USE_GUI_1!$COND_TOOLKIT_PM_USE_GUI_1$ac_delim
|
||||
|
||||
@ -6915,6 +6915,13 @@ if test "$wxUSE_STC" = "yes"; then
|
||||
AC_DEFINE(wxUSE_STC)
|
||||
USE_STC=1
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS stc"
|
||||
|
||||
dnl python is used to update src/stc.h (see build/bakefiles/scintilla.bkl)
|
||||
AC_PATH_PROG(PYTHON, python)
|
||||
if test "x$PYTHON" = "x"; then
|
||||
COND_PYTHON="#"
|
||||
fi
|
||||
AC_SUBST(COND_PYTHON)
|
||||
fi
|
||||
|
||||
if test "$wxUSE_MENUS" = "yes"; then
|
||||
|
||||
Loading…
Reference in New Issue
Block a user