Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change MSW libs directories so that libraries are shared by builds

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-08-15 22:08:13 +00:00
parent 3df38e2077
commit 75a0a7b7de
756 changed files with 19931 additions and 21915 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
contrib/src/plot/Makefile.in
View File

@@ -43,18 +43,16 @@ top_srcdir = @top_srcdir@
LIBDIRNAME = $(top_builddir)lib
PLOTDLL_CXXFLAGS = $(__plotdll_PCH_INC) $(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 -DWXUSINGDLL \
-DWXMAKINGDLL_PLOT $(CXXFLAGS) $(PIC_FLAG)
$(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \
-DWXUSINGDLL -DWXMAKINGDLL_PLOT $(CXXFLAGS) $(PIC_FLAG)
PLOTDLL_OBJECTS = \
plotdll_plot.o
PLOTLIB_CXXFLAGS = $(__plotlib_PCH_INC) $(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 $(CXXFLAGS)
$(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \
$(CXXFLAGS)
PLOTLIB_OBJECTS = \
plotlib_plot.o
WX_VERSION = 2.5.0
### Conditionally set variables: ###
@@ -76,13 +74,6 @@ PLOTLIB_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 \
@@ -123,7 +114,8 @@ COND_PLATFORM_MACOSX_1___plotdll___macinstnamecmd = -install_name \
$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2)
@COND_PLATFORM_MACOSX_1@__plotdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___plotdll___macinstnamecmd)
@COND_PLATFORM_MACOSX_1@__plotdll___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___plotdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \
$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf2); \