Update for rpath with uninstalled builds and utility search.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
parent
14b0f0d506
commit
ffa0583fbf
153
Makefile.in
153
Makefile.in
@ -288,6 +288,7 @@ ALL_BASE_HEADERS = \
|
||||
wx/snglinst.h \
|
||||
wx/sstream.h \
|
||||
wx/stack.h \
|
||||
wx/stdpaths.h \
|
||||
wx/stockitem.h \
|
||||
wx/stopwatch.h \
|
||||
wx/strconv.h \
|
||||
@ -372,6 +373,7 @@ ALL_BASE_SOURCES = \
|
||||
src/common/object.cpp \
|
||||
src/common/process.cpp \
|
||||
src/common/regex.cpp \
|
||||
src/common/stdpbase.cpp \
|
||||
src/common/sstream.cpp \
|
||||
src/common/stopwatch.cpp \
|
||||
src/common/strconv.cpp \
|
||||
@ -394,6 +396,7 @@ ALL_BASE_SOURCES = \
|
||||
src/unix/dir.cpp \
|
||||
src/unix/mimetype.cpp \
|
||||
src/unix/snglinst.cpp \
|
||||
src/unix/stdpaths.cpp \
|
||||
src/unix/threadpsx.cpp \
|
||||
src/msw/basemsw.cpp \
|
||||
src/msw/crashrpt.cpp \
|
||||
@ -491,6 +494,7 @@ MONODLL_OBJECTS = \
|
||||
monodll_object.o \
|
||||
monodll_process.o \
|
||||
monodll_regex.o \
|
||||
monodll_stdpbase.o \
|
||||
monodll_sstream.o \
|
||||
monodll_stopwatch.o \
|
||||
monodll_strconv.o \
|
||||
@ -576,6 +580,7 @@ MONOLIB_OBJECTS = \
|
||||
monolib_object.o \
|
||||
monolib_process.o \
|
||||
monolib_regex.o \
|
||||
monolib_stdpbase.o \
|
||||
monolib_sstream.o \
|
||||
monolib_stopwatch.o \
|
||||
monolib_strconv.o \
|
||||
@ -662,6 +667,7 @@ BASEDLL_OBJECTS = \
|
||||
basedll_object.o \
|
||||
basedll_process.o \
|
||||
basedll_regex.o \
|
||||
basedll_stdpbase.o \
|
||||
basedll_sstream.o \
|
||||
basedll_stopwatch.o \
|
||||
basedll_strconv.o \
|
||||
@ -732,6 +738,7 @@ BASELIB_OBJECTS = \
|
||||
baselib_object.o \
|
||||
baselib_process.o \
|
||||
baselib_regex.o \
|
||||
baselib_stdpbase.o \
|
||||
baselib_sstream.o \
|
||||
baselib_stopwatch.o \
|
||||
baselib_strconv.o \
|
||||
@ -1173,7 +1180,8 @@ COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR = \
|
||||
wx/unix/apptrait.h \
|
||||
wx/unix/execute.h \
|
||||
wx/unix/mimetype.h \
|
||||
wx/unix/pipe.h
|
||||
wx/unix/pipe.h \
|
||||
wx/unix/stdpaths.h
|
||||
@COND_PLATFORM_UNIX_1@BASE_PLATFORM_HDR = $(COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR)
|
||||
COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR = \
|
||||
wx/msw/apptrait.h \
|
||||
@ -1193,7 +1201,8 @@ COND_TOOLKIT_COCOA_BASE_PLATFORM_HDR = \
|
||||
wx/unix/apptrait.h \
|
||||
wx/unix/execute.h \
|
||||
wx/unix/mimetype.h \
|
||||
wx/unix/pipe.h
|
||||
wx/unix/pipe.h \
|
||||
wx/unix/stdpaths.h
|
||||
@COND_TOOLKIT_COCOA@BASE_PLATFORM_HDR = $(COND_TOOLKIT_COCOA_BASE_PLATFORM_HDR)
|
||||
@COND_TOOLKIT_MAC@BASE_PLATFORM_HDR =
|
||||
@COND_PLATFORM_MACOSX_1@NET_PLATFORM_HDR = wx/unix/gsockunx.h
|
||||
@ -2393,6 +2402,7 @@ COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS = \
|
||||
monodll_dir.o \
|
||||
monodll_mimetype.o \
|
||||
monodll_snglinst.o \
|
||||
monodll_stdpaths.o \
|
||||
monodll_threadpsx.o
|
||||
@COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS)
|
||||
COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \
|
||||
@ -2415,6 +2425,7 @@ COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS = \
|
||||
monodll_dir.o \
|
||||
monodll_mimetype.o \
|
||||
monodll_snglinst.o \
|
||||
monodll_stdpaths.o \
|
||||
monodll_threadpsx.o
|
||||
@COND_TOOLKIT_@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS)
|
||||
COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS = \
|
||||
@ -2422,6 +2433,7 @@ COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS = \
|
||||
monodll_dir.o \
|
||||
monodll_mimetype.o \
|
||||
monodll_snglinst.o \
|
||||
monodll_stdpaths.o \
|
||||
monodll_threadpsx.o
|
||||
@COND_TOOLKIT_COCOA@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS)
|
||||
COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS = \
|
||||
@ -2429,6 +2441,7 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS = \
|
||||
monodll_dir.o \
|
||||
monodll_mimetype.o \
|
||||
monodll_snglinst.o \
|
||||
monodll_stdpaths.o \
|
||||
monodll_threadpsx.o
|
||||
@COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS)
|
||||
COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS = \
|
||||
@ -2445,6 +2458,7 @@ COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS = \
|
||||
monodll_dir.o \
|
||||
monodll_mimetype.o \
|
||||
monodll_snglinst.o \
|
||||
monodll_stdpaths.o \
|
||||
monodll_threadpsx.o
|
||||
@COND_TOOLKIT_MOTIF@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS)
|
||||
COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS = \
|
||||
@ -2452,6 +2466,7 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS = \
|
||||
monodll_dir.o \
|
||||
monodll_mimetype.o \
|
||||
monodll_snglinst.o \
|
||||
monodll_stdpaths.o \
|
||||
monodll_threadpsx.o
|
||||
@COND_TOOLKIT_X11@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS)
|
||||
@COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \
|
||||
@ -3336,6 +3351,7 @@ COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_1 = \
|
||||
monolib_dir.o \
|
||||
monolib_mimetype.o \
|
||||
monolib_snglinst.o \
|
||||
monolib_stdpaths.o \
|
||||
monolib_threadpsx.o
|
||||
@COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_1)
|
||||
COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \
|
||||
@ -3358,6 +3374,7 @@ COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS_1 = \
|
||||
monolib_dir.o \
|
||||
monolib_mimetype.o \
|
||||
monolib_snglinst.o \
|
||||
monolib_stdpaths.o \
|
||||
monolib_threadpsx.o
|
||||
@COND_TOOLKIT_@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS_1)
|
||||
COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_1 = \
|
||||
@ -3365,6 +3382,7 @@ COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_1 = \
|
||||
monolib_dir.o \
|
||||
monolib_mimetype.o \
|
||||
monolib_snglinst.o \
|
||||
monolib_stdpaths.o \
|
||||
monolib_threadpsx.o
|
||||
@COND_TOOLKIT_COCOA@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_1)
|
||||
COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_1 = \
|
||||
@ -3372,6 +3390,7 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_1 = \
|
||||
monolib_dir.o \
|
||||
monolib_mimetype.o \
|
||||
monolib_snglinst.o \
|
||||
monolib_stdpaths.o \
|
||||
monolib_threadpsx.o
|
||||
@COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_1)
|
||||
COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_1 = \
|
||||
@ -3388,6 +3407,7 @@ COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_1 = \
|
||||
monolib_dir.o \
|
||||
monolib_mimetype.o \
|
||||
monolib_snglinst.o \
|
||||
monolib_stdpaths.o \
|
||||
monolib_threadpsx.o
|
||||
@COND_TOOLKIT_MOTIF@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_1)
|
||||
COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_1 = \
|
||||
@ -3395,6 +3415,7 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_1 = \
|
||||
monolib_dir.o \
|
||||
monolib_mimetype.o \
|
||||
monolib_snglinst.o \
|
||||
monolib_stdpaths.o \
|
||||
monolib_threadpsx.o
|
||||
@COND_TOOLKIT_X11@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_1)
|
||||
@COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \
|
||||
@ -4314,6 +4335,7 @@ COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_2 = \
|
||||
basedll_dir.o \
|
||||
basedll_mimetype.o \
|
||||
basedll_snglinst.o \
|
||||
basedll_stdpaths.o \
|
||||
basedll_threadpsx.o
|
||||
@COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_2)
|
||||
COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 = \
|
||||
@ -4336,6 +4358,7 @@ COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS_2 = \
|
||||
basedll_dir.o \
|
||||
basedll_mimetype.o \
|
||||
basedll_snglinst.o \
|
||||
basedll_stdpaths.o \
|
||||
basedll_threadpsx.o
|
||||
@COND_TOOLKIT_@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS_2)
|
||||
COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_2 = \
|
||||
@ -4343,6 +4366,7 @@ COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_2 = \
|
||||
basedll_dir.o \
|
||||
basedll_mimetype.o \
|
||||
basedll_snglinst.o \
|
||||
basedll_stdpaths.o \
|
||||
basedll_threadpsx.o
|
||||
@COND_TOOLKIT_COCOA@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_2)
|
||||
COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_2 = \
|
||||
@ -4350,6 +4374,7 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_2 = \
|
||||
basedll_dir.o \
|
||||
basedll_mimetype.o \
|
||||
basedll_snglinst.o \
|
||||
basedll_stdpaths.o \
|
||||
basedll_threadpsx.o
|
||||
@COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_2)
|
||||
COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_2 = \
|
||||
@ -4366,6 +4391,7 @@ COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_2 = \
|
||||
basedll_dir.o \
|
||||
basedll_mimetype.o \
|
||||
basedll_snglinst.o \
|
||||
basedll_stdpaths.o \
|
||||
basedll_threadpsx.o
|
||||
@COND_TOOLKIT_MOTIF@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_2)
|
||||
COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_2 = \
|
||||
@ -4373,6 +4399,7 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_2 = \
|
||||
basedll_dir.o \
|
||||
basedll_mimetype.o \
|
||||
basedll_snglinst.o \
|
||||
basedll_stdpaths.o \
|
||||
basedll_threadpsx.o
|
||||
@COND_TOOLKIT_X11@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_2)
|
||||
@COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 \
|
||||
@ -4404,6 +4431,7 @@ COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_3 = \
|
||||
baselib_dir.o \
|
||||
baselib_mimetype.o \
|
||||
baselib_snglinst.o \
|
||||
baselib_stdpaths.o \
|
||||
baselib_threadpsx.o
|
||||
@COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_3)
|
||||
COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 = \
|
||||
@ -4426,6 +4454,7 @@ COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS_3 = \
|
||||
baselib_dir.o \
|
||||
baselib_mimetype.o \
|
||||
baselib_snglinst.o \
|
||||
baselib_stdpaths.o \
|
||||
baselib_threadpsx.o
|
||||
@COND_TOOLKIT_@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS_3)
|
||||
COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_3 = \
|
||||
@ -4433,6 +4462,7 @@ COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_3 = \
|
||||
baselib_dir.o \
|
||||
baselib_mimetype.o \
|
||||
baselib_snglinst.o \
|
||||
baselib_stdpaths.o \
|
||||
baselib_threadpsx.o
|
||||
@COND_TOOLKIT_COCOA@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_3)
|
||||
COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_3 = \
|
||||
@ -4440,6 +4470,7 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_3 = \
|
||||
baselib_dir.o \
|
||||
baselib_mimetype.o \
|
||||
baselib_snglinst.o \
|
||||
baselib_stdpaths.o \
|
||||
baselib_threadpsx.o
|
||||
@COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_3)
|
||||
COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_3 = \
|
||||
@ -4456,6 +4487,7 @@ COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_3 = \
|
||||
baselib_dir.o \
|
||||
baselib_mimetype.o \
|
||||
baselib_snglinst.o \
|
||||
baselib_stdpaths.o \
|
||||
baselib_threadpsx.o
|
||||
@COND_TOOLKIT_MOTIF@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_3)
|
||||
COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_3 = \
|
||||
@ -4463,6 +4495,7 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_3 = \
|
||||
baselib_dir.o \
|
||||
baselib_mimetype.o \
|
||||
baselib_snglinst.o \
|
||||
baselib_stdpaths.o \
|
||||
baselib_threadpsx.o
|
||||
@COND_TOOLKIT_X11@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_3)
|
||||
@COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 \
|
||||
@ -6645,6 +6678,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \
|
||||
monodll_region.o \
|
||||
monodll_renderer.o \
|
||||
monodll_settings.o \
|
||||
monodll_stdpaths.o \
|
||||
monodll_timer.o \
|
||||
monodll_tooltip.o \
|
||||
monodll_toplevel.o \
|
||||
@ -6696,6 +6730,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS = \
|
||||
monodll_region.o \
|
||||
monodll_renderer.o \
|
||||
monodll_settings.o \
|
||||
monodll_stdpaths.o \
|
||||
monodll_timer.o \
|
||||
monodll_tooltip.o \
|
||||
monodll_toplevel.o \
|
||||
@ -6865,6 +6900,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_0 = \
|
||||
monolib_region.o \
|
||||
monolib_renderer.o \
|
||||
monolib_settings.o \
|
||||
monolib_stdpaths.o \
|
||||
monolib_timer.o \
|
||||
monolib_tooltip.o \
|
||||
monolib_toplevel.o \
|
||||
@ -6916,6 +6952,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_0 = \
|
||||
monolib_region.o \
|
||||
monolib_renderer.o \
|
||||
monolib_settings.o \
|
||||
monolib_stdpaths.o \
|
||||
monolib_timer.o \
|
||||
monolib_tooltip.o \
|
||||
monolib_toplevel.o \
|
||||
@ -7085,6 +7122,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8 = \
|
||||
coredll_region.o \
|
||||
coredll_renderer.o \
|
||||
coredll_settings.o \
|
||||
coredll_stdpaths.o \
|
||||
coredll_timer.o \
|
||||
coredll_tooltip.o \
|
||||
coredll_toplevel.o \
|
||||
@ -7136,6 +7174,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_8 = \
|
||||
coredll_region.o \
|
||||
coredll_renderer.o \
|
||||
coredll_settings.o \
|
||||
coredll_stdpaths.o \
|
||||
coredll_timer.o \
|
||||
coredll_tooltip.o \
|
||||
coredll_toplevel.o \
|
||||
@ -7305,6 +7344,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9 = \
|
||||
corelib_region.o \
|
||||
corelib_renderer.o \
|
||||
corelib_settings.o \
|
||||
corelib_stdpaths.o \
|
||||
corelib_timer.o \
|
||||
corelib_tooltip.o \
|
||||
corelib_toplevel.o \
|
||||
@ -7356,6 +7396,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_9 = \
|
||||
corelib_region.o \
|
||||
corelib_renderer.o \
|
||||
corelib_settings.o \
|
||||
corelib_stdpaths.o \
|
||||
corelib_timer.o \
|
||||
corelib_tooltip.o \
|
||||
corelib_toplevel.o \
|
||||
@ -8462,6 +8503,9 @@ monodll_process.o: $(srcdir)/src/common/process.cpp $(MONODLL_ODEP)
|
||||
monodll_regex.o: $(srcdir)/src/common/regex.cpp $(MONODLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
monodll_stdpbase.o: $(srcdir)/src/common/stdpbase.cpp $(MONODLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
monodll_sstream.o: $(srcdir)/src/common/sstream.cpp $(MONODLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
@ -9092,6 +9136,30 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
|
||||
@COND_PLATFORM_WIN32_1@monodll_snglinst.o: $(srcdir)/src/msw/snglinst.cpp $(MONODLL_ODEP)
|
||||
@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
@COND_PLATFORM_UNIX_1@monodll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONODLL_ODEP)
|
||||
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@monodll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONODLL_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monodll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONODLL_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@monodll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONODLL_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@monodll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONODLL_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_@monodll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONODLL_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_MSW_USE_GUI_1@monodll_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(MONODLL_ODEP)
|
||||
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(MONODLL_ODEP)
|
||||
@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
@COND_PLATFORM_UNIX_1@monodll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(MONODLL_ODEP)
|
||||
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
|
||||
|
||||
@ -11636,6 +11704,9 @@ monolib_process.o: $(srcdir)/src/common/process.cpp $(MONOLIB_ODEP)
|
||||
monolib_regex.o: $(srcdir)/src/common/regex.cpp $(MONOLIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
monolib_stdpbase.o: $(srcdir)/src/common/stdpbase.cpp $(MONOLIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
monolib_sstream.o: $(srcdir)/src/common/sstream.cpp $(MONOLIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
@ -12266,6 +12337,30 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
|
||||
@COND_PLATFORM_WIN32_1@monolib_snglinst.o: $(srcdir)/src/msw/snglinst.cpp $(MONOLIB_ODEP)
|
||||
@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
@COND_PLATFORM_UNIX_1@monolib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONOLIB_ODEP)
|
||||
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@monolib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONOLIB_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monolib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONOLIB_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@monolib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONOLIB_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@monolib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONOLIB_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_@monolib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONOLIB_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_MSW_USE_GUI_1@monolib_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(MONOLIB_ODEP)
|
||||
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(MONOLIB_ODEP)
|
||||
@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
@COND_PLATFORM_UNIX_1@monolib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(MONOLIB_ODEP)
|
||||
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
|
||||
|
||||
@ -14810,6 +14905,9 @@ basedll_process.o: $(srcdir)/src/common/process.cpp $(BASEDLL_ODEP)
|
||||
basedll_regex.o: $(srcdir)/src/common/regex.cpp $(BASEDLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
|
||||
|
||||
basedll_stdpbase.o: $(srcdir)/src/common/stdpbase.cpp $(BASEDLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
|
||||
|
||||
basedll_sstream.o: $(srcdir)/src/common/sstream.cpp $(BASEDLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
|
||||
|
||||
@ -15008,6 +15106,24 @@ basedll_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASEDLL_ODEP)
|
||||
@COND_PLATFORM_WIN32_1@basedll_snglinst.o: $(srcdir)/src/msw/snglinst.cpp $(BASEDLL_ODEP)
|
||||
@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
|
||||
|
||||
@COND_PLATFORM_UNIX_1@basedll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASEDLL_ODEP)
|
||||
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@basedll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASEDLL_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@basedll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASEDLL_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@basedll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASEDLL_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@basedll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASEDLL_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_@basedll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASEDLL_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
|
||||
|
||||
@COND_PLATFORM_UNIX_1@basedll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(BASEDLL_ODEP)
|
||||
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
|
||||
|
||||
@ -15164,6 +15280,9 @@ baselib_process.o: $(srcdir)/src/common/process.cpp $(BASELIB_ODEP)
|
||||
baselib_regex.o: $(srcdir)/src/common/regex.cpp $(BASELIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
|
||||
|
||||
baselib_stdpbase.o: $(srcdir)/src/common/stdpbase.cpp $(BASELIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
|
||||
|
||||
baselib_sstream.o: $(srcdir)/src/common/sstream.cpp $(BASELIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
|
||||
|
||||
@ -15362,6 +15481,24 @@ baselib_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASELIB_ODEP)
|
||||
@COND_PLATFORM_WIN32_1@baselib_snglinst.o: $(srcdir)/src/msw/snglinst.cpp $(BASELIB_ODEP)
|
||||
@COND_PLATFORM_WIN32_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
|
||||
|
||||
@COND_PLATFORM_UNIX_1@baselib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASELIB_ODEP)
|
||||
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@baselib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASELIB_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@baselib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASELIB_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@baselib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASELIB_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@baselib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASELIB_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_@baselib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASELIB_ODEP)
|
||||
@COND_PLATFORM_MACOSX_1_TOOLKIT_@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
|
||||
|
||||
@COND_PLATFORM_UNIX_1@baselib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(BASELIB_ODEP)
|
||||
@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
|
||||
|
||||
@ -16643,6 +16780,12 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
|
||||
@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_printwin.o: $(srcdir)/src/msw/printwin.cpp $(COREDLL_ODEP)
|
||||
@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_MSW_USE_GUI_1@coredll_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(COREDLL_ODEP)
|
||||
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(COREDLL_ODEP)
|
||||
@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_MSW_USE_GUI_1@coredll_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(COREDLL_ODEP)
|
||||
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
|
||||
|
||||
@ -19121,6 +19264,12 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
|
||||
@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_printwin.o: $(srcdir)/src/msw/printwin.cpp $(CORELIB_ODEP)
|
||||
@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_MSW_USE_GUI_1@corelib_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(CORELIB_ODEP)
|
||||
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(CORELIB_ODEP)
|
||||
@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
|
||||
|
||||
@COND_TOOLKIT_MSW_USE_GUI_1@corelib_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(CORELIB_ODEP)
|
||||
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
|
||||
|
||||
|
||||
37
configure.in
37
configure.in
@ -372,6 +372,7 @@ if test $DEBUG_CONFIGURE = 1; then
|
||||
DEFAULT_wxUSE_NO_DEPS=no
|
||||
DEFAULT_wxUSE_NO_RTTI=no
|
||||
DEFAULT_wxUSE_NO_EXCEPTIONS=no
|
||||
DEFAULT_wxUSE_RPATH=yes
|
||||
DEFAULT_wxUSE_PERMISSIVE=no
|
||||
DEFAULT_wxUSE_DEBUG_FLAG=yes
|
||||
DEFAULT_wxUSE_DEBUG_INFO=yes
|
||||
@ -559,6 +560,7 @@ else
|
||||
DEFAULT_wxUSE_NO_DEPS=no
|
||||
DEFAULT_wxUSE_NO_RTTI=no
|
||||
DEFAULT_wxUSE_NO_EXCEPTIONS=no
|
||||
DEFAULT_wxUSE_RPATH=yes
|
||||
DEFAULT_wxUSE_PERMISSIVE=no
|
||||
DEFAULT_wxUSE_DEBUG_FLAG=no
|
||||
DEFAULT_wxUSE_DEBUG_INFO=no
|
||||
@ -838,11 +840,7 @@ WX_ARG_ENABLE(no_deps, [ --enable-no_deps create code without depe
|
||||
WX_ARG_ENABLE(compat22, [ --enable-compat22 enable wxWidgets 2.2 compatibility], WXWIN_COMPATIBILITY_2_2)
|
||||
WX_ARG_ENABLE(compat24, [ --disable-compat24 disable wxWidgets 2.4 compatibility], WXWIN_COMPATIBILITY_2_4, disable)
|
||||
|
||||
AC_ARG_ENABLE(rpath, [ --enable-rpath=DIR output the rpath flag from wx-config], [wxRPATH_DIR="$enableval"])
|
||||
|
||||
if test "$wxRPATH_DIR" != "" -a "$wxRPATH_DIR" != "disable" -a "$wxRPATH_DIR" != "no"; then
|
||||
WXCONFIG_RPATH="-Wl,-rpath -Wl,$wxRPATH_DIR"
|
||||
fi
|
||||
WX_ARG_ENABLE(rpath, [ --disable-rpath disable use of rpath for uninstalled builds], wxUSE_RPATH)
|
||||
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
@ -3286,6 +3284,7 @@ if test "$wxUSE_SHARED" = "yes"; then
|
||||
case "${host}" in
|
||||
*-*-linux* | *-*-gnu* )
|
||||
SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib"
|
||||
WXCONFIG_RPATH="-Wl,-rpath,\$libdir"
|
||||
;;
|
||||
|
||||
*-*-solaris2* )
|
||||
@ -3304,23 +3303,25 @@ if test "$wxUSE_SHARED" = "yes"; then
|
||||
[
|
||||
AC_MSG_RESULT([yes])
|
||||
SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib"
|
||||
],
|
||||
[
|
||||
WXCONFIG_RPATH="-Wl,-rpath,\$libdir"
|
||||
],[
|
||||
AC_MSG_RESULT([no])
|
||||
AC_MSG_CHECKING([if the linker accepts -R])
|
||||
LDFLAGS="$saveLdflags -Wl,-R,/"
|
||||
AC_TRY_LINK(
|
||||
[],[],
|
||||
[
|
||||
AC_MSG_RESULT([yes])
|
||||
SAMPLES_RPATH_FLAG="-Wl,-R,\$(top_builddir)lib"],
|
||||
[
|
||||
AC_MSG_RESULT([yes])
|
||||
SAMPLES_RPATH_FLAG="-Wl,-R,\$(top_builddir)lib"
|
||||
WXCONFIG_RPATH="-Wl,-R,\$libdir"
|
||||
],[
|
||||
AC_MSG_RESULT([no])
|
||||
])
|
||||
])
|
||||
LDFLAGS="$saveLdflags"
|
||||
else
|
||||
SAMPLES_RPATH_FLAG="-R\$(top_builddir)lib"
|
||||
WXCONFIG_RPATH="-R\$libdir"
|
||||
fi
|
||||
;;
|
||||
|
||||
@ -3343,14 +3344,20 @@ EOF
|
||||
;;
|
||||
|
||||
esac
|
||||
fi
|
||||
|
||||
dnl do not 'else' this, it may be changed in the above conditional.
|
||||
if test "$wxUSE_SHARED" = "no"; then
|
||||
if test $wxUSE_RPATH = "no"; then
|
||||
SAMPLES_RPATH_FLAG=''
|
||||
SAMPLES_RPATH_POSTLINK=''
|
||||
WXCONFIG_RPATH=''
|
||||
fi
|
||||
|
||||
SHARED=1
|
||||
|
||||
else
|
||||
|
||||
config_linkage_component="-static"
|
||||
SHARED=0
|
||||
else
|
||||
SHARED=1
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
82
wx-config.in
82
wx-config.in
@ -122,7 +122,7 @@ wxconfig_input_options="prefix exec_prefix utility $wxconfig_schema"
|
||||
wxconfig_yesno_options="universal unicode debug static"
|
||||
|
||||
# Boolean options that do something or not.
|
||||
wxconfig_flag_options="$wxconfig_yesno_options inplace"
|
||||
wxconfig_flag_options="$wxconfig_yesno_options no_rpath inplace"
|
||||
|
||||
|
||||
|
||||
@ -340,7 +340,7 @@ this_chartype="@WX_CHARTYPE@"
|
||||
this_debugtype="@WX_DEBUGTYPE@"
|
||||
this_flavour="@WX_FLAVOUR@"
|
||||
this_version="@WX_RELEASE@"
|
||||
this_linkage=$( [ @SHARED@ -eq 1 ] || echo '-static' )
|
||||
this_linkage=$( [ "x@SHARED@" = "x1" ] || echo '-static' )
|
||||
|
||||
this_config=$(get_mask this)
|
||||
|
||||
@ -841,6 +841,7 @@ exec_prefix=${this_exec_prefix-$exec_prefix}
|
||||
|
||||
includedir="@includedir@"
|
||||
libdir="@libdir@"
|
||||
bindir="@bindir@"
|
||||
|
||||
# Trivial queries we can answer now.
|
||||
[ -z "$output_option_prefix" ] || echo $prefix
|
||||
@ -853,16 +854,65 @@ libdir="@libdir@"
|
||||
[ -z "$output_option_cc" ] || echo "@CC@"
|
||||
[ -z "$output_option_cxx" ] || echo "@CXX@"
|
||||
[ -z "$output_option_ld" ] || echo "@EXE_LINKER@"
|
||||
[ -z "$input_option_utility" ] || echo "${input_option_utility}-@WX_RELEASE@@WX_FLAVOUR@"
|
||||
|
||||
|
||||
# The rest are going to need a little more work.
|
||||
# --------------------------------------------------------------
|
||||
|
||||
is_cross() { [ "x@cross_compiling@" = "xyes" ]; }
|
||||
is_monolithic() { [ @MONOLITHIC@ -eq 1 ]; }
|
||||
is_monolithic() { [ "x@MONOLITHIC@" = "x1" ]; }
|
||||
is_static() { [ -n "$this_linkage" ]; }
|
||||
is_installed() { [ -z "$this_prefix" ]; }
|
||||
|
||||
|
||||
# Is the user after a support utility?
|
||||
# If this is a cross build, we need to find and return a suitable
|
||||
# native utility for the job, so we search:
|
||||
#
|
||||
# 1. local build dir (for native uninstalled builds only).
|
||||
# 2. (optional) user supplied prefix.
|
||||
# 3. configured install prefix.
|
||||
# 4. environment $PATH.
|
||||
#
|
||||
# and if such a thing still cannot be found, exit signalling an error.
|
||||
if [ -n "$input_option_utility" ]; then
|
||||
|
||||
# This is dumb, in tree binaries should be in a standard location
|
||||
# like the libs, but work with what we've got for now.
|
||||
is_cross || _util="$exec_prefix/utils/$input_option_utility/$input_option_utility"
|
||||
|
||||
if ! is_installed && [ -x "$_util" ]; then
|
||||
is_static || _preload="eval LD_LIBRARY_PATH=$exec_prefix/lib"
|
||||
echo $_preload $_util
|
||||
exit
|
||||
fi
|
||||
|
||||
IFS=':'
|
||||
_user_prefix=${input_option_exec_prefix:-$input_option_prefix}
|
||||
|
||||
for _util in "${input_option_utility}-@WX_RELEASE@@WX_FLAVOUR@" \
|
||||
"${input_option_utility}-@WX_RELEASE@" \
|
||||
"${input_option_utility}";
|
||||
do
|
||||
for p in ${_user_prefix:+$_user_prefix/bin} $bindir $PATH; do
|
||||
|
||||
[ -z "$WXDEBUG" ] || decho " checking for: '$p/$_util'"
|
||||
|
||||
if [ -x "$p/$_util" ]; then
|
||||
echo "$p/$_util"
|
||||
exit
|
||||
fi
|
||||
|
||||
done
|
||||
done
|
||||
exit 1
|
||||
|
||||
fi
|
||||
|
||||
|
||||
# Still here? Then get the options together for building an app.
|
||||
# ----------------------------------------------------------------
|
||||
|
||||
# Additional configuration for individual library components.
|
||||
ldflags_gl="@LDFLAGS_GL@"
|
||||
|
||||
@ -874,6 +924,7 @@ ldlibs_xml="@EXTRALIBS_XML@"
|
||||
ldlibs_odbc="@EXTRALIBS_ODBC@"
|
||||
ldlibs_adv="@EXTRALIBS_SDL@"
|
||||
|
||||
|
||||
# lib_flags_for _liblist
|
||||
# This function returns a list of flags suitable to return with the
|
||||
# output of --libs for all of the libraries in _liblist. You can
|
||||
@ -919,7 +970,7 @@ lib_flags_for()
|
||||
[ $lib = base ] || _libname="${_libname}_$lib"
|
||||
_libname="${_libname}-@WX_RELEASE@$_target"
|
||||
|
||||
if [ "x$this_linkage" = "x-static" ]; then
|
||||
if is_static; then
|
||||
_wxlibs="$_wxlibs ${libdir}/lib${_libname}.a"
|
||||
for f in $(eval echo \"\$ldlibs_$lib\"); do
|
||||
_all_libs="$(remove_field $f $_all_libs) $f"
|
||||
@ -980,10 +1031,10 @@ if is_monolithic; then
|
||||
wx_libs=$(remove_field $i $wx_libs)
|
||||
done
|
||||
|
||||
wx_libs="@WXCONFIG_LDFLAGS_GUI@ @WXCONFIG_RPATH@ $(lib_flags_for $wx_libs)"
|
||||
wx_libs="@WXCONFIG_LDFLAGS_GUI@ $(lib_flags_for $wx_libs)"
|
||||
|
||||
# We still need the core lib deps for a static build though
|
||||
if [ "x$this_linkage" = "x-static" ]; then
|
||||
if is_static; then
|
||||
link_deps="${libdir}/libwx_@TOOLCHAIN_NAME@.a"
|
||||
wx_libs="$wx_libs $link_deps $ldlibs_core @LIBS@"
|
||||
else
|
||||
@ -1018,10 +1069,10 @@ else # MONOLITHIC = 0
|
||||
match_field "$i" @CORE_BASE_LIBS@ || using_gui=yes
|
||||
done
|
||||
|
||||
if [ "x$this_linkage" = "x-static" ]; then
|
||||
if is_static; then
|
||||
link_deps=$(link_deps_for $wx_libs)
|
||||
fi
|
||||
wx_libs="$_guildflags @WXCONFIG_RPATH@ $(lib_flags_for $wx_libs)"
|
||||
wx_libs="$_guildflags $(lib_flags_for $wx_libs)"
|
||||
fi
|
||||
|
||||
|
||||
@ -1036,16 +1087,15 @@ fi
|
||||
# Endgame. Nothing left to discover now.
|
||||
# --------------------------------------------------------------
|
||||
|
||||
[ -n "$this_linkage" ] || _static_cppflags="@TOOLCHAIN_DLL_DEFS@"
|
||||
[ "$using_gui" = "yes" ] || _gui_cppflags="-DwxUSE_GUI=0"
|
||||
|
||||
if [ -n "$this_prefix" ]; then
|
||||
_include_cppflags="-I${includedir} -I${prefix}/contrib/include"
|
||||
else
|
||||
if is_installed; then
|
||||
_include_cppflags="-I${includedir}/wx-@WX_RELEASE@@WX_FLAVOUR@"
|
||||
else
|
||||
_include_cppflags="-I${includedir} -I${prefix}/contrib/include"
|
||||
fi
|
||||
|
||||
_cppflags=$(echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" $_static_cppflags $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@")
|
||||
_cppflags=$(echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" "@TOOLCHAIN_DLL_DEFS@" $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@")
|
||||
|
||||
# now without further ado, we can answer these too.
|
||||
[ -z "$output_option_cppflags" ] || echo $_cppflags
|
||||
@ -1060,7 +1110,9 @@ if [ -n "$output_option_libs" ]; then
|
||||
|| [ "x$libdir" = "x/usr/lib" ] \
|
||||
|| _ldflags="-L$libdir"
|
||||
|
||||
echo $_ldflags "@LDFLAGS@" $wx_libs "@DMALLOC_LIBS@"
|
||||
is_installed || [ -n "$flag_option_no_rpath" ] || _rpath="@WXCONFIG_RPATH@"
|
||||
|
||||
echo $_ldflags "@LDFLAGS@" $_rpath $wx_libs "@DMALLOC_LIBS@"
|
||||
fi
|
||||
|
||||
# And so that's it, we're done. Have a nice build.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user