change MSW libs directories so that libraries are shared by builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -43,11 +43,10 @@ top_srcdir = @top_srcdir@
|
||||
|
||||
LIBDIRNAME = $(top_builddir)lib
|
||||
STCDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
-I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
|
||||
$(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
|
||||
-I$(srcdir)/../../include -I$(srcdir)/scintilla/include \
|
||||
-I$(srcdir)/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS -DWXUSINGDLL \
|
||||
-DWXMAKINGDLL_STC $(CXXFLAGS) $(PIC_FLAG)
|
||||
-I$(top_srcdir)/include -I$(srcdir)/../../include \
|
||||
-I$(srcdir)/scintilla/include -I$(srcdir)/scintilla/src -D__WX__ \
|
||||
-DSCI_LEXER -DLINK_LEXERS -DWXUSINGDLL -DWXMAKINGDLL_STC $(CXXFLAGS) \
|
||||
$(PIC_FLAG)
|
||||
STCDLL_OBJECTS = \
|
||||
stcdll_PlatWX.o \
|
||||
stcdll_ScintillaWX.o \
|
||||
@@ -99,10 +98,9 @@ STCDLL_OBJECTS = \
|
||||
stcdll_WindowAccessor.o \
|
||||
stcdll_XPM.o
|
||||
STCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
-I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
|
||||
$(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
|
||||
-I$(srcdir)/../../include -I$(srcdir)/scintilla/include \
|
||||
-I$(srcdir)/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS $(CXXFLAGS)
|
||||
-I$(top_srcdir)/include -I$(srcdir)/../../include \
|
||||
-I$(srcdir)/scintilla/include -I$(srcdir)/scintilla/src -D__WX__ \
|
||||
-DSCI_LEXER -DLINK_LEXERS $(CXXFLAGS)
|
||||
STCLIB_OBJECTS = \
|
||||
stclib_PlatWX.o \
|
||||
stclib_ScintillaWX.o \
|
||||
@@ -153,6 +151,7 @@ STCLIB_OBJECTS = \
|
||||
stclib_ViewStyle.o \
|
||||
stclib_WindowAccessor.o \
|
||||
stclib_XPM.o
|
||||
WX_VERSION = 2.5.0
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
@@ -174,13 +173,6 @@ STCLIB_OBJECTS = \
|
||||
@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
|
||||
@COND_UNICODE_1@WXUNICODEFLAG = u
|
||||
@COND_WXUNIV_1@WXUNIVNAME = univ
|
||||
@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p = -I$(top_srcdir)/src/expat/lib
|
||||
@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg
|
||||
@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc
|
||||
@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png
|
||||
@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex
|
||||
@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff
|
||||
@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib
|
||||
@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
|
||||
@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
|
||||
@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
|
||||
@@ -219,7 +211,8 @@ COND_PLATFORM_MACOSX_1___stcdll___macinstnamecmd = -install_name \
|
||||
$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2)
|
||||
@COND_PLATFORM_MACOSX_1@__stcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___stcdll___macinstnamecmd)
|
||||
@COND_PLATFORM_MACOSX_1@__stcdll___macver = \
|
||||
@COND_PLATFORM_MACOSX_1@ -compatibility_version 2.5 -current_version 2.5.0
|
||||
@COND_PLATFORM_MACOSX_1@ -compatibility_version $(WX_VERSION) \
|
||||
@COND_PLATFORM_MACOSX_1@ -current_version $(WX_VERSION)
|
||||
COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
|
||||
libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \
|
||||
$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \
|
||||
|
Reference in New Issue
Block a user