1. optionally use libSDL for wxSound
2. added --enable-plugins for dynamically loadable SDL backend 3. fixed OSS detection to not be Linux specific git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
204
Makefile.in
204
Makefile.in
@@ -11,8 +11,10 @@ prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
INSTALL = @INSTALL@
|
||||
SHARED_LD_CXX = @SHARED_LD_CXX@
|
||||
SHARED_LD_MODULE_CXX = @SHARED_LD_MODULE_CXX@
|
||||
LIBPREFIX = @LIBPREFIX@
|
||||
SO_SUFFIX = @SO_SUFFIX@
|
||||
SO_SUFFIX_MODULE = @SO_SUFFIX_MODULE@
|
||||
LN_S = @LN_S@
|
||||
RESCOMP = @RESCOMP@
|
||||
PIC_FLAG = @PIC_FLAG@
|
||||
@@ -29,6 +31,7 @@ libdir = @libdir@
|
||||
datadir = @datadir@
|
||||
includedir = @includedir@
|
||||
DLLPREFIX = @DLLPREFIX@
|
||||
DLLPREFIX_MODULE = @DLLPREFIX_MODULE@
|
||||
AR = @AR@
|
||||
RANLIB = @RANLIB@
|
||||
CC = @CC@
|
||||
@@ -49,6 +52,7 @@ EXTRALIBS_HTML = @EXTRALIBS_HTML@
|
||||
EXTRALIBS_ODBC = @EXTRALIBS_ODBC@
|
||||
EXTRALIBS_GUI = @EXTRALIBS_GUI@
|
||||
EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
|
||||
EXTRALIBS_SDL = @EXTRALIBS_SDL@
|
||||
HOST_SUFFIX = @HOST_SUFFIX@
|
||||
|
||||
### Variables: ###
|
||||
@@ -202,6 +206,7 @@ WXEXPAT_OBJECTS = \
|
||||
wxexpat_xmlparse.o \
|
||||
wxexpat_xmlrole.o \
|
||||
wxexpat_xmltok.o
|
||||
PLUGINS_INST_DIR = $(libdir)/wx/$(PLUGIN_VERSION0)
|
||||
ALL_BASE_HEADERS = \
|
||||
wx/afterstd.h \
|
||||
wx/app.h \
|
||||
@@ -519,7 +524,8 @@ MONODLL_OBJECTS = \
|
||||
$(__NET_PLATFORM_SRC_OBJECTS) \
|
||||
$(__MONOLIB_GUI_SRC_OBJECTS) \
|
||||
monodll_xml.o \
|
||||
monodll_xtixml.o
|
||||
monodll_xtixml.o \
|
||||
$(__PLUGIN_ADV_SRC_OBJECTS)
|
||||
MONODLL_ODEP = $(___pch_wxprec_monodll_wx_wxprec_h_gch___depname)
|
||||
MONOLIB_CFLAGS = $(__monolib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
|
||||
@@ -603,7 +609,8 @@ MONOLIB_OBJECTS = \
|
||||
$(__NET_PLATFORM_SRC_OBJECTS_1) \
|
||||
$(__MONOLIB_GUI_SRC_OBJECTS_1) \
|
||||
monolib_xml.o \
|
||||
monolib_xtixml.o
|
||||
monolib_xtixml.o \
|
||||
$(__PLUGIN_ADV_SRC_OBJECTS_1)
|
||||
MONOLIB_ODEP = $(___pch_wxprec_monolib_wx_wxprec_h_gch___depname)
|
||||
BASEDLL_CFLAGS = $(__basedll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
|
||||
@@ -839,7 +846,8 @@ ADVDLL_OBJECTS = \
|
||||
advdll_splash.o \
|
||||
advdll_tipdlg.o \
|
||||
advdll_wizard.o \
|
||||
$(__ADVANCED_PLATFORM_SRC_OBJECTS_2)
|
||||
$(__ADVANCED_PLATFORM_SRC_OBJECTS_2) \
|
||||
$(__PLUGIN_ADV_SRC_OBJECTS_2)
|
||||
ADVDLL_ODEP = $(___pch_wxprec_advdll_wx_wxprec_h_gch___depname)
|
||||
ADVLIB_CXXFLAGS = $(__advlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
|
||||
@@ -856,7 +864,8 @@ ADVLIB_OBJECTS = \
|
||||
advlib_splash.o \
|
||||
advlib_tipdlg.o \
|
||||
advlib_wizard.o \
|
||||
$(__ADVANCED_PLATFORM_SRC_OBJECTS_3)
|
||||
$(__ADVANCED_PLATFORM_SRC_OBJECTS_3) \
|
||||
$(__PLUGIN_ADV_SRC_OBJECTS_3)
|
||||
ADVLIB_ODEP = $(___pch_wxprec_advlib_wx_wxprec_h_gch___depname)
|
||||
ODBCDLL_CXXFLAGS = $(__odbcdll_PCH_INC) -D__WX$(TOOLKIT)__ \
|
||||
$(__WXUNIV_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
|
||||
@@ -974,6 +983,10 @@ GLLIB_CXXFLAGS = $(__gllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
GLLIB_OBJECTS = \
|
||||
$(__OPENGL_SRC_OBJECTS_1)
|
||||
GLLIB_ODEP = $(___pch_wxprec_gllib_wx_wxprec_h_gch___depname)
|
||||
SOUND_SDL_CXXFLAGS = -DWXUSINGDLL -DwxUSE_GUI=0 $(PIC_FLAG) $(CPPFLAGS) \
|
||||
$(CXXFLAGS)
|
||||
SOUND_SDL_OBJECTS = \
|
||||
sound_sdl_sound_sdl.o
|
||||
LOCALE_LINGUAS = ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk zh zh_CN zh_TW
|
||||
|
||||
### Conditionally set variables: ###
|
||||
@@ -984,6 +997,7 @@ LOCALE_LINGUAS = ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk zh zh_
|
||||
@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)
|
||||
@COND_DEPS_TRACKING_0@CXXC = $(CXX)
|
||||
@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
|
||||
@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
|
||||
@COND_USE_GUI_0@PORTNAME = base
|
||||
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
|
||||
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
|
||||
@@ -1035,6 +1049,14 @@ LOCALE_LINGUAS = ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk zh zh_
|
||||
@COND_WXUSE_EXPAT_BUILTIN@ $(LIBDIRNAME)/$(LIBPREFIX)wxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a
|
||||
@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@__install_wxexpat___depname \
|
||||
@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@ = install_wxexpat
|
||||
@COND_PLATFORM_UNIX_0@PLUGIN_VERSION0 = 251
|
||||
@COND_PLATFORM_UNIX_1@PLUGIN_VERSION0 = 2.5.1
|
||||
@COND_PLATFORM_UNIX_0@PLUGVERDELIM =
|
||||
@COND_PLATFORM_UNIX_1@PLUGVERDELIM = -
|
||||
@COND_BUILD_DEBUG_UNICODE_0@PLUGINSUFFIX = _d
|
||||
@COND_BUILD_DEBUG_UNICODE_1@PLUGINSUFFIX = _ud
|
||||
@COND_BUILD_RELEASE_UNICODE_0@PLUGINSUFFIX =
|
||||
@COND_BUILD_RELEASE_UNICODE_1@PLUGINSUFFIX = _u
|
||||
@COND_TOOLKIT_GTK@OPENGL_HDR = wx/gtk/glcanvas.h
|
||||
@COND_TOOLKIT_MAC@OPENGL_HDR = wx/mac/glcanvas.h
|
||||
@COND_TOOLKIT_MOTIF@OPENGL_HDR = wx/x11/glcanvas.h
|
||||
@@ -1644,17 +1666,18 @@ COND_TOOLKIT_PM_GUI_HDR = \
|
||||
wx/os2/window.h
|
||||
@COND_TOOLKIT_PM@GUI_HDR = $(COND_TOOLKIT_PM_GUI_HDR)
|
||||
@COND_TOOLKIT_GTK@ADVANCED_PLATFORM_HDR = \
|
||||
@COND_TOOLKIT_GTK@ wx/unix/joystick.h wx/unix/taskbarx11.h wx/unix/wave.h
|
||||
@COND_TOOLKIT_GTK@ wx/unix/joystick.h wx/unix/sound.h wx/unix/taskbarx11.h
|
||||
@COND_TOOLKIT_MAC@ADVANCED_PLATFORM_HDR = \
|
||||
@COND_TOOLKIT_MAC@ wx/mac/joystick.h wx/mac/wave.h
|
||||
@COND_TOOLKIT_MOTIF@ADVANCED_PLATFORM_HDR = \
|
||||
@COND_TOOLKIT_MOTIF@ wx/unix/joystick.h wx/unix/taskbarx11.h wx/unix/wave.h
|
||||
@COND_TOOLKIT_MOTIF@ wx/unix/joystick.h wx/unix/sound.h \
|
||||
@COND_TOOLKIT_MOTIF@ wx/unix/taskbarx11.h
|
||||
@COND_TOOLKIT_MSW@ADVANCED_PLATFORM_HDR = \
|
||||
@COND_TOOLKIT_MSW@ wx/msw/joystick.h wx/msw/taskbar.h wx/msw/wave.h
|
||||
@COND_TOOLKIT_PM@ADVANCED_PLATFORM_HDR = wx/os2/joystick.h \
|
||||
@COND_TOOLKIT_PM@ wx/os2/wave.h
|
||||
@COND_TOOLKIT_X11@ADVANCED_PLATFORM_HDR = \
|
||||
@COND_TOOLKIT_X11@ wx/unix/joystick.h wx/unix/taskbarx11.h wx/unix/wave.h
|
||||
@COND_TOOLKIT_X11@ wx/unix/joystick.h wx/unix/sound.h wx/unix/taskbarx11.h
|
||||
@COND_USE_GUI_1_WXUNIV_0@GUI_CORE_HEADERS = $(GUI_HDR)
|
||||
COND_USE_GUI_1_WXUNIV_1_GUI_CORE_HEADERS = \
|
||||
wx/generic/accel.h \
|
||||
@@ -1887,6 +1910,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \
|
||||
wx/joystick.h \
|
||||
wx/laywin.h \
|
||||
wx/sashwin.h \
|
||||
wx/sound.h \
|
||||
wx/splash.h \
|
||||
wx/taskbar.h \
|
||||
wx/tipdlg.h \
|
||||
@@ -2701,16 +2725,16 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS = \
|
||||
COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS = \
|
||||
monodll_taskbarcmn.o \
|
||||
monodll_joystick.o \
|
||||
monodll_taskbarx11.o \
|
||||
monodll_wave.o
|
||||
monodll_sound.o \
|
||||
monodll_taskbarx11.o
|
||||
@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS)
|
||||
@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS = \
|
||||
@COND_TOOLKIT_MAC@ monodll_joystick.o monodll_wave.o
|
||||
COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS = \
|
||||
monodll_taskbarcmn.o \
|
||||
monodll_joystick.o \
|
||||
monodll_taskbarx11.o \
|
||||
monodll_wave.o
|
||||
monodll_sound.o \
|
||||
monodll_taskbarx11.o
|
||||
@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS)
|
||||
@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS = \
|
||||
@COND_TOOLKIT_MSW@ monodll_taskbarcmn.o monodll_joystick.o \
|
||||
@@ -2720,12 +2744,14 @@ COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS = \
|
||||
COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS = \
|
||||
monodll_taskbarcmn.o \
|
||||
monodll_joystick.o \
|
||||
monodll_taskbarx11.o \
|
||||
monodll_wave.o
|
||||
monodll_sound.o \
|
||||
monodll_taskbarx11.o
|
||||
@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS)
|
||||
@COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o
|
||||
@COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o
|
||||
@COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS = monodll_helpbest.o
|
||||
@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS \
|
||||
@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@ = monodll_sound_sdl.o
|
||||
COND_MONOLITHIC_1_SHARED_0___monolib___depname = \
|
||||
$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a
|
||||
@COND_MONOLITHIC_1_SHARED_0@__monolib___depname = $(COND_MONOLITHIC_1_SHARED_0___monolib___depname)
|
||||
@@ -3483,16 +3509,16 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1 = \
|
||||
COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
|
||||
monolib_taskbarcmn.o \
|
||||
monolib_joystick.o \
|
||||
monolib_taskbarx11.o \
|
||||
monolib_wave.o
|
||||
monolib_sound.o \
|
||||
monolib_taskbarx11.o
|
||||
@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_1)
|
||||
@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
|
||||
@COND_TOOLKIT_MAC@ monolib_joystick.o monolib_wave.o
|
||||
COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
|
||||
monolib_taskbarcmn.o \
|
||||
monolib_joystick.o \
|
||||
monolib_taskbarx11.o \
|
||||
monolib_wave.o
|
||||
monolib_sound.o \
|
||||
monolib_taskbarx11.o
|
||||
@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_1)
|
||||
@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
|
||||
@COND_TOOLKIT_MSW@ monolib_taskbarcmn.o monolib_joystick.o \
|
||||
@@ -3502,12 +3528,14 @@ COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
|
||||
COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
|
||||
monolib_taskbarcmn.o \
|
||||
monolib_joystick.o \
|
||||
monolib_taskbarx11.o \
|
||||
monolib_wave.o
|
||||
monolib_sound.o \
|
||||
monolib_taskbarx11.o
|
||||
@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1)
|
||||
@COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_chm.o
|
||||
@COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_chm.o
|
||||
@COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_helpbest.o
|
||||
@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_1 \
|
||||
@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@ = monolib_sound_sdl.o
|
||||
COND_MONOLITHIC_0_SHARED_1___basedll___depname = \
|
||||
$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
|
||||
@COND_MONOLITHIC_0_SHARED_1@__basedll___depname = $(COND_MONOLITHIC_0_SHARED_1___basedll___depname)
|
||||
@@ -5119,21 +5147,23 @@ COND_USE_SOSYMLINKS_1___advdll___so_symlinks_inst_cmd = rm -f \
|
||||
$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
|
||||
@COND_USE_SOSYMLINKS_1@__advdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___advdll___so_symlinks_inst_cmd)
|
||||
@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
|
||||
@COND_TOOLKIT_GTK@ advdll_taskbarcmn.o advdll_joystick.o \
|
||||
@COND_TOOLKIT_GTK@ advdll_taskbarx11.o advdll_wave.o
|
||||
@COND_TOOLKIT_GTK@ advdll_taskbarcmn.o advdll_joystick.o advdll_sound.o \
|
||||
@COND_TOOLKIT_GTK@ advdll_taskbarx11.o
|
||||
@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
|
||||
@COND_TOOLKIT_MAC@ advdll_joystick.o advdll_wave.o
|
||||
@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
|
||||
@COND_TOOLKIT_MOTIF@ advdll_taskbarcmn.o advdll_joystick.o \
|
||||
@COND_TOOLKIT_MOTIF@ advdll_taskbarx11.o advdll_wave.o
|
||||
@COND_TOOLKIT_MOTIF@ advdll_taskbarcmn.o advdll_joystick.o advdll_sound.o \
|
||||
@COND_TOOLKIT_MOTIF@ advdll_taskbarx11.o
|
||||
@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
|
||||
@COND_TOOLKIT_MSW@ advdll_taskbarcmn.o advdll_joystick.o advdll_taskbar.o \
|
||||
@COND_TOOLKIT_MSW@ advdll_wave.o
|
||||
@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
|
||||
@COND_TOOLKIT_PM@ advdll_joystick.o advdll_wave.o
|
||||
@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
|
||||
@COND_TOOLKIT_X11@ advdll_taskbarcmn.o advdll_joystick.o \
|
||||
@COND_TOOLKIT_X11@ advdll_taskbarx11.o advdll_wave.o
|
||||
@COND_TOOLKIT_X11@ advdll_taskbarcmn.o advdll_joystick.o advdll_sound.o \
|
||||
@COND_TOOLKIT_X11@ advdll_taskbarx11.o
|
||||
@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_2 \
|
||||
@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@ = advdll_sound_sdl.o
|
||||
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \
|
||||
$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX).a
|
||||
@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__advlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname)
|
||||
@@ -5143,21 +5173,23 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \
|
||||
@COND_GCC_PCH_1@___pch_wxprec_advlib_wx_wxprec_h_gch___depname \
|
||||
@COND_GCC_PCH_1@ = .pch/wxprec_advlib/wx/wxprec.h.gch
|
||||
@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
|
||||
@COND_TOOLKIT_GTK@ advlib_taskbarcmn.o advlib_joystick.o \
|
||||
@COND_TOOLKIT_GTK@ advlib_taskbarx11.o advlib_wave.o
|
||||
@COND_TOOLKIT_GTK@ advlib_taskbarcmn.o advlib_joystick.o advlib_sound.o \
|
||||
@COND_TOOLKIT_GTK@ advlib_taskbarx11.o
|
||||
@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
|
||||
@COND_TOOLKIT_MAC@ advlib_joystick.o advlib_wave.o
|
||||
@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
|
||||
@COND_TOOLKIT_MOTIF@ advlib_taskbarcmn.o advlib_joystick.o \
|
||||
@COND_TOOLKIT_MOTIF@ advlib_taskbarx11.o advlib_wave.o
|
||||
@COND_TOOLKIT_MOTIF@ advlib_taskbarcmn.o advlib_joystick.o advlib_sound.o \
|
||||
@COND_TOOLKIT_MOTIF@ advlib_taskbarx11.o
|
||||
@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
|
||||
@COND_TOOLKIT_MSW@ advlib_taskbarcmn.o advlib_joystick.o advlib_taskbar.o \
|
||||
@COND_TOOLKIT_MSW@ advlib_wave.o
|
||||
@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
|
||||
@COND_TOOLKIT_PM@ advlib_joystick.o advlib_wave.o
|
||||
@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
|
||||
@COND_TOOLKIT_X11@ advlib_taskbarcmn.o advlib_joystick.o \
|
||||
@COND_TOOLKIT_X11@ advlib_taskbarx11.o advlib_wave.o
|
||||
@COND_TOOLKIT_X11@ advlib_taskbarcmn.o advlib_joystick.o advlib_sound.o \
|
||||
@COND_TOOLKIT_X11@ advlib_taskbarx11.o
|
||||
@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_3 \
|
||||
@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@ = advlib_sound_sdl.o
|
||||
COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1___odbcdll___depname = \
|
||||
$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
|
||||
@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@__odbcdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1___odbcdll___depname)
|
||||
@@ -5422,6 +5454,10 @@ COND_SHARED_0_USE_GUI_1_USE_OPENGL_1___gllib___depname = \
|
||||
@COND_TOOLKIT_MSW@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
|
||||
@COND_TOOLKIT_PM@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
|
||||
@COND_TOOLKIT_X11@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
|
||||
COND_WITH_PLUGIN_SDL_1___sound_sdl___depname = \
|
||||
$(DLLPREFIX_MODULE)sound_sdl$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
|
||||
@COND_WITH_PLUGIN_SDL_1@__sound_sdl___depname = $(COND_WITH_PLUGIN_SDL_1___sound_sdl___depname)
|
||||
@COND_WITH_PLUGIN_SDL_1@__install_sound_sdl___depname = install_sound_sdl
|
||||
@COND_USE_GUI_1@__install_afm___depname = install-afm
|
||||
@COND_USE_GUI_1@__install_gsafm___depname = install-gsafm
|
||||
@COND_TOOLKIT_MAC@__macos_res___depname = lib/libwx_$(TOOLCHAIN_NAME).1.r
|
||||
@@ -6167,9 +6203,9 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_9 = \
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) $(__macos_res___depname) $(__cocoa_res___depname)
|
||||
all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__macos_res___depname) $(__cocoa_res___depname)
|
||||
|
||||
install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_afm___depname) $(__install_gsafm___depname) install-wxconfig locale_install $(__macos_res_install___depname) $(__cocoa_res_install___depname)
|
||||
install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_afm___depname) $(__install_gsafm___depname) install-wxconfig locale_install $(__macos_res_install___depname) $(__cocoa_res_install___depname)
|
||||
$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
|
||||
(cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
|
||||
$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx
|
||||
@@ -6210,6 +6246,7 @@ install-strip: install
|
||||
$(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
|
||||
$(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
|
||||
$(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
|
||||
$(STRIP) $(DESTDIR)$(PLUGINS_INST_DIR)/$(DLLPREFIX_MODULE)sound_sdl$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
|
||||
|
||||
clean:
|
||||
rm -rf ./.deps ./.pch
|
||||
@@ -6261,6 +6298,7 @@ clean:
|
||||
rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
|
||||
rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
|
||||
rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX).a
|
||||
rm -f $(DLLPREFIX_MODULE)sound_sdl$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
|
||||
(cd samples && $(MAKE) clean)
|
||||
rm -f lib/libwx_$(TOOLCHAIN_NAME).1.rsrc lib/libwx_$(TOOLCHAIN_NAME).1.r
|
||||
rm -f lib/libwx_$(TOOLCHAIN_NAME).1.rsrc lib/libwx_$(TOOLCHAIN_NAME).1.r
|
||||
@@ -6332,7 +6370,7 @@ distclean: clean
|
||||
@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
|
||||
|
||||
@COND_MONOLITHIC_1_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname)
|
||||
@COND_MONOLITHIC_1_SHARED_1@ $(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(EXTRALIBS_ODBC)
|
||||
@COND_MONOLITHIC_1_SHARED_1@ $(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(EXTRALIBS_ODBC) $(PLUGIN_ADV_EXTRALIBS)
|
||||
@COND_MONOLITHIC_1_SHARED_1@
|
||||
@COND_MONOLITHIC_1_SHARED_1@ $(__monodll___so_symlinks_cmd)
|
||||
|
||||
@@ -6436,7 +6474,7 @@ distclean: clean
|
||||
@COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_corelib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(CORELIB_CXXFLAGS)
|
||||
|
||||
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname)
|
||||
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(ADVDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__advdll___macinstnamecmd) $(__advdll___importlib) $(__advdll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
|
||||
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(ADVDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__advdll___macinstnamecmd) $(__advdll___importlib) $(__advdll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(PLUGIN_ADV_EXTRALIBS)
|
||||
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@
|
||||
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__advdll___so_symlinks_cmd)
|
||||
|
||||
@@ -6591,6 +6629,13 @@ distclean: clean
|
||||
@COND_GCC_PCH_1@.pch/wxprec_gllib/wx/wxprec.h.gch:
|
||||
@COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_gllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GLLIB_CXXFLAGS)
|
||||
|
||||
@COND_WITH_PLUGIN_SDL_1@$(DLLPREFIX_MODULE)sound_sdl$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE): $(SOUND_SDL_OBJECTS)
|
||||
@COND_WITH_PLUGIN_SDL_1@ $(SHARED_LD_MODULE_CXX) $@ $(SOUND_SDL_OBJECTS) $(LDFLAGS) $(EXTRALIBS_SDL)
|
||||
|
||||
@COND_WITH_PLUGIN_SDL_1@install_sound_sdl:
|
||||
@COND_WITH_PLUGIN_SDL_1@ $(INSTALL_DIR) $(DESTDIR)$(PLUGINS_INST_DIR)
|
||||
@COND_WITH_PLUGIN_SDL_1@ $(INSTALL_PROGRAM) $(DLLPREFIX_MODULE)sound_sdl$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE) $(DESTDIR)$(PLUGINS_INST_DIR)
|
||||
|
||||
samples:
|
||||
(cd samples && $(MAKE) all)
|
||||
|
||||
@@ -7530,6 +7575,9 @@ monodll_xml.o: $(srcdir)/src/xml/xml.cpp $(MONODLL_ODEP)
|
||||
monodll_xtixml.o: $(srcdir)/src/common/xtixml.cpp $(MONODLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
@COND_PLATFORM_UNIX_1@monodll_baseunix.o: $(srcdir)/src/unix/baseunix.cpp $(MONODLL_ODEP)
|
||||
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
@@ -9615,18 +9663,18 @@ monodll_xtixml.o: $(srcdir)/src/common/xtixml.cpp $(MONODLL_ODEP)
|
||||
@COND_TOOLKIT_MAC_USE_GUI_1@monodll_wave.o: $(srcdir)/src/mac/wave.cpp $(MONODLL_ODEP)
|
||||
@COND_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_wave.o: $(srcdir)/src/unix/wave.cpp $(MONODLL_ODEP)
|
||||
@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_GTK_USE_GUI_1@monodll_wave.o: $(srcdir)/src/unix/wave.cpp $(MONODLL_ODEP)
|
||||
@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@monodll_wave.o: $(srcdir)/src/unix/wave.cpp $(MONODLL_ODEP)
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_PM_USE_GUI_1@monodll_wave.o: $(srcdir)/src/os2/wave.cpp $(MONODLL_ODEP)
|
||||
@COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
|
||||
@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_GTK_USE_GUI_1@monodll_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
|
||||
@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@monodll_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP)
|
||||
@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
@@ -10134,6 +10182,9 @@ monolib_xml.o: $(srcdir)/src/xml/xml.cpp $(MONOLIB_ODEP)
|
||||
monolib_xtixml.o: $(srcdir)/src/common/xtixml.cpp $(MONOLIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
@COND_PLATFORM_UNIX_1@monolib_baseunix.o: $(srcdir)/src/unix/baseunix.cpp $(MONOLIB_ODEP)
|
||||
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
@@ -12219,18 +12270,18 @@ monolib_xtixml.o: $(srcdir)/src/common/xtixml.cpp $(MONOLIB_ODEP)
|
||||
@COND_TOOLKIT_MAC_USE_GUI_1@monolib_wave.o: $(srcdir)/src/mac/wave.cpp $(MONOLIB_ODEP)
|
||||
@COND_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_wave.o: $(srcdir)/src/unix/wave.cpp $(MONOLIB_ODEP)
|
||||
@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_GTK_USE_GUI_1@monolib_wave.o: $(srcdir)/src/unix/wave.cpp $(MONOLIB_ODEP)
|
||||
@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@monolib_wave.o: $(srcdir)/src/unix/wave.cpp $(MONOLIB_ODEP)
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_PM_USE_GUI_1@monolib_wave.o: $(srcdir)/src/os2/wave.cpp $(MONOLIB_ODEP)
|
||||
@COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
|
||||
@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_GTK_USE_GUI_1@monolib_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
|
||||
@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@monolib_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP)
|
||||
@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
@@ -17196,6 +17247,9 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
|
||||
advdll_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(ADVDLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
|
||||
|
||||
advdll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVDLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_MSW@advdll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVDLL_ODEP)
|
||||
@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
|
||||
|
||||
@@ -17232,18 +17286,18 @@ advdll_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(ADVDLL_ODEP)
|
||||
@COND_TOOLKIT_MAC@advdll_wave.o: $(srcdir)/src/mac/wave.cpp $(ADVDLL_ODEP)
|
||||
@COND_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_MOTIF@advdll_wave.o: $(srcdir)/src/unix/wave.cpp $(ADVDLL_ODEP)
|
||||
@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_GTK@advdll_wave.o: $(srcdir)/src/unix/wave.cpp $(ADVDLL_ODEP)
|
||||
@COND_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_X11@advdll_wave.o: $(srcdir)/src/unix/wave.cpp $(ADVDLL_ODEP)
|
||||
@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_PM@advdll_wave.o: $(srcdir)/src/os2/wave.cpp $(ADVDLL_ODEP)
|
||||
@COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_MOTIF@advdll_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP)
|
||||
@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_GTK@advdll_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP)
|
||||
@COND_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_X11@advdll_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP)
|
||||
@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_MOTIF@advdll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVDLL_ODEP)
|
||||
@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
|
||||
|
||||
@@ -17289,6 +17343,9 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
|
||||
advlib_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(ADVLIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
|
||||
|
||||
advlib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVLIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_MSW@advlib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVLIB_ODEP)
|
||||
@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
|
||||
|
||||
@@ -17325,18 +17382,18 @@ advlib_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(ADVLIB_ODEP)
|
||||
@COND_TOOLKIT_MAC@advlib_wave.o: $(srcdir)/src/mac/wave.cpp $(ADVLIB_ODEP)
|
||||
@COND_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_MOTIF@advlib_wave.o: $(srcdir)/src/unix/wave.cpp $(ADVLIB_ODEP)
|
||||
@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_GTK@advlib_wave.o: $(srcdir)/src/unix/wave.cpp $(ADVLIB_ODEP)
|
||||
@COND_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_X11@advlib_wave.o: $(srcdir)/src/unix/wave.cpp $(ADVLIB_ODEP)
|
||||
@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_PM@advlib_wave.o: $(srcdir)/src/os2/wave.cpp $(ADVLIB_ODEP)
|
||||
@COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_MOTIF@advlib_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP)
|
||||
@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_GTK@advlib_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP)
|
||||
@COND_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_X11@advlib_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP)
|
||||
@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_MOTIF@advlib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVLIB_ODEP)
|
||||
@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
|
||||
|
||||
@@ -17556,6 +17613,9 @@ xmllib_xtixml.o: $(srcdir)/src/common/xtixml.cpp $(XMLLIB_ODEP)
|
||||
@COND_TOOLKIT_PM@gllib_glcanvas.o: $(srcdir)/src/os2/glcanvas.cpp $(GLLIB_ODEP)
|
||||
@COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $<
|
||||
|
||||
sound_sdl_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp
|
||||
$(CXXC) -c -o $@ $(SOUND_SDL_CXXFLAGS) $<
|
||||
|
||||
|
||||
#
|
||||
# "make dist" target implementation:
|
||||
@@ -18700,4 +18760,4 @@ rpm: bzip-dist
|
||||
# Include dependency info, if present:
|
||||
@IF_GNU_MAKE@-include .deps/*.d
|
||||
|
||||
.PHONY: all install uninstall clean distclean install_wxregex install_wxzlib install_wxpng install_wxjpeg install_wxtiff install_wxodbc install_wxexpat install_monodll install_monolib install_basedll install_baselib install_netdll install_netlib install_coredll install_corelib install_advdll install_advlib install_odbcdll install_odbclib install_dbgriddll install_dbgridlib install_htmldll install_htmllib install_xmldll install_xmllib install_gldll install_gllib samples
|
||||
.PHONY: all install uninstall clean distclean install_wxregex install_wxzlib install_wxpng install_wxjpeg install_wxtiff install_wxodbc install_wxexpat install_monodll install_monolib install_basedll install_baselib install_netdll install_netlib install_coredll install_corelib install_advdll install_advlib install_odbcdll install_odbclib install_dbgriddll install_dbgridlib install_htmldll install_htmllib install_xmldll install_xmllib install_gldll install_gllib install_sound_sdl samples
|
||||
|
||||
229
aclocal.m4
vendored
229
aclocal.m4
vendored
@@ -1062,6 +1062,182 @@ AC_DEFUN(PKG_CHECK_MODULES, [
|
||||
|
||||
|
||||
|
||||
# Configure paths for SDL
|
||||
# Sam Lantinga 9/21/99
|
||||
# stolen from Manish Singh
|
||||
# stolen back from Frank Belew
|
||||
# stolen from Manish Singh
|
||||
# Shamelessly stolen from Owen Taylor
|
||||
|
||||
dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
|
||||
dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
|
||||
dnl
|
||||
AC_DEFUN(AM_PATH_SDL,
|
||||
[dnl
|
||||
dnl Get the cflags and libraries from the sdl-config script
|
||||
dnl
|
||||
AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)],
|
||||
sdl_prefix="$withval", sdl_prefix="")
|
||||
AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
|
||||
sdl_exec_prefix="$withval", sdl_exec_prefix="")
|
||||
AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program],
|
||||
, enable_sdltest=yes)
|
||||
|
||||
if test x$sdl_exec_prefix != x ; then
|
||||
sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
|
||||
if test x${SDL_CONFIG+set} != xset ; then
|
||||
SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
|
||||
fi
|
||||
fi
|
||||
if test x$sdl_prefix != x ; then
|
||||
sdl_args="$sdl_args --prefix=$sdl_prefix"
|
||||
if test x${SDL_CONFIG+set} != xset ; then
|
||||
SDL_CONFIG=$sdl_prefix/bin/sdl-config
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_REQUIRE([AC_CANONICAL_TARGET])
|
||||
PATH="$prefix/bin:$prefix/usr/bin:$PATH"
|
||||
AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
|
||||
min_sdl_version=ifelse([$1], ,0.11.0,$1)
|
||||
AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
|
||||
no_sdl=""
|
||||
if test "$SDL_CONFIG" = "no" ; then
|
||||
no_sdl=yes
|
||||
else
|
||||
SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
|
||||
SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
|
||||
|
||||
sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
||||
sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
||||
sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
||||
if test "x$enable_sdltest" = "xyes" ; then
|
||||
ac_save_CFLAGS="$CFLAGS"
|
||||
ac_save_LIBS="$LIBS"
|
||||
CFLAGS="$CFLAGS $SDL_CFLAGS"
|
||||
LIBS="$LIBS $SDL_LIBS"
|
||||
dnl
|
||||
dnl Now check if the installed SDL is sufficiently new. (Also sanity
|
||||
dnl checks the results of sdl-config to some extent
|
||||
dnl
|
||||
rm -f conf.sdltest
|
||||
AC_TRY_RUN([
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include "SDL.h"
|
||||
|
||||
char*
|
||||
my_strdup (char *str)
|
||||
{
|
||||
char *new_str;
|
||||
|
||||
if (str)
|
||||
{
|
||||
new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
|
||||
strcpy (new_str, str);
|
||||
}
|
||||
else
|
||||
new_str = NULL;
|
||||
|
||||
return new_str;
|
||||
}
|
||||
|
||||
int main (int argc, char *argv[])
|
||||
{
|
||||
int major, minor, micro;
|
||||
char *tmp_version;
|
||||
|
||||
/* This hangs on some systems (?)
|
||||
system ("touch conf.sdltest");
|
||||
*/
|
||||
{ FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
|
||||
|
||||
/* HP/UX 9 (%@#!) writes to sscanf strings */
|
||||
tmp_version = my_strdup("$min_sdl_version");
|
||||
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
|
||||
printf("%s, bad version string\n", "$min_sdl_version");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
if (($sdl_major_version > major) ||
|
||||
(($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
|
||||
(($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
|
||||
printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
|
||||
printf("*** best to upgrade to the required version.\n");
|
||||
printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
|
||||
printf("*** to point to the correct copy of sdl-config, and remove the file\n");
|
||||
printf("*** config.cache before re-running configure\n");
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
fi
|
||||
if test "x$no_sdl" = x ; then
|
||||
AC_MSG_RESULT(yes)
|
||||
ifelse([$2], , :, [$2])
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
if test "$SDL_CONFIG" = "no" ; then
|
||||
echo "*** The sdl-config script installed by SDL could not be found"
|
||||
echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
|
||||
echo "*** your path, or set the SDL_CONFIG environment variable to the"
|
||||
echo "*** full path to sdl-config."
|
||||
else
|
||||
if test -f conf.sdltest ; then
|
||||
:
|
||||
else
|
||||
echo "*** Could not run SDL test program, checking why..."
|
||||
CFLAGS="$CFLAGS $SDL_CFLAGS"
|
||||
LIBS="$LIBS $SDL_LIBS"
|
||||
AC_TRY_LINK([
|
||||
#include <stdio.h>
|
||||
#include "SDL.h"
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{ return 0; }
|
||||
#undef main
|
||||
#define main K_and_R_C_main
|
||||
], [ return 0; ],
|
||||
[ echo "*** The test program compiled, but did not run. This usually means"
|
||||
echo "*** that the run-time linker is not finding SDL or finding the wrong"
|
||||
echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
|
||||
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
|
||||
echo "*** to the installed location Also, make sure you have run ldconfig if that"
|
||||
echo "*** is required on your system"
|
||||
echo "***"
|
||||
echo "*** If you have an old version installed, it is best to remove it, although"
|
||||
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
|
||||
[ echo "*** The test program failed to compile or link. See the file config.log for the"
|
||||
echo "*** exact error that occured. This usually means SDL was incorrectly installed"
|
||||
echo "*** or that you have moved SDL since it was installed. In the latter case, you"
|
||||
echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
fi
|
||||
SDL_CFLAGS=""
|
||||
SDL_LIBS=""
|
||||
ifelse([$3], , :, [$3])
|
||||
fi
|
||||
AC_SUBST(SDL_CFLAGS)
|
||||
AC_SUBST(SDL_LIBS)
|
||||
rm -f conf.sdltest
|
||||
])
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl Support macros for makefiles generated by BAKEFILE.
|
||||
dnl ---------------------------------------------------------------------------
|
||||
@@ -1113,7 +1289,8 @@ AC_DEFUN(AC_BAKEFILE_PLATFORM,
|
||||
PLATFORM_MACOSX=0
|
||||
PLATFORM_OS2=0
|
||||
|
||||
case "${host}" in
|
||||
if test "x$BAKEFILE_FORCE_PLATFORM" = "x"; then
|
||||
case "${BAKEFILE_HOST}" in
|
||||
*-*-cygwin* | *-*-mingw32* )
|
||||
PLATFORM_WIN32=1
|
||||
;;
|
||||
@@ -1131,6 +1308,29 @@ AC_DEFUN(AC_BAKEFILE_PLATFORM,
|
||||
PLATFORM_UNIX=1
|
||||
;;
|
||||
esac
|
||||
else
|
||||
case "$BAKEFILE_FORCE_PLATFORM" in
|
||||
win32 )
|
||||
PLATFORM_WIN32=1
|
||||
;;
|
||||
msdos )
|
||||
PLATFORM_MSDOS=1
|
||||
;;
|
||||
os2 )
|
||||
PLATFORM_OS2=1
|
||||
;;
|
||||
darwin )
|
||||
PLATFORM_MAC=1
|
||||
PLATFORM_MACOSX=1
|
||||
;;
|
||||
unix )
|
||||
PLATFORM_UNIX=1
|
||||
;;
|
||||
* )
|
||||
AC_MSG_ERROR([Unknown platform: $BAKEFILE_FORCE_PLATFORM])
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
AC_SUBST(PLATFORM_UNIX)
|
||||
AC_SUBST(PLATFORM_WIN32)
|
||||
@@ -1158,7 +1358,7 @@ AC_DEFUN(AC_BAKEFILE_SUFFIXES,
|
||||
DLLPREFIX=lib
|
||||
DLLPREFIX_MODULE=
|
||||
|
||||
case "${host}" in
|
||||
case "${BAKEFILE_HOST}" in
|
||||
*-hp-hpux* )
|
||||
SO_SUFFIX="sl"
|
||||
SO_SUFFIX_MODULE="sl"
|
||||
@@ -1221,7 +1421,7 @@ AC_DEFUN(AC_BAKEFILE_SHARED_LD,
|
||||
PIC_FLAG="-fPIC"
|
||||
fi
|
||||
|
||||
case "${host}" in
|
||||
case "${BAKEFILE_HOST}" in
|
||||
*-hp-hpux* )
|
||||
dnl default settings are good for gcc but not for the native HP-UX
|
||||
if test "x$GCC" = "xyes"; then
|
||||
@@ -1444,7 +1644,7 @@ EOF
|
||||
;;
|
||||
|
||||
*)
|
||||
AC_MSG_ERROR(unknown system type $host.)
|
||||
AC_MSG_ERROR(unknown system type $BAKEFILE_HOST.)
|
||||
esac
|
||||
|
||||
if test "x$SHARED_LD_MODULE_CC" = "x" ; then
|
||||
@@ -1477,7 +1677,7 @@ AC_DEFUN(AC_BAKEFILE_SHARED_VERSIONS,
|
||||
USE_MACVERSION=0
|
||||
SONAME_FLAG=
|
||||
|
||||
case "${host}" in
|
||||
case "${BAKEFILE_HOST}" in
|
||||
*-*-linux* )
|
||||
SONAME_FLAG="-Wl,-soname,"
|
||||
USE_SOVERSION=1
|
||||
@@ -1522,7 +1722,7 @@ AC_DEFUN(AC_BAKEFILE_DEPS,
|
||||
if test "x$GCC" = "xyes"; then
|
||||
DEPSMODE=gcc
|
||||
DEPS_TRACKING=1
|
||||
case "${host}" in
|
||||
case "${BAKEFILE_HOST}" in
|
||||
powerpc-*-darwin* )
|
||||
dnl -cpp-precomp (the default) conflicts with -MMD option
|
||||
dnl used by bk-deps (see also http://developer.apple.com/documentation/Darwin/Conceptual/PortingUnix/compiling/chapter_4_section_3.html)
|
||||
@@ -1617,7 +1817,7 @@ AC_DEFUN(AC_BAKEFILE_CHECK_BASIC_STUFF,
|
||||
AC_CHECK_TOOL(STRIP, strip, :)
|
||||
AC_CHECK_TOOL(NM, nm, :)
|
||||
|
||||
case ${host} in
|
||||
case ${BAKEFILE_HOST} in
|
||||
*-hp-hpux* )
|
||||
INSTALL_DIR="mkdir"
|
||||
;;
|
||||
@@ -1627,7 +1827,7 @@ AC_DEFUN(AC_BAKEFILE_CHECK_BASIC_STUFF,
|
||||
AC_SUBST(INSTALL_DIR)
|
||||
|
||||
LDFLAGS_GUI=
|
||||
case ${host} in
|
||||
case ${BAKEFILE_HOST} in
|
||||
*-*-cygwin* | *-*-mingw32* )
|
||||
LDFLAGS_GUI="-Wl,--subsystem,windows -mwindows"
|
||||
esac
|
||||
@@ -1646,7 +1846,7 @@ AC_DEFUN(AC_BAKEFILE_RES_COMPILERS,
|
||||
RESCOMP=
|
||||
SETFILE=
|
||||
|
||||
case ${host} in
|
||||
case ${BAKEFILE_HOST} in
|
||||
*-*-cygwin* | *-*-mingw32* )
|
||||
dnl Check for win32 resources compiler:
|
||||
if test "$build" != "$host" ; then
|
||||
@@ -1767,10 +1967,21 @@ dnl ---------------------------------------------------------------------------
|
||||
dnl AC_BAKEFILE
|
||||
dnl
|
||||
dnl To be used in configure.in of any project using Bakefile-generated mks
|
||||
dnl
|
||||
dnl Behaviour can be modified by setting following variables:
|
||||
dnl BAKEFILE_CHECK_BASICS set to "no" if you don't want bakefile to
|
||||
dnl to perform check for basic tools like ranlib
|
||||
dnl BAKEFILE_HOST set this to override host detection, defaults
|
||||
dnl to ${host}
|
||||
dnl BAKEFILE_FORCE_PLATFORM set to override platform detection
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
AC_DEFUN(AC_BAKEFILE,
|
||||
[
|
||||
if test "x$BAKEFILE_HOST" = "x"; then
|
||||
BAKEFILE_HOST="${host}"
|
||||
fi
|
||||
|
||||
if test "x$BAKEFILE_CHECK_BASICS" != "xno"; then
|
||||
AC_BAKEFILE_CHECK_BASIC_STUFF
|
||||
fi
|
||||
|
||||
@@ -2,6 +2,9 @@ dnl This macro was generated by
|
||||
dnl Bakefile 0.1.2 (http://bakefile.sourceforge.net)
|
||||
dnl Do not modify, all changes will be overwritten!
|
||||
|
||||
|
||||
dnl Conditions:
|
||||
|
||||
dnl ### begin block 0_AC_BAKEFILE_PRECOMP_HEADERS ###
|
||||
AC_BAKEFILE_PRECOMP_HEADERS
|
||||
|
||||
@@ -25,6 +28,18 @@ dnl ### begin block 1_COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT ###
|
||||
COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT=""
|
||||
fi
|
||||
AC_SUBST(COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT)
|
||||
dnl ### begin block 1_COND_BUILD_DEBUG_UNICODE_0 ###
|
||||
COND_BUILD_DEBUG_UNICODE_0="#"
|
||||
if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then
|
||||
COND_BUILD_DEBUG_UNICODE_0=""
|
||||
fi
|
||||
AC_SUBST(COND_BUILD_DEBUG_UNICODE_0)
|
||||
dnl ### begin block 1_COND_BUILD_DEBUG_UNICODE_1 ###
|
||||
COND_BUILD_DEBUG_UNICODE_1="#"
|
||||
if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then
|
||||
COND_BUILD_DEBUG_UNICODE_1=""
|
||||
fi
|
||||
AC_SUBST(COND_BUILD_DEBUG_UNICODE_1)
|
||||
dnl ### begin block 1_COND_BUILD_RELEASE ###
|
||||
COND_BUILD_RELEASE="#"
|
||||
if test "x$BUILD" = "xrelease" ; then
|
||||
@@ -37,6 +52,18 @@ dnl ### begin block 1_COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT ###
|
||||
COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT=""
|
||||
fi
|
||||
AC_SUBST(COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT)
|
||||
dnl ### begin block 1_COND_BUILD_RELEASE_UNICODE_0 ###
|
||||
COND_BUILD_RELEASE_UNICODE_0="#"
|
||||
if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x0" ; then
|
||||
COND_BUILD_RELEASE_UNICODE_0=""
|
||||
fi
|
||||
AC_SUBST(COND_BUILD_RELEASE_UNICODE_0)
|
||||
dnl ### begin block 1_COND_BUILD_RELEASE_UNICODE_1 ###
|
||||
COND_BUILD_RELEASE_UNICODE_1="#"
|
||||
if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then
|
||||
COND_BUILD_RELEASE_UNICODE_1=""
|
||||
fi
|
||||
AC_SUBST(COND_BUILD_RELEASE_UNICODE_1)
|
||||
dnl ### begin block 1_COND_DEBUG_FLAG_1 ###
|
||||
COND_DEBUG_FLAG_1="#"
|
||||
if test "x$DEBUG_FLAG" = "x1" ; then
|
||||
@@ -247,6 +274,12 @@ dnl ### begin block 1_COND_PLATFORM_UNIX_1_USE_GUI_1 ###
|
||||
COND_PLATFORM_UNIX_1_USE_GUI_1=""
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_UNIX_1_USE_GUI_1)
|
||||
dnl ### begin block 1_COND_PLATFORM_UNIX_1_USE_PLUGINS_0 ###
|
||||
COND_PLATFORM_UNIX_1_USE_PLUGINS_0="#"
|
||||
if test "x$PLATFORM_UNIX" = "x1" -a "x$USE_PLUGINS" = "x0" ; then
|
||||
COND_PLATFORM_UNIX_1_USE_PLUGINS_0=""
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_UNIX_1_USE_PLUGINS_0)
|
||||
dnl ### begin block 1_COND_PLATFORM_WIN32_0 ###
|
||||
COND_PLATFORM_WIN32_0="#"
|
||||
if test "x$PLATFORM_WIN32" = "x0" ; then
|
||||
@@ -517,6 +550,12 @@ dnl ### begin block 1_COND_USE_ODBC_1 ###
|
||||
COND_USE_ODBC_1=""
|
||||
fi
|
||||
AC_SUBST(COND_USE_ODBC_1)
|
||||
dnl ### begin block 1_COND_USE_PLUGINS_0 ###
|
||||
COND_USE_PLUGINS_0="#"
|
||||
if test "x$USE_PLUGINS" = "x0" ; then
|
||||
COND_USE_PLUGINS_0=""
|
||||
fi
|
||||
AC_SUBST(COND_USE_PLUGINS_0)
|
||||
dnl ### begin block 1_COND_USE_SOSYMLINKS_1 ###
|
||||
COND_USE_SOSYMLINKS_1="#"
|
||||
if test "x$USE_SOSYMLINKS" = "x1" ; then
|
||||
@@ -541,6 +580,18 @@ dnl ### begin block 1_COND_USE_SOVERSOLARIS_1 ###
|
||||
COND_USE_SOVERSOLARIS_1=""
|
||||
fi
|
||||
AC_SUBST(COND_USE_SOVERSOLARIS_1)
|
||||
dnl ### begin block 1_COND_WITH_PLUGIN_SDL_1 ###
|
||||
COND_WITH_PLUGIN_SDL_1="#"
|
||||
if test "x$WITH_PLUGIN_SDL" = "x1" ; then
|
||||
COND_WITH_PLUGIN_SDL_1=""
|
||||
fi
|
||||
AC_SUBST(COND_WITH_PLUGIN_SDL_1)
|
||||
dnl ### begin block 1_COND_WITH_SDL_1 ###
|
||||
COND_WITH_SDL_1="#"
|
||||
if test "x$WITH_SDL" = "x1" ; then
|
||||
COND_WITH_SDL_1=""
|
||||
fi
|
||||
AC_SUBST(COND_WITH_SDL_1)
|
||||
dnl ### begin block 1_COND_WXUNIV_1 ###
|
||||
COND_WXUNIV_1="#"
|
||||
if test "x$WXUNIV" = "x1" ; then
|
||||
|
||||
218
configure.in
218
configure.in
@@ -397,6 +397,8 @@ if test $DEBUG_CONFIGURE = 1; then
|
||||
DEFAULT_wxUSE_LIBJPEG=no
|
||||
DEFAULT_wxUSE_LIBTIFF=no
|
||||
DEFAULT_wxUSE_LIBXPM=no
|
||||
DEFAULT_wxUSE_LIBMSPACK=no
|
||||
DEFAULT_wxUSE_LIBSDL=no
|
||||
DEFAULT_wxUSE_ODBC=no
|
||||
DEFAULT_wxUSE_OPENGL=no
|
||||
|
||||
@@ -537,6 +539,7 @@ if test $DEBUG_CONFIGURE = 1; then
|
||||
DEFAULT_wxUSE_ACCESSIBILITY=no
|
||||
|
||||
DEFAULT_wxUSE_MONOLITHIC=no
|
||||
DEFAULT_wxUSE_PLUGINS=no
|
||||
DEFAULT_wxUSE_OFFICIAL_BUILD=no
|
||||
else
|
||||
DEFAULT_wxUSE_UNIVERSAL=no
|
||||
@@ -578,6 +581,7 @@ else
|
||||
DEFAULT_wxUSE_LIBTIFF=yes
|
||||
DEFAULT_wxUSE_LIBXPM=yes
|
||||
DEFAULT_wxUSE_LIBMSPACK=yes
|
||||
DEFAULT_wxUSE_LIBSDL=no
|
||||
DEFAULT_wxUSE_ODBC=no
|
||||
DEFAULT_wxUSE_OPENGL=no
|
||||
|
||||
@@ -592,7 +596,7 @@ else
|
||||
DEFAULT_wxUSE_FFILE=yes
|
||||
DEFAULT_wxUSE_TEXTBUFFER=yes
|
||||
DEFAULT_wxUSE_TEXTFILE=yes
|
||||
DEFAULT_wxUSE_WAVE=no
|
||||
DEFAULT_wxUSE_WAVE=yes
|
||||
DEFAULT_wxUSE_INTL=yes
|
||||
DEFAULT_wxUSE_CONFIG=yes
|
||||
DEFAULT_wxUSE_FONTMAP=yes
|
||||
@@ -718,6 +722,7 @@ else
|
||||
DEFAULT_wxUSE_ACCESSIBILITY=no
|
||||
|
||||
DEFAULT_wxUSE_MONOLITHIC=no
|
||||
DEFAULT_wxUSE_PLUGINS=no
|
||||
DEFAULT_wxUSE_OFFICIAL_BUILD=no
|
||||
fi
|
||||
|
||||
@@ -749,7 +754,8 @@ dnl doing
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
WX_ARG_ENABLE(gui, [ --enable-gui use GUI classes], wxUSE_GUI)
|
||||
WX_ARG_ENABLE(monolithic, [ --disable-monolithic don't build wxWindows as single library], wxUSE_MONOLITHIC)
|
||||
WX_ARG_ENABLE(monolithic, [ --enable-monolithic build wxWindows as single library], wxUSE_MONOLITHIC)
|
||||
WX_ARG_ENABLE(plugins, [ --enable-plugins build parts of wxWindows as loadable components], wxUSE_PLUGINS)
|
||||
|
||||
if test "$wxUSE_GUI" = "yes"; then
|
||||
|
||||
@@ -773,6 +779,7 @@ WX_ARG_SYS_WITH(libjpeg, [ --with-libjpeg use libjpeg (JPEG file for
|
||||
WX_ARG_SYS_WITH(libtiff, [ --with-libtiff use libtiff (TIFF file format)], wxUSE_LIBTIFF)
|
||||
WX_ARG_SYS_WITH(libxpm, [ --with-libxpm use libxpm (XPM file format)], wxUSE_LIBXPM)
|
||||
WX_ARG_WITH(libmspack, [ --with-libmspack use libmspack (CHM help files loading)], wxUSE_LIBMSPACK)
|
||||
WX_ARG_WITH(sdl, [ --with-sdl use SDL for audio on Unix], wxUSE_LIBSDL)
|
||||
WX_ARG_WITH(opengl, [ --with-opengl use OpenGL (or Mesa)], wxUSE_OPENGL)
|
||||
|
||||
fi
|
||||
@@ -3338,6 +3345,7 @@ else
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl Checks for typedefs
|
||||
dnl ---------------------------------------------------------------------------
|
||||
@@ -4331,6 +4339,106 @@ if test "$wxUSE_UNIX" = "yes"; then
|
||||
AC_DEFINE(wxUSE_UNIX)
|
||||
fi
|
||||
|
||||
dnl ------------------------------------------------------------------------
|
||||
dnl DLL support
|
||||
dnl ------------------------------------------------------------------------
|
||||
|
||||
dnl under MSW we always have LoadLibrary/GetProcAddress
|
||||
if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
|
||||
|
||||
HAVE_DL_FUNCS=0
|
||||
HAVE_SHL_FUNCS=0
|
||||
if test "$wxUSE_DYNAMIC_LOADER" = "yes" -o "$wxUSE_DYNLIB_CLASS" = "yes" ; then
|
||||
if test "$USE_DARWIN" = 1; then
|
||||
dnl dlopen/dlerror is implemented in dynlib.cpp for Darwin/Mac OS X
|
||||
HAVE_DL_FUNCS=1
|
||||
else
|
||||
dnl the test is a bit complicated because we check for dlopen() both with
|
||||
dnl and without -ldl and we also try to find shl_load() if there is no
|
||||
dnl dlopen() on this system
|
||||
AC_CHECK_FUNCS(dlopen,
|
||||
[
|
||||
AC_DEFINE(HAVE_DLOPEN)
|
||||
HAVE_DL_FUNCS=1
|
||||
],
|
||||
[
|
||||
AC_CHECK_LIB(dl, dlopen,
|
||||
[
|
||||
AC_DEFINE(HAVE_DLOPEN)
|
||||
HAVE_DL_FUNCS=1
|
||||
DL_LINK=" -ldl$DL_LINK"
|
||||
],
|
||||
[
|
||||
AC_CHECK_FUNCS(shl_load,
|
||||
[
|
||||
AC_DEFINE(HAVE_SHL_LOAD)
|
||||
HAVE_SHL_FUNCS=1
|
||||
],
|
||||
[
|
||||
AC_CHECK_LIB(shl_load, dld,
|
||||
[
|
||||
HAVE_SHL_FUNCS=1
|
||||
DL_LINK=" -ldld$DL_LINK"
|
||||
])
|
||||
])
|
||||
])
|
||||
])
|
||||
|
||||
dnl check also for dlerror()
|
||||
if test "$HAVE_DL_FUNCS" = 1; then
|
||||
AC_CHECK_FUNCS(dlerror,
|
||||
AC_DEFINE(HAVE_DLERROR),
|
||||
[
|
||||
AC_CHECK_LIB(dl, dlerror, AC_DEFINE(HAVE_DLERROR))
|
||||
]
|
||||
)
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$HAVE_DL_FUNCS" = 0; then
|
||||
if test "$HAVE_SHL_FUNCS" = 0; then
|
||||
if test "$USE_UNIX" = 1; then
|
||||
AC_MSG_WARN([Missing dynamic loading support, several features will be disabled])
|
||||
wxUSE_DYNAMIC_LOADER=no
|
||||
wxUSE_DYNLIB_CLASS=no
|
||||
else
|
||||
AC_MSG_WARN([Assuming wxLibrary class works on this platform])
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DYNAMIC_LOADER" = "yes" ; then
|
||||
AC_DEFINE(wxUSE_DYNAMIC_LOADER)
|
||||
fi
|
||||
if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then
|
||||
AC_DEFINE(wxUSE_DYNLIB_CLASS)
|
||||
fi
|
||||
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl Verify consistency of plugins/monolithic/shared settings:
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
if test "$wxUSE_PLUGINS" = "yes" ; then
|
||||
if test "$wxUSE_SHARED" = "no" ; then
|
||||
AC_MSG_WARN([plugins supported only in shared build, disabling])
|
||||
wxUSE_PLUGINS=no
|
||||
fi
|
||||
if test "$wxUSE_MONOLITHIC" = "yes" ; then
|
||||
AC_MSG_WARN([plugins not supported monolithic build, disabling])
|
||||
wxUSE_PLUGINS=no
|
||||
fi
|
||||
if test "$wxUSE_DYNLIB_CLASS" = "no" ; then
|
||||
AC_MSG_WARN([plugins require wxDynamicLibrary, disabling])
|
||||
wxUSE_PLUGINS=no
|
||||
fi
|
||||
if test "$wxUSE_PLUGINS" = "yes" ; then
|
||||
AC_DEFINE(wxUSE_PLUGINS)
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl Register non-GUI class options for makefiles and setup.h
|
||||
dnl ---------------------------------------------------------------------------
|
||||
@@ -4347,8 +4455,29 @@ if test "$wxUSE_TIMER" = "yes"; then
|
||||
AC_DEFINE(wxUSE_TIMER)
|
||||
fi
|
||||
|
||||
WITH_PLUGIN_SDL=0
|
||||
if test "$wxUSE_WAVE" = "yes"; then
|
||||
dnl Unix implementation needs additional checks because audio support
|
||||
dnl comes in many favours:
|
||||
if test "$USE_UNIX" = "1" ; then
|
||||
AC_CHECK_HEADERS([sys/soundcard.h])
|
||||
|
||||
if test "$wxUSE_LIBSDL" != "no"; then
|
||||
AM_PATH_SDL([1.2.0],
|
||||
[
|
||||
EXTRALIBS_SDL="$SDL_LIBS"
|
||||
CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
|
||||
AC_DEFINE(wxUSE_LIBSDL)
|
||||
],
|
||||
[wxUSE_LIBSDL="no"])
|
||||
if test "$wxUSE_LIBSDL" = "yes" -a "$wxUSE_PLUGINS" = "yes" ; then
|
||||
WITH_PLUGIN_SDL=1
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_DEFINE(wxUSE_WAVE)
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sound"
|
||||
fi
|
||||
|
||||
if test "$wxUSE_CMDLINE_PARSER" = "yes"; then
|
||||
@@ -4784,82 +4913,7 @@ if test "$wxUSE_GUI" = "yes"; then
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl ------------------------------------------------------------------------
|
||||
dnl DLL support
|
||||
dnl ------------------------------------------------------------------------
|
||||
|
||||
dnl under MSW we always have LoadLibrary/GetProcAddress
|
||||
if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
|
||||
|
||||
HAVE_DL_FUNCS=0
|
||||
HAVE_SHL_FUNCS=0
|
||||
if test "$wxUSE_DYNAMIC_LOADER" = "yes" -o "$wxUSE_DYNLIB_CLASS" = "yes" ; then
|
||||
if test "$USE_DARWIN" = 1; then
|
||||
dnl dlopen/dlerror is implemented in dynlib.cpp for Darwin/Mac OS X
|
||||
HAVE_DL_FUNCS=1
|
||||
else
|
||||
dnl the test is a bit complicated because we check for dlopen() both with
|
||||
dnl and without -ldl and we also try to find shl_load() if there is no
|
||||
dnl dlopen() on this system
|
||||
AC_CHECK_FUNCS(dlopen,
|
||||
[
|
||||
AC_DEFINE(HAVE_DLOPEN)
|
||||
HAVE_DL_FUNCS=1
|
||||
],
|
||||
[
|
||||
AC_CHECK_LIB(dl, dlopen,
|
||||
[
|
||||
AC_DEFINE(HAVE_DLOPEN)
|
||||
HAVE_DL_FUNCS=1
|
||||
DL_LINK=" -ldl$DL_LINK"
|
||||
],
|
||||
[
|
||||
AC_CHECK_FUNCS(shl_load,
|
||||
[
|
||||
AC_DEFINE(HAVE_SHL_LOAD)
|
||||
HAVE_SHL_FUNCS=1
|
||||
],
|
||||
[
|
||||
AC_CHECK_LIB(shl_load, dld,
|
||||
[
|
||||
HAVE_SHL_FUNCS=1
|
||||
DL_LINK=" -ldld$DL_LINK"
|
||||
])
|
||||
])
|
||||
])
|
||||
])
|
||||
|
||||
dnl check also for dlerror()
|
||||
if test "$HAVE_DL_FUNCS" = 1; then
|
||||
AC_CHECK_FUNCS(dlerror,
|
||||
AC_DEFINE(HAVE_DLERROR),
|
||||
[
|
||||
AC_CHECK_LIB(dl, dlerror, AC_DEFINE(HAVE_DLERROR))
|
||||
]
|
||||
)
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$HAVE_DL_FUNCS" = 0; then
|
||||
if test "$HAVE_SHL_FUNCS" = 0; then
|
||||
if test "$USE_UNIX" = 1; then
|
||||
AC_MSG_WARN([Missing dynamic loading support, several features will be disabled])
|
||||
wxUSE_DYNAMIC_LOADER=no
|
||||
wxUSE_DYNLIB_CLASS=no
|
||||
else
|
||||
AC_MSG_WARN([Assuming wxLibrary class works on this platform])
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DYNAMIC_LOADER" = "yes" ; then
|
||||
AC_DEFINE(wxUSE_DYNAMIC_LOADER)
|
||||
fi
|
||||
if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then
|
||||
AC_DEFINE(wxUSE_DYNLIB_CLASS)
|
||||
fi
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl String stuff
|
||||
@@ -5750,6 +5804,12 @@ else
|
||||
MONOLITHIC=0
|
||||
fi
|
||||
|
||||
if test $wxUSE_PLUGINS = "yes" ; then
|
||||
USE_PLUGINS=1
|
||||
else
|
||||
USE_PLUGINS=0
|
||||
fi
|
||||
|
||||
if test $wxUSE_ODBC != "no" ; then
|
||||
USE_ODBC=1
|
||||
else
|
||||
@@ -5767,6 +5827,7 @@ AC_SUBST(OFFICIAL_BUILD)
|
||||
|
||||
AC_SUBST(WXUNIV)
|
||||
AC_SUBST(MONOLITHIC)
|
||||
AC_SUBST(USE_PLUGINS)
|
||||
AC_SUBST(LIBS)
|
||||
AC_SUBST(EXTRALIBS)
|
||||
AC_SUBST(EXTRALIBS_XML)
|
||||
@@ -5774,6 +5835,8 @@ AC_SUBST(EXTRALIBS_HTML)
|
||||
AC_SUBST(EXTRALIBS_ODBC)
|
||||
AC_SUBST(EXTRALIBS_GUI)
|
||||
AC_SUBST(EXTRALIBS_OPENGL)
|
||||
AC_SUBST(EXTRALIBS_SDL)
|
||||
AC_SUBST(WITH_PLUGIN_SDL)
|
||||
AC_SUBST(UNICODE)
|
||||
AC_SUBST(BUILD)
|
||||
AC_SUBST(DEBUG_INFO)
|
||||
@@ -6062,6 +6125,7 @@ echo " zlib ${wxUSE_ZLIB}"
|
||||
echo " odbc ${wxUSE_ODBC}"
|
||||
echo " expat ${wxUSE_EXPAT}"
|
||||
echo " libmspack ${wxUSE_LIBMSPACK}"
|
||||
echo " sdl ${wxUSE_LIBSDL}"
|
||||
|
||||
echo ""
|
||||
|
||||
|
||||
12
setup.h.in
12
setup.h.in
@@ -197,6 +197,10 @@
|
||||
* Use libtiff
|
||||
*/
|
||||
#define wxUSE_LIBTIFF 0
|
||||
/*
|
||||
* Use SDL for audio (Unix)
|
||||
*/
|
||||
#define wxUSE_LIBSDL 0
|
||||
/*
|
||||
* Use iODBC
|
||||
*/
|
||||
@@ -922,6 +926,11 @@
|
||||
*/
|
||||
#define wxUSE_ICO_CUR 0
|
||||
|
||||
/*
|
||||
* Set to 1 if for dynamically loadable plugins support
|
||||
*/
|
||||
#define wxUSE_PLUGINS 0
|
||||
|
||||
/*
|
||||
* Disable this if your compiler can't cope
|
||||
* with omission of prototype parameters.
|
||||
@@ -1167,6 +1176,9 @@
|
||||
/* Define if you have the <esd.h> header file. */
|
||||
#undef HAVE_ESD_H
|
||||
|
||||
/* Define if you have the <sys/soundcard.h> header file. */
|
||||
#undef HAVE_SYS_SOUNDCARD_H
|
||||
|
||||
/* Define if you have a CD-ROM interface known to mmedia. */
|
||||
#undef HAVE_KNOWN_CDROM_INTERFACE
|
||||
|
||||
|
||||
@@ -66,6 +66,7 @@ ldlibs_core="@EXTRALIBS_GUI@"
|
||||
ldlibs_xml="@EXTRALIBS_XML@"
|
||||
ldlibs_html="@EXTRALIBS_HTML@"
|
||||
ldlibs_odbc="@EXTRALIBS_ODBC@"
|
||||
ldlibs_adv="@EXTRALIBS_SDL@"
|
||||
|
||||
ldflags_gl="@LDFLAGS_GL@"
|
||||
ldlibs_gl="@OPENGL_LIBS@"
|
||||
|
||||
Reference in New Issue
Block a user