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:
@@ -12,21 +12,17 @@
|
||||
|
||||
### Variables: ###
|
||||
|
||||
LIBDIRNAME = \
|
||||
..\..\src\svg\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
OBJS = \
|
||||
vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
SETUPHDIR = \
|
||||
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
|
||||
SVGDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \
|
||||
$(__DEBUGINFO_2) \
|
||||
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_vc$(VENDORTAG).pdb \
|
||||
$(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
|
||||
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\svg\..\..\..\include \
|
||||
/I$(LIBDIRNAME) /I..\..\src\svg\..\..\..\src\tiff \
|
||||
/I..\..\src\svg\..\..\..\src\jpeg /I..\..\src\svg\..\..\..\src\png \
|
||||
/I..\..\src\svg\..\..\..\src\zlib /I..\..\src\svg\..\..\..\src\regex \
|
||||
/I..\..\src\svg\..\..\..\src\expat\lib /I..\..\src\svg\..\..\include \
|
||||
/DWXUSINGDLL /DWXMAKINGDLL_SVG $(CXXFLAGS) /Yu"wx/wxprec.h" \
|
||||
/Fp"$(OBJS)\wxprec_svgdll.pch"
|
||||
/I$(SETUPHDIR) /I..\..\src\svg\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_SVG \
|
||||
$(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_svgdll.pch"
|
||||
SVGDLL_OBJECTS = \
|
||||
$(OBJS)\svgdll_dummy.obj \
|
||||
$(OBJS)\svgdll_dcsvg.obj
|
||||
@@ -35,17 +31,20 @@ SVGLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_12) /DWIN32 \
|
||||
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.pdb \
|
||||
$(____DEBUGRUNTIME_11_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
|
||||
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\svg\..\..\..\include \
|
||||
/I$(LIBDIRNAME) /I..\..\src\svg\..\..\..\src\tiff \
|
||||
/I..\..\src\svg\..\..\..\src\jpeg /I..\..\src\svg\..\..\..\src\png \
|
||||
/I..\..\src\svg\..\..\..\src\zlib /I..\..\src\svg\..\..\..\src\regex \
|
||||
/I..\..\src\svg\..\..\..\src\expat\lib /I..\..\src\svg\..\..\include \
|
||||
$(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_svglib.pch"
|
||||
/I$(SETUPHDIR) /I..\..\src\svg\..\..\include $(CXXFLAGS) /Yu"wx/wxprec.h" \
|
||||
/Fp"$(OBJS)\wxprec_svglib.pch"
|
||||
SVGLIB_OBJECTS = \
|
||||
$(OBJS)\svglib_dummy.obj \
|
||||
$(OBJS)\svglib_dcsvg.obj
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
!if "$(SHARED)" == "0"
|
||||
LIBDIRNAME = ..\..\src\svg\..\..\..\lib\vc_lib$(CFG)
|
||||
!endif
|
||||
!if "$(SHARED)" == "1"
|
||||
LIBDIRNAME = ..\..\src\svg\..\..\..\lib\vc_dll$(CFG)
|
||||
!endif
|
||||
!if "$(USE_GUI)" == "0"
|
||||
PORTNAME = base
|
||||
!endif
|
||||
@@ -242,14 +241,14 @@ clean:
|
||||
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib
|
||||
|
||||
!if "$(SHARED)" == "1"
|
||||
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_vc$(VENDORTAG).dll: $(SVGDLL_OBJECTS) $(OBJS)\svgdll_dummy.obj
|
||||
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_vc$(VENDORTAG).dll: $(OBJS)\svgdll_dummy.obj $(SVGDLL_OBJECTS)
|
||||
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) @<<
|
||||
$(SVGDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib
|
||||
<<
|
||||
!endif
|
||||
|
||||
!if "$(SHARED)" == "0"
|
||||
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib: $(SVGLIB_OBJECTS) $(OBJS)\svglib_dummy.obj
|
||||
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib: $(OBJS)\svglib_dummy.obj $(SVGLIB_OBJECTS)
|
||||
if exist $@ del $@
|
||||
lib /NOLOGO /OUT:$@ @<<
|
||||
$(SVGLIB_OBJECTS)
|
||||
|
Reference in New Issue
Block a user