Cleaned up some comments, reorganized some code

[wxWidgets.git] / contrib / build / svg / makefile.vc

diff --git a/contrib/build/svg/makefile.vc b/contrib/build/svg/makefile.vc
index 4b98f495f96f12774ae03e9c7eb536dd8637663f..ded3c40777d2ab0e677246d42dda1e4a81261a5c 100644 (file)
--- a/contrib/build/svg/makefile.vc
+++ b/contrib/build/svg/makefile.vc
@@ -4,7 +4,7 @@
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
-!include <../../../build/config.vc>
+!include <../../../build/msw/config.vc>
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
@@ -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) /GR /GX /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) /GR /GX \
+       /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
@@ -157,6 +156,9 @@ __RUNTIME_LIBS = T
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
@@ -175,16 +177,16 @@ __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
 ____DEBUGINFO = /D_DEBUG
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO = /DNDEBUG
+____DEBUGINFO = 
 !endif
 !if "$(DEBUG_INFO)" == "0"
-____DEBUGINFO = /DNDEBUG
+____DEBUGINFO = 
 !endif
 !if "$(DEBUG_INFO)" == "1"
 ____DEBUGINFO = /D_DEBUG
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_11_p = /DNDEBUG
+____DEBUGRUNTIME_11_p = 
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
 ____DEBUGRUNTIME_11_p = /D_DEBUG
@@ -193,7 +195,7 @@ ____DEBUGRUNTIME_11_p = /D_DEBUG
 ____DEBUGRUNTIME_11_p = $(____DEBUGINFO)
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p = /DNDEBUG
+____DEBUGRUNTIME_2_p = 
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
 ____DEBUGRUNTIME_2_p = /D_DEBUG
@@ -239,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  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
+       $(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)