1) some compilers (Watcom) don't like it if wxBase library PCH file contains

symbols from GUI components and won't link a DLL
2) fixed subdirs recursion code - all options must be output
3) fixed subdirs recursion code - all options must be output
4) fix for watcom resource compiler

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index ba8d177c86a9aa398dc5f9431720392ec3da99d1..a8edc9bec2f810cbde8f2e96b5aa34d6f833533a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -234,11 +234,11 @@ ALL_HEADERS =  \
 BASEDLL_CFLAGS = $(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) \
 BASEDLL_CFLAGS = $(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) \

-       -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CFLAGS) $(PIC_FLAG)
+       -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 $(CFLAGS) $(PIC_FLAG)

 BASEDLL_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) \
 BASEDLL_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) \

-       -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CXXFLAGS) $(PIC_FLAG)
+       -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 $(CXXFLAGS) $(PIC_FLAG)

 BASEDLL_OBJECTS =  \
        basedll_appbase.o \
        basedll_clntdata.o \
 BASEDLL_OBJECTS =  \
        basedll_appbase.o \
        basedll_clntdata.o \


@@ -299,11 +299,11 @@ BASEDLL_OBJECTS =  \
 BASELIB_CFLAGS = $(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) \
 BASELIB_CFLAGS = $(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) \

-       -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CFLAGS)
+       -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CFLAGS)

 BASELIB_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) \
 BASELIB_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) \

-       -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CXXFLAGS)
+       -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CXXFLAGS)

 BASELIB_OBJECTS =  \
        baselib_appbase.o \
        baselib_clntdata.o \
 BASELIB_OBJECTS =  \
        baselib_appbase.o \
        baselib_clntdata.o \


@@ -629,11 +629,11 @@ MONOLIB_OBJECTS =  \
 NETDLL_CFLAGS = $(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) \
 NETDLL_CFLAGS = $(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) \

-       -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS) $(PIC_FLAG)
+       -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS) $(PIC_FLAG)

 NETDLL_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) \
 NETDLL_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) \

-       -DWXUSINGDLL -DWXMAKINGDLL_NET $(CXXFLAGS) $(PIC_FLAG)
+       -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET $(CXXFLAGS) $(PIC_FLAG)

 NETDLL_OBJECTS =  \
        netdll_fs_inet.o \
        netdll_ftp.o \
 NETDLL_OBJECTS =  \
        netdll_fs_inet.o \
        netdll_ftp.o \


@@ -649,11 +649,11 @@ NETDLL_OBJECTS =  \
 NETLIB_CFLAGS = $(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) \
 NETLIB_CFLAGS = $(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) \

-       -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS)
+       -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS)

 NETLIB_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) \
 NETLIB_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) \

-       -DWXUSINGDLL -DWXMAKINGDLL_NET $(CXXFLAGS)
+       -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET $(CXXFLAGS)

 NETLIB_OBJECTS =  \
        netlib_fs_inet.o \
        netlib_ftp.o \
 NETLIB_OBJECTS =  \
        netlib_fs_inet.o \
        netlib_ftp.o \


@@ -669,14 +669,14 @@ NETLIB_OBJECTS =  \
 ODBCDLL_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) \
 ODBCDLL_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) \

-       -DWXUSINGDLL -DWXMAKINGDLL_ODBC $(CXXFLAGS) $(PIC_FLAG)
+       -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC $(CXXFLAGS) $(PIC_FLAG)

 ODBCDLL_OBJECTS =  \
        odbcdll_db.o \
        odbcdll_dbtable.o
 ODBCLIB_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) \
 ODBCDLL_OBJECTS =  \
        odbcdll_db.o \
        odbcdll_dbtable.o
 ODBCLIB_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) \

-       $(CXXFLAGS)
+       -DwxUSE_GUI=0 $(CXXFLAGS)

 ODBCLIB_OBJECTS =  \
        odbclib_db.o \
        odbclib_dbtable.o
 ODBCLIB_OBJECTS =  \
        odbclib_db.o \
        odbclib_dbtable.o


@@ -829,13 +829,13 @@ WXZLIB_OBJECTS =  \
 XMLDLL_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) \
 XMLDLL_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) \

-       -DWXUSINGDLL -DWXMAKINGDLL_XML $(CXXFLAGS) $(PIC_FLAG)
+       -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_XML $(CXXFLAGS) $(PIC_FLAG)

 XMLDLL_OBJECTS =  \
        xmldll_xml.o
 XMLLIB_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) \
 XMLDLL_OBJECTS =  \
        xmldll_xml.o
 XMLLIB_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) \

-       $(CXXFLAGS)
+       -DwxUSE_GUI=0 $(CXXFLAGS)

 XMLLIB_OBJECTS =  \
        xmllib_xml.o
 
 XMLLIB_OBJECTS =  \
        xmllib_xml.o
 

diff --git a/build/msw/config.bcc b/build/msw/config.bcc
index 4990a1d099b9429d374eedad5aad8ddcfa388b9f..6facc1375445a6d5c2dbb83fa676b9097cef41d7 100644 (file)
--- a/build/msw/config.bcc
+++ b/build/msw/config.bcc
@@ -69,6 +69,11 @@ LDFLAGS = -L$(BCCDIR)\lib
 MONOLITHIC = 0
 !endif
 
 MONOLITHIC = 0
 !endif
 

+# Use MSLU library when building Unicode version. [0,1]
+!ifndef MSLU
+MSLU = 0
+!endif
+

 # Is this official build by wxWindows developers? [0,1]
 !ifndef OFFICIAL_BUILD
 OFFICIAL_BUILD = 0
 # Is this official build by wxWindows developers? [0,1]
 !ifndef OFFICIAL_BUILD
 OFFICIAL_BUILD = 0

diff --git a/build/msw/config.gcc b/build/msw/config.gcc
index 5e5003d51b31848d072ee67954296217cef96ccc..72baa3e197d56d818d9a1ec67f0377d858808825 100644 (file)
--- a/build/msw/config.gcc
+++ b/build/msw/config.gcc
@@ -52,6 +52,9 @@ LDFLAGS =
 # Multiple libraries or single huge monolithic one? [0,1]
 MONOLITHIC = 0
 
 # Multiple libraries or single huge monolithic one? [0,1]
 MONOLITHIC = 0
 

+# Use MSLU library when building Unicode version. [0,1]
+MSLU = 0
+

 # Is this official build by wxWindows developers? [0,1]
 OFFICIAL_BUILD = 0
 
 # Is this official build by wxWindows developers? [0,1]
 OFFICIAL_BUILD = 0
 

diff --git a/build/msw/config.vc b/build/msw/config.vc
index aee32e402535da37838af84b2315247d6609d32e..272e8995d2c99027b51811587a2bf2abd6bd28a0 100644 (file)
--- a/build/msw/config.vc
+++ b/build/msw/config.vc
@@ -51,6 +51,9 @@ LDFLAGS =
 # Multiple libraries or single huge monolithic one? [0,1]
 MONOLITHIC = 0
 
 # Multiple libraries or single huge monolithic one? [0,1]
 MONOLITHIC = 0
 

+# Use MSLU library when building Unicode version. [0,1]
+MSLU = 0
+

 # Is this official build by wxWindows developers? [0,1]
 OFFICIAL_BUILD = 0
 
 # Is this official build by wxWindows developers? [0,1]
 OFFICIAL_BUILD = 0
 

diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index c54308e92d64a622cdbba0127a9d18763c173fa8..61fab4b7857fb98f89fb31d33f575188ecaf9bd3 100644 (file)
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -69,13 +69,13 @@ BASEDLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG)
        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \

-       -I..\..\src\expat\lib -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 -DwxUSE_GUI=0 \
+       -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 \

        $(CFLAGS)
 BASEDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
        $(CFLAGS)
 BASEDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \

-       -I..\..\src\expat\lib -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 -DwxUSE_GUI=0 \
+       -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 \

        $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_basedll.csm
 BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_dummy.obj \
        $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_basedll.csm
 BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_dummy.obj \


@@ -151,12 +151,12 @@ BASELIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG)
        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \

-       -I..\..\src\expat\lib -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CFLAGS)
+       -I..\..\src\expat\lib -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CFLAGS)

 BASELIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
 BASELIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \

-       -I..\..\src\expat\lib -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CXXFLAGS) -Hu \
+       -I..\..\src\expat\lib -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CXXFLAGS) -Hu \

        -H=$(OBJS)\wxprec_baselib.csm
 BASELIB_OBJECTS =  \
        $(OBJS)\baselib_dummy.obj \
        -H=$(OBJS)\wxprec_baselib.csm
 BASELIB_OBJECTS =  \
        $(OBJS)\baselib_dummy.obj \


@@ -558,13 +558,13 @@ NETDLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \

-       -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS)
+       -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS)

 NETDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
 NETDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \

-       -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_NET $(CXXFLAGS) -Hu \
-       -H=$(OBJS)\wxprec_netdll.csm
+       -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET \
+       $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_netdll.csm

 NETDLL_OBJECTS =  \
        $(OBJS)\netdll_dummy.obj \
        $(OBJS)\netdll_fs_inet.obj \
 NETDLL_OBJECTS =  \
        $(OBJS)\netdll_dummy.obj \
        $(OBJS)\netdll_fs_inet.obj \


@@ -582,13 +582,13 @@ NETLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
        -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \

-       -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS)
+       -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS)

 NETLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
 NETLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \

-       -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_NET $(CXXFLAGS) -Hu \
-       -H=$(OBJS)\wxprec_netlib.csm
+       -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET \
+       $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_netlib.csm

 NETLIB_OBJECTS =  \
        $(OBJS)\netlib_dummy.obj \
        $(OBJS)\netlib_fs_inet.obj \
 NETLIB_OBJECTS =  \
        $(OBJS)\netlib_dummy.obj \
        $(OBJS)\netlib_fs_inet.obj \


@@ -608,8 +608,8 @@ ODBCDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \

-       -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_ODBC $(CXXFLAGS) -Hu \
-       -H=$(OBJS)\wxprec_odbcdll.csm
+       -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC \
+       $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_odbcdll.csm

 ODBCDLL_OBJECTS =  \
        $(OBJS)\odbcdll_dummy.obj \
        $(OBJS)\odbcdll_db.obj \
 ODBCDLL_OBJECTS =  \
        $(OBJS)\odbcdll_dummy.obj \
        $(OBJS)\odbcdll_db.obj \


@@ -618,7 +618,8 @@ ODBCLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \

-       -I..\..\src\expat\lib $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_odbclib.csm
+       -I..\..\src\expat\lib -DwxUSE_GUI=0 $(CXXFLAGS) -Hu \
+       -H=$(OBJS)\wxprec_odbclib.csm

 ODBCLIB_OBJECTS =  \
        $(OBJS)\odbclib_dummy.obj \
        $(OBJS)\odbclib_db.obj \
 ODBCLIB_OBJECTS =  \
        $(OBJS)\odbclib_dummy.obj \
        $(OBJS)\odbclib_db.obj \


@@ -762,8 +763,8 @@ XMLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \

-       -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_XML $(CXXFLAGS) -Hu \
-       -H=$(OBJS)\wxprec_xmldll.csm
+       -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_XML \
+       $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_xmldll.csm

 XMLDLL_OBJECTS =  \
        $(OBJS)\xmldll_dummy.obj \
        $(OBJS)\xmldll_xml.obj
 XMLDLL_OBJECTS =  \
        $(OBJS)\xmldll_dummy.obj \
        $(OBJS)\xmldll_xml.obj


@@ -771,7 +772,8 @@ XMLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \

-       -I..\..\src\expat\lib $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_xmllib.csm
+       -I..\..\src\expat\lib -DwxUSE_GUI=0 $(CXXFLAGS) -Hu \
+       -H=$(OBJS)\wxprec_xmllib.csm

 XMLLIB_OBJECTS =  \
        $(OBJS)\xmllib_dummy.obj \
        $(OBJS)\xmllib_xml.obj
 XMLLIB_OBJECTS =  \
        $(OBJS)\xmllib_dummy.obj \
        $(OBJS)\xmllib_xml.obj


@@ -853,6 +855,9 @@ __RUNTIME_LIBS_9 =
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIBGLDEP_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIBGLDEP_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -2565,8 +2570,6 @@ __xmllib___depname = \
        $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib
 !endif
 
        $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib
 !endif
 

-MAKEARGS = -DBUILD=$(BUILD) -DCC=$(CC) -DCFG=$(CFG) -DCFLAGS=$(CFLAGS) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DUSE_HTML=$(USE_HTML) -DUSE_ODBC=$(USE_ODBC) -DUSE_OPENGL=$(USE_OPENGL) -DVENDOR=$(VENDOR) -DWXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -8814,7 +8817,7 @@ $(OBJS)\xmllib_xml.obj: ..\..\src\xml\xml.cpp
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).dll: $(ADVDLL_OBJECTS) $(OBJS)\advdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).dll: $(ADVDLL_OBJECTS) $(OBJS)\advdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|

-       c0d32.obj $(ADVDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,
+       c0d32.obj $(ADVDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,

 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv $@
 !endif
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv $@
 !endif


@@ -8830,7 +8833,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(OBJS)\basedll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(OBJS)\basedll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|

-       c0d32.obj $(BASEDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,
+       c0d32.obj $(BASEDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,

 |
        implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) $@
 !endif
 |
        implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) $@
 !endif


@@ -8886,7 +8889,7 @@ clean:
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll: $(COREDLL_OBJECTS) $(OBJS)\coredll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_bcc$(VENDORTAG).dll: $(COREDLL_OBJECTS) $(OBJS)\coredll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|

-       c0d32.obj $(COREDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,
+       c0d32.obj $(COREDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,

 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core $@
 !endif
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core $@
 !endif


@@ -8902,7 +8905,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.li
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).dll: $(DBGRIDDLL_OBJECTS) $(OBJS)\dbgriddll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_bcc$(VENDORTAG).dll: $(DBGRIDDLL_OBJECTS) $(OBJS)\dbgriddll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|

-       c0d32.obj $(DBGRIDDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,
+       c0d32.obj $(DBGRIDDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,

 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid $@
 !endif
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid $@
 !endif


@@ -8918,7 +8921,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(OBJS)\gldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(OBJS)\gldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|

-       c0d32.obj $(GLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,
+       c0d32.obj $(GLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,

 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl $@
 !endif
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl $@
 !endif


@@ -8934,7 +8937,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib:
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_HTML)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(OBJS)\htmldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_HTML)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_bcc$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(OBJS)\htmldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|

-       c0d32.obj $(HTMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,
+       c0d32.obj $(HTMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,

 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html $@
 !endif
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html $@
 !endif


@@ -8956,7 +8959,7 @@ $(LIBDIRNAME)\wx: $(LIBDIRNAME)
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(OBJS)\monodll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(OBJS)\monodll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|

-       c0d32.obj $(MONODLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib    import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,
+       c0d32.obj $(MONODLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib    import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,

 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) $@
 !endif
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) $@
 !endif


@@ -8975,7 +8978,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(OBJS)\netdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(OBJS)\netdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|

-       c0d32.obj $(NETDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,
+       c0d32.obj $(NETDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,

 |
        implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net $@
 !endif
 |
        implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net $@
 !endif


@@ -8991,7 +8994,7 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib: $(NETLIB_OBJECTS)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).dll: $(ODBCDLL_OBJECTS) $(OBJS)\odbcdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).dll: $(ODBCDLL_OBJECTS) $(OBJS)\odbcdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|

-       c0d32.obj $(ODBCDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,
+       c0d32.obj $(ODBCDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,

 |
        implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc $@
 !endif
 |
        implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc $@
 !endif


@@ -9054,7 +9057,7 @@ $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib: $(WXZLIB_OBJECTS)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(OBJS)\xmldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(OBJS)\xmldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|

-       c0d32.obj $(XMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,
+       c0d32.obj $(XMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  import32.lib cw32mt$(__RUNTIME_LIBS_9).lib,,

 |
        implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml $@
 !endif
 |
        implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml $@
 !endif

diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 18b5dd175d2ade22f0f41c8cd020b7a3a135d2c4..dc7e3d685f689c8d0e9b6764f2720a111ca44122 100644 (file)
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -60,13 +60,13 @@ BASEDLL_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \

-       -I..\..\src\expat\lib -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 -DwxUSE_GUI=0 \
+       -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 \

        $(CFLAGS)
 BASEDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
        $(CFLAGS)
 BASEDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \

-       -I..\..\src\expat\lib -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 -DwxUSE_GUI=0 \
+       -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 \

        $(CXXFLAGS)
 BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_dummy.o \
        $(CXXFLAGS)
 BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_dummy.o \


@@ -142,12 +142,12 @@ BASELIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \

-       -I..\..\src\expat\lib -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CFLAGS)
+       -I..\..\src\expat\lib -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CFLAGS)

 BASELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
 BASELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \

-       -I..\..\src\expat\lib -DwxUSE_BASE=1 -DwxUSE_GUI=0 $(CXXFLAGS)
+       -I..\..\src\expat\lib -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CXXFLAGS)

 BASELIB_OBJECTS =  \
        $(OBJS)\baselib_dummy.o \
        $(OBJS)\baselib_appbase.o \
 BASELIB_OBJECTS =  \
        $(OBJS)\baselib_dummy.o \
        $(OBJS)\baselib_appbase.o \


@@ -542,12 +542,13 @@ NETDLL_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \

-       -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS)
+       -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS)

 NETDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
 NETDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \

-       -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_NET $(CXXFLAGS)
+       -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET \
+       $(CXXFLAGS)

 NETDLL_OBJECTS =  \
        $(OBJS)\netdll_dummy.o \
        $(OBJS)\netdll_fs_inet.o \
 NETDLL_OBJECTS =  \
        $(OBJS)\netdll_dummy.o \
        $(OBJS)\netdll_fs_inet.o \


@@ -565,12 +566,13 @@ NETLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \

-       -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS)
+       -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET $(CFLAGS)

 NETLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
 NETLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \

-       -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_NET $(CXXFLAGS)
+       -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET \
+       $(CXXFLAGS)

 NETLIB_OBJECTS =  \
        $(OBJS)\netlib_dummy.o \
        $(OBJS)\netlib_fs_inet.o \
 NETLIB_OBJECTS =  \
        $(OBJS)\netlib_dummy.o \
        $(OBJS)\netlib_fs_inet.o \


@@ -590,7 +592,8 @@ ODBCDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \

-       -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_ODBC $(CXXFLAGS)
+       -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC \
+       $(CXXFLAGS)

 ODBCDLL_OBJECTS =  \
        $(OBJS)\odbcdll_dummy.o \
        $(OBJS)\odbcdll_db.o \
 ODBCDLL_OBJECTS =  \
        $(OBJS)\odbcdll_dummy.o \
        $(OBJS)\odbcdll_db.o \


@@ -599,7 +602,7 @@ ODBCLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \

-       -I..\..\src\expat\lib $(CXXFLAGS)
+       -I..\..\src\expat\lib -DwxUSE_GUI=0 $(CXXFLAGS)

 ODBCLIB_OBJECTS =  \
        $(OBJS)\odbclib_dummy.o \
        $(OBJS)\odbclib_db.o \
 ODBCLIB_OBJECTS =  \
        $(OBJS)\odbclib_dummy.o \
        $(OBJS)\odbclib_db.o \


@@ -743,7 +746,8 @@ XMLDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \

-       -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_XML $(CXXFLAGS)
+       -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_XML \
+       $(CXXFLAGS)

 XMLDLL_OBJECTS =  \
        $(OBJS)\xmldll_dummy.o \
        $(OBJS)\xmldll_xml.o
 XMLDLL_OBJECTS =  \
        $(OBJS)\xmldll_dummy.o \
        $(OBJS)\xmldll_xml.o


@@ -751,7 +755,7 @@ XMLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
        -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \

-       -I..\..\src\expat\lib $(CXXFLAGS)
+       -I..\..\src\expat\lib -DwxUSE_GUI=0 $(CXXFLAGS)

 XMLLIB_OBJECTS =  \
        $(OBJS)\xmllib_dummy.o \
        $(OBJS)\xmllib_xml.o
 XMLLIB_OBJECTS =  \
        $(OBJS)\xmllib_dummy.o \
        $(OBJS)\xmllib_xml.o


@@ -832,6 +836,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif

+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif

 ifeq ($(MONOLITHIC),0)
 __WXLIBGLDEP_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIBGLDEP_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif


@@ -2632,8 +2639,6 @@ __xmllib___depname = \
 endif
 endif
 
 endif
 endif
 

-MAKEARGS = BUILD=$(BUILD) CC=$(CC) CFG=$(CFG) CFLAGS=$(CFLAGS) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) USE_HTML=$(USE_HTML) USE_ODBC=$(USE_ODBC) USE_OPENGL=$(USE_OPENGL) VENDOR=$(VENDOR) WXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -9282,7 +9287,7 @@ ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_gcc$(VENDORTAG).dll: $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname)
 ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_gcc$(VENDORTAG).dll: $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname)

-       $(CXX) -shared -o $@ $(ADVDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a
+       $(CXX) -shared -o $@ $(ADVDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a

 endif
 endif
 endif
 endif
 endif
 endif


@@ -9301,7 +9306,7 @@ endif
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gcc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gcc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a

-       $(CXX) -shared -o $@ $(BASEDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -shared -o $@ $(BASEDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32

 endif
 endif
 
 endif
 endif
 


@@ -9357,7 +9362,7 @@ ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_gcc$(VENDORTAG).dll: $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__basedll___depname)
 ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_gcc$(VENDORTAG).dll: $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__basedll___depname)

-       $(CXX) -shared -o $@ $(COREDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a
+       $(CXX) -shared -o $@ $(COREDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a

 endif
 endif
 endif
 endif
 endif
 endif


@@ -9378,7 +9383,7 @@ ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 ifeq ($(USE_ODBC),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_gcc$(VENDORTAG).dll: $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
 ifeq ($(USE_GUI),1)
 ifeq ($(USE_ODBC),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_gcc$(VENDORTAG).dll: $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)

-       $(CXX) -shared -o $@ $(DBGRIDDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.a $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a
+       $(CXX) -shared -o $@ $(DBGRIDDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.a $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a

 endif
 endif
 endif
 endif
 endif
 endif


@@ -9401,7 +9406,7 @@ ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 ifeq ($(USE_OPENGL),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_gcc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a
 ifeq ($(USE_GUI),1)
 ifeq ($(USE_OPENGL),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_gcc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a

-       $(CXX) -shared -o $@ $(GLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) -lopengl32 -lglu32
+       $(CXX) -shared -o $@ $(GLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) -lopengl32 -lglu32

 endif
 endif
 endif
 endif
 endif
 endif


@@ -9421,7 +9426,7 @@ ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_HTML),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_gcc$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname)
 ifeq ($(SHARED),1)
 ifeq ($(USE_HTML),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_gcc$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__coredll___depname) $(__basedll___depname)

-       $(CXX) -shared -o $@ $(HTMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a
+       $(CXX) -shared -o $@ $(HTMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a

 endif
 endif
 endif
 endif
 endif
 endif


@@ -9446,7 +9451,7 @@ $(LIBDIRNAME)\wx: $(LIBDIRNAME)
 ifeq ($(MONOLITHIC),1)
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gcc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a
 ifeq ($(MONOLITHIC),1)
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gcc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a

-       $(CXX) -shared -o $@ $(MONODLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -shared -o $@ $(MONODLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32

 endif
 endif
 
 endif
 endif
 


@@ -9465,7 +9470,7 @@ endif
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_gcc$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__basedll___depname)
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_gcc$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__basedll___depname)

-       $(CXX) -shared -o $@ $(NETDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a
+       $(CXX) -shared -o $@ $(NETDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a

 endif
 endif
 
 endif
 endif
 


@@ -9483,7 +9488,7 @@ ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 ifeq ($(USE_ODBC),1)
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_gcc$(VENDORTAG).dll: $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__basedll___depname)
 ifeq ($(USE_GUI),1)
 ifeq ($(USE_ODBC),1)
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_gcc$(VENDORTAG).dll: $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__basedll___depname)

-       $(CXX) -shared -o $@ $(ODBCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a
+       $(CXX) -shared -o $@ $(ODBCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a

 endif
 endif
 endif
 endif
 endif
 endif


@@ -9546,7 +9551,7 @@ $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a: $(WXZLIB_OBJECTS)
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_gcc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__basedll___depname)
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_gcc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__basedll___depname)

-       $(CXX) -shared -o $@ $(XMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a
+       $(CXX) -shared -o $@ $(XMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a

 endif
 endif
 
 endif
 endif
 

diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index de648e7c156a57d3fcdfec6fc7355f98e70ec533..56b9848f4c82e2e7dbfa90b036a72c9ad43d7d67 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -69,16 +69,16 @@ BASEDLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_69) /DWIN32 \
        $(____DEBUGRUNTIME_68_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(LIBDIRNAME) \
        /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
        $(____DEBUGRUNTIME_68_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(LIBDIRNAME) \
        /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \

-       /I..\..\src\regex /I..\..\src\expat\lib /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 \
-       /DwxUSE_GUI=0 $(CFLAGS)
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXMAKINGDLL_BASE \
+       /DwxUSE_BASE=1 $(CFLAGS)

 BASEDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_69) /DWIN32 \
        $(__DEBUGINFO_38) \
        /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME_68_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(LIBDIRNAME) \
        /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
 BASEDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_69) /DWIN32 \
        $(__DEBUGINFO_38) \
        /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME_68_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(LIBDIRNAME) \
        /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \

-       /I..\..\src\regex /I..\..\src\expat\lib /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 \
-       /DwxUSE_GUI=0 $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_basedll.pch"
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXMAKINGDLL_BASE \
+       /DwxUSE_BASE=1 $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_basedll.pch"

 BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_dummy.obj \
        $(OBJS)\basedll_appbase.obj \
 BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_dummy.obj \
        $(OBJS)\basedll_appbase.obj \


@@ -155,7 +155,7 @@ BASELIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_78) /DWIN32 \
        $(____DEBUGRUNTIME_77_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(LIBDIRNAME) \
        /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
        $(____DEBUGRUNTIME_77_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(LIBDIRNAME) \
        /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \

-       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 /DwxUSE_GUI=0 \
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DwxUSE_BASE=1 \

        $(CFLAGS)
 BASELIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_78) /DWIN32 \
        $(__DEBUGINFO_38) \
        $(CFLAGS)
 BASELIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_78) /DWIN32 \
        $(__DEBUGINFO_38) \


@@ -163,7 +163,7 @@ BASELIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_78) /DWIN32 \
        $(____DEBUGRUNTIME_77_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(LIBDIRNAME) \
        /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
        $(____DEBUGRUNTIME_77_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(LIBDIRNAME) \
        /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \

-       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 /DwxUSE_GUI=0 \
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DwxUSE_BASE=1 \

        $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_baselib.pch"
 BASELIB_OBJECTS =  \
        $(OBJS)\baselib_dummy.obj \
        $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_baselib.pch"
 BASELIB_OBJECTS =  \
        $(OBJS)\baselib_dummy.obj \


@@ -604,16 +604,17 @@ NETDLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_87) /DWIN32 \
        $(____DEBUGRUNTIME_86_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(LIBDIRNAME) \
        /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
        $(____DEBUGRUNTIME_86_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(LIBDIRNAME) \
        /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \

-       /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_NET \
-       $(CFLAGS)
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXUSINGDLL \
+       /DWXMAKINGDLL_NET $(CFLAGS)

 NETDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_87) /DWIN32 \
        $(__DEBUGINFO_38) \
        /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME_86_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(LIBDIRNAME) \
        /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
 NETDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_87) /DWIN32 \
        $(__DEBUGINFO_38) \
        /Fd$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME_86_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(LIBDIRNAME) \
        /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \

-       /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_NET \
-       $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netdll.pch"
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXUSINGDLL \
+       /DWXMAKINGDLL_NET $(CXXFLAGS) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_netdll.pch"

 NETDLL_OBJECTS =  \
        $(OBJS)\netdll_dummy.obj \
        $(OBJS)\netdll_fs_inet.obj \
 NETDLL_OBJECTS =  \
        $(OBJS)\netdll_dummy.obj \
        $(OBJS)\netdll_fs_inet.obj \


@@ -633,16 +634,17 @@ NETLIB_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_96) /DWIN32 \
        $(____DEBUGRUNTIME_95_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(LIBDIRNAME) \
        /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
        $(____DEBUGRUNTIME_95_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(LIBDIRNAME) \
        /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \

-       /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_NET \
-       $(CFLAGS)
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXUSINGDLL \
+       /DWXMAKINGDLL_NET $(CFLAGS)

 NETLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_96) /DWIN32 \
        $(__DEBUGINFO_38) \
        /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.pdb \
        $(____DEBUGRUNTIME_95_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(LIBDIRNAME) \
        /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
 NETLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_96) /DWIN32 \
        $(__DEBUGINFO_38) \
        /Fd$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.pdb \
        $(____DEBUGRUNTIME_95_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\include /I$(LIBDIRNAME) \
        /I..\..\src\tiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \

-       /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_NET \
-       $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netlib.pch"
+       /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXUSINGDLL \
+       /DWXMAKINGDLL_NET $(CXXFLAGS) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_netlib.pch"

 NETLIB_OBJECTS =  \
        $(OBJS)\netlib_dummy.obj \
        $(OBJS)\netlib_fs_inet.obj \
 NETLIB_OBJECTS =  \
        $(OBJS)\netlib_dummy.obj \
        $(OBJS)\netlib_fs_inet.obj \


@@ -665,7 +667,7 @@ ODBCDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_141) \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
        /I..\..\include /I$(LIBDIRNAME) /I..\..\src\tiff /I..\..\src\jpeg \
        /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
        /I..\..\include /I$(LIBDIRNAME) /I..\..\src\tiff /I..\..\src\jpeg \
        /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \

-       /DWXUSINGDLL /DWXMAKINGDLL_ODBC $(CXXFLAGS) /Yu"wx/wxprec.h" \
+       /DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_ODBC $(CXXFLAGS) /Yu"wx/wxprec.h" \

        /Fp"$(OBJS)\wxprec_odbcdll.pch"
 ODBCDLL_OBJECTS =  \
        $(OBJS)\odbcdll_dummy.obj \
        /Fp"$(OBJS)\wxprec_odbcdll.pch"
 ODBCDLL_OBJECTS =  \
        $(OBJS)\odbcdll_dummy.obj \


@@ -678,7 +680,7 @@ ODBCLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_150) \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
        /I..\..\include /I$(LIBDIRNAME) /I..\..\src\tiff /I..\..\src\jpeg \
        /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
        /I..\..\include /I$(LIBDIRNAME) /I..\..\src\tiff /I..\..\src\jpeg \
        /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \

-       $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_odbclib.pch"
+       /DwxUSE_GUI=0 $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_odbclib.pch"

 ODBCLIB_OBJECTS =  \
        $(OBJS)\odbclib_dummy.obj \
        $(OBJS)\odbclib_db.obj \
 ODBCLIB_OBJECTS =  \
        $(OBJS)\odbclib_dummy.obj \
        $(OBJS)\odbclib_db.obj \


@@ -832,7 +834,7 @@ XMLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_195) /DWIN32 \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
        /I..\..\include /I$(LIBDIRNAME) /I..\..\src\tiff /I..\..\src\jpeg \
        /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
        /I..\..\include /I$(LIBDIRNAME) /I..\..\src\tiff /I..\..\src\jpeg \
        /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \

-       /DWXUSINGDLL /DWXMAKINGDLL_XML $(CXXFLAGS) /Yu"wx/wxprec.h" \
+       /DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_XML $(CXXFLAGS) /Yu"wx/wxprec.h" \

        /Fp"$(OBJS)\wxprec_xmldll.pch"
 XMLDLL_OBJECTS =  \
        $(OBJS)\xmldll_dummy.obj \
        /Fp"$(OBJS)\wxprec_xmldll.pch"
 XMLDLL_OBJECTS =  \
        $(OBJS)\xmldll_dummy.obj \


@@ -844,7 +846,7 @@ XMLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_204) /DWIN32 \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
        /I..\..\include /I$(LIBDIRNAME) /I..\..\src\tiff /I..\..\src\jpeg \
        /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
        /I..\..\include /I$(LIBDIRNAME) /I..\..\src\tiff /I..\..\src\jpeg \
        /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \

-       $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmllib.pch"
+       /DwxUSE_GUI=0 $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmllib.pch"

 XMLLIB_OBJECTS =  \
        $(OBJS)\xmllib_dummy.obj \
        $(OBJS)\xmllib_xml.obj
 XMLLIB_OBJECTS =  \
        $(OBJS)\xmllib_dummy.obj \
        $(OBJS)\xmllib_xml.obj


@@ -1178,6 +1180,9 @@ __RUNTIME_LIBS = T
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIBGLDEP_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIBGLDEP_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -9383,7 +9388,7 @@ $(OBJS)\xmllib_xml.obj: ..\..\src\xml\xml.cpp
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).dll: $(ADVDLL_OBJECTS) $(OBJS)\advdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33)  /LIBPATH:$(LIBDIRNAME) @<<
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).dll: $(ADVDLL_OBJECTS) $(OBJS)\advdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33)  /LIBPATH:$(LIBDIRNAME) @<<

-       $(ADVDLL_OBJECTS)  $(__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  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
+       $(ADVDLL_OBJECTS)  $(__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  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib

 <<
 !endif
 
 <<
 !endif
 


@@ -9398,7 +9403,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(OBJS)\basedll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33)  /LIBPATH:$(LIBDIRNAME) @<<
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(OBJS)\basedll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33)  /LIBPATH:$(LIBDIRNAME) @<<

-       $(BASEDLL_OBJECTS)  $(__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 /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+       $(BASEDLL_OBJECTS)  $(__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 /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib

 <<
 !endif
 
 <<
 !endif
 


@@ -9453,7 +9458,7 @@ clean:
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).dll: $(COREDLL_OBJECTS) $(OBJS)\coredll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33)  /LIBPATH:$(LIBDIRNAME) @<<
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_vc$(VENDORTAG).dll: $(COREDLL_OBJECTS) $(OBJS)\coredll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33)  /LIBPATH:$(LIBDIRNAME) @<<

-       $(COREDLL_OBJECTS)  $(__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  $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
+       $(COREDLL_OBJECTS)  $(__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  $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib

 <<
 !endif
 
 <<
 !endif
 


@@ -9468,7 +9473,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.li
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).dll: $(DBGRIDDLL_OBJECTS) $(OBJS)\dbgriddll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33)  /LIBPATH:$(LIBDIRNAME) @<<
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid_vc$(VENDORTAG).dll: $(DBGRIDDLL_OBJECTS) $(OBJS)\dbgriddll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33)  /LIBPATH:$(LIBDIRNAME) @<<

-       $(DBGRIDDLL_OBJECTS)  $(__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  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib
+       $(DBGRIDDLL_OBJECTS)  $(__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  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib

 <<
 !endif
 
 <<
 !endif
 


@@ -9483,7 +9488,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(OBJS)\gldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33)  /LIBPATH:$(LIBDIRNAME) @<<
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(OBJS)\gldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33)  /LIBPATH:$(LIBDIRNAME) @<<

-       $(GLDLL_OBJECTS)  $(__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  $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib
+       $(GLDLL_OBJECTS)  $(__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  $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib

 <<
 !endif
 
 <<
 !endif
 


@@ -9498,7 +9503,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib:
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_HTML)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(OBJS)\htmldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33)  /LIBPATH:$(LIBDIRNAME) @<<
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_HTML)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_vc$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(OBJS)\htmldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname)
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33)  /LIBPATH:$(LIBDIRNAME) @<<

-       $(HTMLDLL_OBJECTS)  $(__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  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib
+       $(HTMLDLL_OBJECTS)  $(__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  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib

 <<
 !endif
 
 <<
 !endif
 


@@ -9519,7 +9524,7 @@ $(LIBDIRNAME)\wx: $(LIBDIRNAME)
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(OBJS)\monodll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33)  /LIBPATH:$(LIBDIRNAME) @<<
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(OBJS)\monodll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33)  /LIBPATH:$(LIBDIRNAME) @<<

-       $(MONODLL_OBJECTS)  $(__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    /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+       $(MONODLL_OBJECTS)  $(__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    /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib

 <<
 !endif
 
 <<
 !endif
 


@@ -9537,7 +9542,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(OBJS)\netdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33)  /LIBPATH:$(LIBDIRNAME) @<<
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(OBJS)\netdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33)  /LIBPATH:$(LIBDIRNAME) @<<

-       $(NETDLL_OBJECTS)  $(__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 $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib
+       $(NETDLL_OBJECTS)  $(__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 $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib

 <<
 !endif
 
 <<
 !endif
 


@@ -9552,7 +9557,7 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib: $(NETLIB_OBJECTS)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).dll: $(ODBCDLL_OBJECTS) $(OBJS)\odbcdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33)  /LIBPATH:$(LIBDIRNAME) @<<
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).dll: $(ODBCDLL_OBJECTS) $(OBJS)\odbcdll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33)  /LIBPATH:$(LIBDIRNAME) @<<

-       $(ODBCDLL_OBJECTS)  $(__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 $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib
+       $(ODBCDLL_OBJECTS)  $(__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 $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib

 <<
 !endif
 
 <<
 !endif
 


@@ -9614,7 +9619,7 @@ $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib: $(WXZLIB_OBJECTS)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(OBJS)\xmldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33)  /LIBPATH:$(LIBDIRNAME) @<<
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(OBJS)\xmldll_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_33)  /LIBPATH:$(LIBDIRNAME) @<<

-       $(XMLDLL_OBJECTS)  $(__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 $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib
+       $(XMLDLL_OBJECTS)  $(__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 $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib

 <<
 !endif
 
 <<
 !endif
 

diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index 65a0aea08c97119e2201342b7095dc94ddb113b8..4601c9903bd4d203e694900fb3d39a965a8e3cd5 100644 (file)
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -2019,13 +2019,13 @@ BASEDLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &

-       -i=..\..\src\expat\lib -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 -dwxUSE_GUI=0 &
+       -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 &

        $(CFLAGS)
 BASEDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
        $(CFLAGS)
 BASEDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &

-       -i=..\..\src\expat\lib -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 -dwxUSE_GUI=0 &
+       -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 &

        $(CXXFLAGS) /fh=$(OBJS)\wxprec_basedll.pch
 BASEDLL_OBJECTS =  &
        $(OBJS)\basedll_dummy.obj &
        $(CXXFLAGS) /fh=$(OBJS)\wxprec_basedll.pch
 BASEDLL_OBJECTS =  &
        $(OBJS)\basedll_dummy.obj &


@@ -2101,12 +2101,12 @@ BASELIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &

-       -i=..\..\src\expat\lib -dwxUSE_BASE=1 -dwxUSE_GUI=0 $(CFLAGS)
+       -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dwxUSE_BASE=1 $(CFLAGS)

 BASELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
 BASELIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &

-       -i=..\..\src\expat\lib -dwxUSE_BASE=1 -dwxUSE_GUI=0 $(CXXFLAGS) &
+       -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dwxUSE_BASE=1 $(CXXFLAGS) &

        /fh=$(OBJS)\wxprec_baselib.pch
 BASELIB_OBJECTS =  &
        $(OBJS)\baselib_dummy.obj &
        /fh=$(OBJS)\wxprec_baselib.pch
 BASELIB_OBJECTS =  &
        $(OBJS)\baselib_dummy.obj &


@@ -2508,13 +2508,14 @@ NETDLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &

-       -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_NET $(CFLAGS)
+       -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_NET &
+       $(CFLAGS)

 NETDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
 NETDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &

-       -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_NET $(CXXFLAGS) &
-       /fh=$(OBJS)\wxprec_netdll.pch
+       -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_NET &
+       $(CXXFLAGS) /fh=$(OBJS)\wxprec_netdll.pch

 NETDLL_OBJECTS =  &
        $(OBJS)\netdll_dummy.obj &
        $(OBJS)\netdll_fs_inet.obj &
 NETDLL_OBJECTS =  &
        $(OBJS)\netdll_dummy.obj &
        $(OBJS)\netdll_fs_inet.obj &


@@ -2532,13 +2533,14 @@ NETLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &

-       -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_NET $(CFLAGS)
+       -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_NET &
+       $(CFLAGS)

 NETLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
 NETLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &

-       -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_NET $(CXXFLAGS) &
-       /fh=$(OBJS)\wxprec_netlib.pch
+       -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_NET &
+       $(CXXFLAGS) /fh=$(OBJS)\wxprec_netlib.pch

 NETLIB_OBJECTS =  &
        $(OBJS)\netlib_dummy.obj &
        $(OBJS)\netlib_fs_inet.obj &
 NETLIB_OBJECTS =  &
        $(OBJS)\netlib_dummy.obj &
        $(OBJS)\netlib_fs_inet.obj &


@@ -2558,8 +2560,8 @@ ODBCDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &

-       -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_ODBC $(CXXFLAGS) &
-       /fh=$(OBJS)\wxprec_odbcdll.pch
+       -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_ODBC &
+       $(CXXFLAGS) /fh=$(OBJS)\wxprec_odbcdll.pch

 ODBCDLL_OBJECTS =  &
        $(OBJS)\odbcdll_dummy.obj &
        $(OBJS)\odbcdll_db.obj &
 ODBCDLL_OBJECTS =  &
        $(OBJS)\odbcdll_dummy.obj &
        $(OBJS)\odbcdll_db.obj &


@@ -2568,7 +2570,8 @@ ODBCLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &

-       -i=..\..\src\expat\lib $(CXXFLAGS) /fh=$(OBJS)\wxprec_odbclib.pch
+       -i=..\..\src\expat\lib -dwxUSE_GUI=0 $(CXXFLAGS) &
+       /fh=$(OBJS)\wxprec_odbclib.pch

 ODBCLIB_OBJECTS =  &
        $(OBJS)\odbclib_dummy.obj &
        $(OBJS)\odbclib_db.obj &
 ODBCLIB_OBJECTS =  &
        $(OBJS)\odbclib_dummy.obj &
        $(OBJS)\odbclib_db.obj &


@@ -2712,8 +2715,8 @@ XMLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &

-       -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_XML $(CXXFLAGS) &
-       /fh=$(OBJS)\wxprec_xmldll.pch
+       -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_XML &
+       $(CXXFLAGS) /fh=$(OBJS)\wxprec_xmldll.pch

 XMLDLL_OBJECTS =  &
        $(OBJS)\xmldll_dummy.obj &
        $(OBJS)\xmldll_xml.obj
 XMLDLL_OBJECTS =  &
        $(OBJS)\xmldll_dummy.obj &
        $(OBJS)\xmldll_xml.obj


@@ -2721,13 +2724,12 @@ XMLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
        -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &

-       -i=..\..\src\expat\lib $(CXXFLAGS) /fh=$(OBJS)\wxprec_xmllib.pch
+       -i=..\..\src\expat\lib -dwxUSE_GUI=0 $(CXXFLAGS) &
+       /fh=$(OBJS)\wxprec_xmllib.pch

 XMLLIB_OBJECTS =  &
        $(OBJS)\xmllib_dummy.obj &
        $(OBJS)\xmllib_xml.obj
 
 XMLLIB_OBJECTS =  &
        $(OBJS)\xmllib_dummy.obj &
        $(OBJS)\xmllib_xml.obj
 

-MAKEARGS = BUILD=$(BUILD) CC=$(CC) CFG=$(CFG) CFLAGS=$(CFLAGS) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) USE_HTML=$(USE_HTML) USE_ODBC=$(USE_ODBC) USE_OPENGL=$(USE_OPENGL) VENDOR=$(VENDOR) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -9382,7 +9384,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_wa
        @%append $(OBJS)\advdll.lbc option incremental
        @%append $(OBJS)\advdll.lbc $(LDFLAGS) $(__DEBUGINFO_10)  libpath $(LIBDIRNAME)
        @for %i in ($(ADVDLL_OBJECTS)) do @%append $(OBJS)\advdll.lbc file %i
        @%append $(OBJS)\advdll.lbc option incremental
        @%append $(OBJS)\advdll.lbc $(LDFLAGS) $(__DEBUGINFO_10)  libpath $(LIBDIRNAME)
        @for %i in ($(ADVDLL_OBJECTS)) do @%append $(OBJS)\advdll.lbc file %i

-       @for %i in ( $(__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  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\advdll.lbc library %i
+       @for %i in ( $(__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  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\advdll.lbc library %i

        @%append $(OBJS)\advdll.lbc
        @%append $(OBJS)\advdll.lbc system nt_dll
        wlink @$(OBJS)\advdll.lbc
        @%append $(OBJS)\advdll.lbc
        @%append $(OBJS)\advdll.lbc system nt_dll
        wlink @$(OBJS)\advdll.lbc


@@ -9411,7 +9413,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll :  $(B
        @%append $(OBJS)\basedll.lbc option incremental
        @%append $(OBJS)\basedll.lbc $(LDFLAGS) $(__DEBUGINFO_10)  libpath $(LIBDIRNAME)
        @for %i in ($(BASEDLL_OBJECTS)) do @%append $(OBJS)\basedll.lbc file %i
        @%append $(OBJS)\basedll.lbc option incremental
        @%append $(OBJS)\basedll.lbc $(LDFLAGS) $(__DEBUGINFO_10)  libpath $(LIBDIRNAME)
        @for %i in ($(BASEDLL_OBJECTS)) do @%append $(OBJS)\basedll.lbc file %i

-       @for %i in ( $(__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) do @%append $(OBJS)\basedll.lbc library %i
+       @for %i in ( $(__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) do @%append $(OBJS)\basedll.lbc library %i

        @%append $(OBJS)\basedll.lbc
        @%append $(OBJS)\basedll.lbc system nt_dll
        wlink @$(OBJS)\basedll.lbc
        @%append $(OBJS)\basedll.lbc
        @%append $(OBJS)\basedll.lbc system nt_dll
        wlink @$(OBJS)\basedll.lbc


@@ -9480,7 +9482,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_w
        @%append $(OBJS)\coredll.lbc option incremental
        @%append $(OBJS)\coredll.lbc $(LDFLAGS) $(__DEBUGINFO_10)  libpath $(LIBDIRNAME)
        @for %i in ($(COREDLL_OBJECTS)) do @%append $(OBJS)\coredll.lbc file %i
        @%append $(OBJS)\coredll.lbc option incremental
        @%append $(OBJS)\coredll.lbc $(LDFLAGS) $(__DEBUGINFO_10)  libpath $(LIBDIRNAME)
        @for %i in ($(COREDLL_OBJECTS)) do @%append $(OBJS)\coredll.lbc file %i

-       @for %i in ( $(__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  $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\coredll.lbc library %i
+       @for %i in ( $(__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  $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\coredll.lbc library %i

        @%append $(OBJS)\coredll.lbc
        @%append $(OBJS)\coredll.lbc system nt_dll
        wlink @$(OBJS)\coredll.lbc
        @%append $(OBJS)\coredll.lbc
        @%append $(OBJS)\coredll.lbc system nt_dll
        wlink @$(OBJS)\coredll.lbc


@@ -9511,7 +9513,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid
        @%append $(OBJS)\dbgriddll.lbc option incremental
        @%append $(OBJS)\dbgriddll.lbc $(LDFLAGS) $(__DEBUGINFO_10)  libpath $(LIBDIRNAME)
        @for %i in ($(DBGRIDDLL_OBJECTS)) do @%append $(OBJS)\dbgriddll.lbc file %i
        @%append $(OBJS)\dbgriddll.lbc option incremental
        @%append $(OBJS)\dbgriddll.lbc $(LDFLAGS) $(__DEBUGINFO_10)  libpath $(LIBDIRNAME)
        @for %i in ($(DBGRIDDLL_OBJECTS)) do @%append $(OBJS)\dbgriddll.lbc file %i

-       @for %i in ( $(__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  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\dbgriddll.lbc library %i
+       @for %i in ( $(__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  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\dbgriddll.lbc library %i

        @%append $(OBJS)\dbgriddll.lbc
        @%append $(OBJS)\dbgriddll.lbc system nt_dll
        wlink @$(OBJS)\dbgriddll.lbc
        @%append $(OBJS)\dbgriddll.lbc
        @%append $(OBJS)\dbgriddll.lbc system nt_dll
        wlink @$(OBJS)\dbgriddll.lbc


@@ -9544,7 +9546,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_wat
        @%append $(OBJS)\gldll.lbc option incremental
        @%append $(OBJS)\gldll.lbc $(LDFLAGS) $(__DEBUGINFO_10)  libpath $(LIBDIRNAME)
        @for %i in ($(GLDLL_OBJECTS)) do @%append $(OBJS)\gldll.lbc file %i
        @%append $(OBJS)\gldll.lbc option incremental
        @%append $(OBJS)\gldll.lbc $(LDFLAGS) $(__DEBUGINFO_10)  libpath $(LIBDIRNAME)
        @for %i in ($(GLDLL_OBJECTS)) do @%append $(OBJS)\gldll.lbc file %i

-       @for %i in ( $(__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  $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib) do @%append $(OBJS)\gldll.lbc library %i
+       @for %i in ( $(__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  $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib) do @%append $(OBJS)\gldll.lbc library %i

        @%append $(OBJS)\gldll.lbc
        @%append $(OBJS)\gldll.lbc system nt_dll
        wlink @$(OBJS)\gldll.lbc
        @%append $(OBJS)\gldll.lbc
        @%append $(OBJS)\gldll.lbc system nt_dll
        wlink @$(OBJS)\gldll.lbc


@@ -9574,7 +9576,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_w
        @%append $(OBJS)\htmldll.lbc option incremental
        @%append $(OBJS)\htmldll.lbc $(LDFLAGS) $(__DEBUGINFO_10)  libpath $(LIBDIRNAME)
        @for %i in ($(HTMLDLL_OBJECTS)) do @%append $(OBJS)\htmldll.lbc file %i
        @%append $(OBJS)\htmldll.lbc option incremental
        @%append $(OBJS)\htmldll.lbc $(LDFLAGS) $(__DEBUGINFO_10)  libpath $(LIBDIRNAME)
        @for %i in ($(HTMLDLL_OBJECTS)) do @%append $(OBJS)\htmldll.lbc file %i

-       @for %i in ( $(__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  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\htmldll.lbc library %i
+       @for %i in ( $(__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  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\htmldll.lbc library %i

        @%append $(OBJS)\htmldll.lbc
        @%append $(OBJS)\htmldll.lbc system nt_dll
        wlink @$(OBJS)\htmldll.lbc
        @%append $(OBJS)\htmldll.lbc
        @%append $(OBJS)\htmldll.lbc system nt_dll
        wlink @$(OBJS)\htmldll.lbc


@@ -9609,7 +9611,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(V
        @%append $(OBJS)\monodll.lbc option incremental
        @%append $(OBJS)\monodll.lbc $(LDFLAGS) $(__DEBUGINFO_10)  libpath $(LIBDIRNAME)
        @for %i in ($(MONODLL_OBJECTS)) do @%append $(OBJS)\monodll.lbc file %i
        @%append $(OBJS)\monodll.lbc option incremental
        @%append $(OBJS)\monodll.lbc $(LDFLAGS) $(__DEBUGINFO_10)  libpath $(LIBDIRNAME)
        @for %i in ($(MONODLL_OBJECTS)) do @%append $(OBJS)\monodll.lbc file %i

-       @for %i in ( $(__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   ) do @%append $(OBJS)\monodll.lbc library %i
+       @for %i in ( $(__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   ) do @%append $(OBJS)\monodll.lbc library %i

        @%append $(OBJS)\monodll.lbc
        @%append $(OBJS)\monodll.lbc system nt_dll
        wlink @$(OBJS)\monodll.lbc
        @%append $(OBJS)\monodll.lbc
        @%append $(OBJS)\monodll.lbc system nt_dll
        wlink @$(OBJS)\monodll.lbc


@@ -9638,7 +9640,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll :
        @%append $(OBJS)\netdll.lbc option incremental
        @%append $(OBJS)\netdll.lbc $(LDFLAGS) $(__DEBUGINFO_10)  libpath $(LIBDIRNAME)
        @for %i in ($(NETDLL_OBJECTS)) do @%append $(OBJS)\netdll.lbc file %i
        @%append $(OBJS)\netdll.lbc option incremental
        @%append $(OBJS)\netdll.lbc $(LDFLAGS) $(__DEBUGINFO_10)  libpath $(LIBDIRNAME)
        @for %i in ($(NETDLL_OBJECTS)) do @%append $(OBJS)\netdll.lbc file %i

-       @for %i in ( $(__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 $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\netdll.lbc library %i
+       @for %i in ( $(__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 $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\netdll.lbc library %i

        @%append $(OBJS)\netdll.lbc
        @%append $(OBJS)\netdll.lbc system nt_dll
        wlink @$(OBJS)\netdll.lbc
        @%append $(OBJS)\netdll.lbc
        @%append $(OBJS)\netdll.lbc system nt_dll
        wlink @$(OBJS)\netdll.lbc


@@ -9666,7 +9668,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll :
        @%append $(OBJS)\odbcdll.lbc option incremental
        @%append $(OBJS)\odbcdll.lbc $(LDFLAGS) $(__DEBUGINFO_10)  libpath $(LIBDIRNAME)
        @for %i in ($(ODBCDLL_OBJECTS)) do @%append $(OBJS)\odbcdll.lbc file %i
        @%append $(OBJS)\odbcdll.lbc option incremental
        @%append $(OBJS)\odbcdll.lbc $(LDFLAGS) $(__DEBUGINFO_10)  libpath $(LIBDIRNAME)
        @for %i in ($(ODBCDLL_OBJECTS)) do @%append $(OBJS)\odbcdll.lbc file %i

-       @for %i in ( $(__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 $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib ) do @%append $(OBJS)\odbcdll.lbc library %i
+       @for %i in ( $(__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 $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib ) do @%append $(OBJS)\odbcdll.lbc library %i

        @%append $(OBJS)\odbcdll.lbc
        @%append $(OBJS)\odbcdll.lbc system nt_dll
        wlink @$(OBJS)\odbcdll.lbc
        @%append $(OBJS)\odbcdll.lbc
        @%append $(OBJS)\odbcdll.lbc system nt_dll
        wlink @$(OBJS)\odbcdll.lbc


@@ -9739,7 +9741,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_wat$(VENDORTAG).dll :
        @%append $(OBJS)\xmldll.lbc option incremental
        @%append $(OBJS)\xmldll.lbc $(LDFLAGS) $(__DEBUGINFO_10)  libpath $(LIBDIRNAME)
        @for %i in ($(XMLDLL_OBJECTS)) do @%append $(OBJS)\xmldll.lbc file %i
        @%append $(OBJS)\xmldll.lbc option incremental
        @%append $(OBJS)\xmldll.lbc $(LDFLAGS) $(__DEBUGINFO_10)  libpath $(LIBDIRNAME)
        @for %i in ($(XMLDLL_OBJECTS)) do @%append $(OBJS)\xmldll.lbc file %i

-       @for %i in ( $(__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 $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib ) do @%append $(OBJS)\xmldll.lbc library %i
+       @for %i in ( $(__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 $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib ) do @%append $(OBJS)\xmldll.lbc library %i

        @%append $(OBJS)\xmldll.lbc
        @%append $(OBJS)\xmldll.lbc system nt_dll
        wlink @$(OBJS)\xmldll.lbc
        @%append $(OBJS)\xmldll.lbc
        @%append $(OBJS)\xmldll.lbc system nt_dll
        wlink @$(OBJS)\xmldll.lbc

diff --git a/build/msw/wx_advdll.dsp b/build/msw/wx_advdll.dsp
index 9e06a80ecd65352753e7a08333199e43825d4158..23935d7455627a388014294b22009b63711c9d01 100644 (file)
--- a/build/msw/wx_advdll.dsp
+++ b/build/msw/wx_advdll.dsp
@@ -247,178 +247,186 @@ LINK32=link.exe
 # Name "advdll - Win32 DLL Universal Release"
 # Name "advdll - Win32 DLL Universal Unicode Debug"
 # Name "advdll - Win32 DLL Universal Unicode Release"
 # Name "advdll - Win32 DLL Universal Release"
 # Name "advdll - Win32 DLL Universal Unicode Debug"
 # Name "advdll - Win32 DLL Universal Unicode Release"

-# Begin Group "Common Headers"
+# Begin Group "Common Sources"

 
 # PROP Default_Filter ""
 # Begin Source File
 
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=..\..\include\wx\calctrl.h
+SOURCE=..\..\src\common\taskbarcmn.cpp

 # End Source File
 # End Source File

+# End Group
+# Begin Group "MSW Sources"
+
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\include\wx\dcbuffer.h
+SOURCE=..\..\src\msw\dummy.cpp
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\calctrl.h
+SOURCE=..\..\src\msw\joystick.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\grid.h
+SOURCE=..\..\src\msw\taskbar.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\gridctrl.h
+SOURCE=..\..\src\msw\wave.cpp

 # End Source File
 # End Source File

+# End Group
+# Begin Group "Generic Sources"
+
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\gridsel.h
+SOURCE=..\..\src\generic\calctrl.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\helpext.h
+SOURCE=..\..\src\generic\dcbuffer.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\laywin.h
+SOURCE=..\..\src\generic\grid.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\sashwin.h
+SOURCE=..\..\src\generic\gridctrl.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\splash.h
+SOURCE=..\..\src\generic\gridsel.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\wizard.h
+SOURCE=..\..\src\generic\helpext.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\grid.h
+SOURCE=..\..\src\generic\laywin.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\joystick.h
+SOURCE=..\..\src\generic\sashwin.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\laywin.h
+SOURCE=..\..\src\generic\splash.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\msw\joystick.h
+SOURCE=..\..\src\generic\tipdlg.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\msw\taskbar.h
+SOURCE=..\..\src\generic\wizard.cpp

 # End Source File
 # End Source File

+# End Group
+# Begin Group "MSW Headers"
+
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\include\wx\msw\wave.h
+SOURCE=..\..\include\wx\msw\joystick.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\sashwin.h
+SOURCE=..\..\include\wx\msw\taskbar.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\splash.h
+SOURCE=..\..\include\wx\msw\wave.h

 # End Source File
 # End Source File

+# End Group
+# Begin Group "Generic Headers"
+
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\include\wx\taskbar.h
+SOURCE=..\..\include\wx\generic\calctrl.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\tipdlg.h
+SOURCE=..\..\include\wx\generic\grid.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\wave.h
+SOURCE=..\..\include\wx\generic\gridctrl.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\wizard.h
+SOURCE=..\..\include\wx\generic\gridsel.h

 # End Source File
 # End Source File

-# End Group
-# Begin Group "Generic Sources"
-
-# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\generic\calctrl.cpp
+SOURCE=..\..\include\wx\generic\helpext.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\dcbuffer.cpp
+SOURCE=..\..\include\wx\generic\laywin.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\grid.cpp
+SOURCE=..\..\include\wx\generic\sashwin.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\gridctrl.cpp
+SOURCE=..\..\include\wx\generic\splash.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\gridsel.cpp
+SOURCE=..\..\include\wx\generic\wizard.h

 # End Source File
 # End Source File

+# End Group
+# Begin Group "Common Headers"
+
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\generic\helpext.cpp
+SOURCE=..\..\include\wx\calctrl.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\laywin.cpp
+SOURCE=..\..\include\wx\dcbuffer.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\sashwin.cpp
+SOURCE=..\..\include\wx\grid.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\splash.cpp
+SOURCE=..\..\include\wx\joystick.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\tipdlg.cpp
+SOURCE=..\..\include\wx\laywin.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\wizard.cpp
+SOURCE=..\..\include\wx\sashwin.h

 # End Source File
 # End Source File

-# End Group
-# Begin Group "Common Sources"
-
-# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\common\taskbarcmn.cpp
+SOURCE=..\..\include\wx\splash.h

 # End Source File
 # End Source File

-# End Group
-# Begin Group "MSW Sources"
-
-# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
+SOURCE=..\..\include\wx\taskbar.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\joystick.cpp
+SOURCE=..\..\include\wx\tipdlg.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\taskbar.cpp
+SOURCE=..\..\include\wx\wave.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\wave.cpp
+SOURCE=..\..\include\wx\wizard.h

 # End Source File
 # End Group
 # End Target
 # End Source File
 # End Group
 # End Target

diff --git a/build/msw/wx_advlib.dsp b/build/msw/wx_advlib.dsp
index 180ab4546e0cc49c2169a05b9668941436bf4791..ed5012e6772380950d7f10c0ba8a427fdf315824 100644 (file)
--- a/build/msw/wx_advlib.dsp
+++ b/build/msw/wx_advlib.dsp
@@ -230,178 +230,186 @@ LIB32=link.exe -lib
 # Name "advlib - Win32 Universal Release"
 # Name "advlib - Win32 Universal Unicode Debug"
 # Name "advlib - Win32 Universal Unicode Release"
 # Name "advlib - Win32 Universal Release"
 # Name "advlib - Win32 Universal Unicode Debug"
 # Name "advlib - Win32 Universal Unicode Release"

-# Begin Group "Common Headers"
+# Begin Group "Common Sources"

 
 # PROP Default_Filter ""
 # Begin Source File
 
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=..\..\include\wx\calctrl.h
+SOURCE=..\..\src\common\taskbarcmn.cpp

 # End Source File
 # End Source File

+# End Group
+# Begin Group "MSW Sources"
+
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\include\wx\dcbuffer.h
+SOURCE=..\..\src\msw\dummy.cpp
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\calctrl.h
+SOURCE=..\..\src\msw\joystick.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\grid.h
+SOURCE=..\..\src\msw\taskbar.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\gridctrl.h
+SOURCE=..\..\src\msw\wave.cpp

 # End Source File
 # End Source File

+# End Group
+# Begin Group "Generic Sources"
+
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\gridsel.h
+SOURCE=..\..\src\generic\calctrl.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\helpext.h
+SOURCE=..\..\src\generic\dcbuffer.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\laywin.h
+SOURCE=..\..\src\generic\grid.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\sashwin.h
+SOURCE=..\..\src\generic\gridctrl.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\splash.h
+SOURCE=..\..\src\generic\gridsel.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\wizard.h
+SOURCE=..\..\src\generic\helpext.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\grid.h
+SOURCE=..\..\src\generic\laywin.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\joystick.h
+SOURCE=..\..\src\generic\sashwin.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\laywin.h
+SOURCE=..\..\src\generic\splash.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\msw\joystick.h
+SOURCE=..\..\src\generic\tipdlg.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\msw\taskbar.h
+SOURCE=..\..\src\generic\wizard.cpp

 # End Source File
 # End Source File

+# End Group
+# Begin Group "MSW Headers"
+
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\include\wx\msw\wave.h
+SOURCE=..\..\include\wx\msw\joystick.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\sashwin.h
+SOURCE=..\..\include\wx\msw\taskbar.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\splash.h
+SOURCE=..\..\include\wx\msw\wave.h

 # End Source File
 # End Source File

+# End Group
+# Begin Group "Generic Headers"
+
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\include\wx\taskbar.h
+SOURCE=..\..\include\wx\generic\calctrl.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\tipdlg.h
+SOURCE=..\..\include\wx\generic\grid.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\wave.h
+SOURCE=..\..\include\wx\generic\gridctrl.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\wizard.h
+SOURCE=..\..\include\wx\generic\gridsel.h

 # End Source File
 # End Source File

-# End Group
-# Begin Group "Generic Sources"
-
-# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\generic\calctrl.cpp
+SOURCE=..\..\include\wx\generic\helpext.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\dcbuffer.cpp
+SOURCE=..\..\include\wx\generic\laywin.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\grid.cpp
+SOURCE=..\..\include\wx\generic\sashwin.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\gridctrl.cpp
+SOURCE=..\..\include\wx\generic\splash.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\gridsel.cpp
+SOURCE=..\..\include\wx\generic\wizard.h

 # End Source File
 # End Source File

+# End Group
+# Begin Group "Common Headers"
+
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\generic\helpext.cpp
+SOURCE=..\..\include\wx\calctrl.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\laywin.cpp
+SOURCE=..\..\include\wx\dcbuffer.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\sashwin.cpp
+SOURCE=..\..\include\wx\grid.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\splash.cpp
+SOURCE=..\..\include\wx\joystick.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\tipdlg.cpp
+SOURCE=..\..\include\wx\laywin.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\wizard.cpp
+SOURCE=..\..\include\wx\sashwin.h

 # End Source File
 # End Source File

-# End Group
-# Begin Group "Common Sources"
-
-# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\common\taskbarcmn.cpp
+SOURCE=..\..\include\wx\splash.h

 # End Source File
 # End Source File

-# End Group
-# Begin Group "MSW Sources"
-
-# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
+SOURCE=..\..\include\wx\taskbar.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\joystick.cpp
+SOURCE=..\..\include\wx\tipdlg.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\taskbar.cpp
+SOURCE=..\..\include\wx\wave.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\wave.cpp
+SOURCE=..\..\include\wx\wizard.h

 # End Source File
 # End Group
 # End Target
 # End Source File
 # End Group
 # End Target

diff --git a/build/msw/wx_basedll.dsp b/build/msw/wx_basedll.dsp
index e9d509ace15e8c3d106436408753179984896dfa..fe8e8df5c672df73f4f18919455f291f94de2261 100644 (file)
--- a/build/msw/wx_basedll.dsp
+++ b/build/msw/wx_basedll.dsp
@@ -47,12 +47,12 @@ RSC=rc.exe
 # PROP Output_Dir "..\..\lib\vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\basedll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\basedll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswddll\wxbase250d_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswddll\wxbase250d_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswddll\wxbase250d_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswddll\wxbase250d_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -72,12 +72,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\basedll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\basedll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_basedll.pch" /Fd..\..\lib\vc_mswdll\wxbase250_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_basedll.pch" /Fd..\..\lib\vc_mswdll\wxbase250_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_mswdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_mswdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_basedll.pch" /Fd..\..\lib\vc_mswdll\wxbase250_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_basedll.pch" /Fd..\..\lib\vc_mswdll\wxbase250_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_mswdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
+# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_mswdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -97,12 +97,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\basedll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\basedll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswuddll\wxbase250ud_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswuddll\wxbase250ud_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswuddll\wxbase250ud_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswuddll\wxbase250ud_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -122,12 +122,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\basedll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\basedll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_basedll.pch" /Fd..\..\lib\vc_mswudll\wxbase250u_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_basedll.pch" /Fd..\..\lib\vc_mswudll\wxbase250u_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_basedll.pch" /Fd..\..\lib\vc_mswudll\wxbase250u_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_basedll.pch" /Fd..\..\lib\vc_mswudll\wxbase250u_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -147,12 +147,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\basedll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\basedll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivddll\wxbase250d_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivddll\wxbase250d_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswunivddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswunivddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivddll\wxbase250d_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivddll\wxbase250d_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswunivddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswunivddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -172,12 +172,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\basedll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\basedll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_basedll.pch" /Fd..\..\lib\vc_mswunivdll\wxbase250_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_basedll.pch" /Fd..\..\lib\vc_mswunivdll\wxbase250_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_mswunivdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_mswunivdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_basedll.pch" /Fd..\..\lib\vc_mswunivdll\wxbase250_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_basedll.pch" /Fd..\..\lib\vc_mswunivdll\wxbase250_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_mswunivdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_mswunivdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -197,12 +197,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\basedll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\basedll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivuddll\wxbase250ud_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivuddll\wxbase250ud_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivuddll\wxbase250ud_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_basedll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivuddll\wxbase250ud_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -222,12 +222,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\basedll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\basedll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_basedll.pch" /Fd..\..\lib\vc_mswunivudll\wxbase250u_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_basedll.pch" /Fd..\..\lib\vc_mswunivudll\wxbase250u_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1 /d wxUSE_GUI=0
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_basedll.pch" /Fd..\..\lib\vc_mswunivudll\wxbase250u_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_basedll.pch" /Fd..\..\lib\vc_mswunivudll\wxbase250u_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -247,324 +247,388 @@ LINK32=link.exe
 # Name "basedll - Win32 DLL Universal Release"
 # Name "basedll - Win32 DLL Universal Unicode Debug"
 # Name "basedll - Win32 DLL Universal Unicode Release"
 # Name "basedll - Win32 DLL Universal Release"
 # Name "basedll - Win32 DLL Universal Unicode Debug"
 # Name "basedll - Win32 DLL Universal Unicode Release"

-# Begin Group "Setup Headers"
+# Begin Group "Common Sources"

 
 # PROP Default_Filter ""
 # Begin Source File
 
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=..\..\include\wx\msw\setup.h
-
-!IF  "$(CFG)" == "basedll - Win32 DLL Debug"
-
-# Begin Custom Build - Creating ..\..\lib\vc_mswddll\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_mswddll\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_mswddll\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "basedll - Win32 DLL Release"
-
-# Begin Custom Build - Creating ..\..\lib\vc_mswdll\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_mswdll\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_mswdll\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "basedll - Win32 DLL Unicode Debug"
-
-# Begin Custom Build - Creating ..\..\lib\vc_mswuddll\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_mswuddll\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_mswuddll\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "basedll - Win32 DLL Unicode Release"
-
-# Begin Custom Build - Creating ..\..\lib\vc_mswudll\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_mswudll\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_mswudll\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "basedll - Win32 DLL Universal Debug"
+SOURCE=..\..\src\common\appbase.cpp
+# End Source File
+# Begin Source File

 
 

-# Begin Custom Build - Creating ..\..\lib\vc_mswunivddll\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+SOURCE=..\..\src\common\clntdata.cpp
+# End Source File
+# Begin Source File

 
 

-"..\..\lib\vc_mswunivddll\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_mswunivddll\wx\setup.h
+SOURCE=..\..\src\common\cmdline.cpp
+# End Source File
+# Begin Source File

 
 

-# End Custom Build
+SOURCE=..\..\src\common\config.cpp
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "basedll - Win32 DLL Universal Release"
+SOURCE=..\..\src\common\datetime.cpp
+# End Source File
+# Begin Source File

 
 

-# Begin Custom Build - Creating ..\..\lib\vc_mswunivdll\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+SOURCE=..\..\src\common\datstrm.cpp
+# End Source File
+# Begin Source File

 
 

-"..\..\lib\vc_mswunivdll\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_mswunivdll\wx\setup.h
+SOURCE=..\..\src\common\dircmn.cpp
+# End Source File
+# Begin Source File

 
 

-# End Custom Build
+SOURCE=..\..\src\common\dynarray.cpp
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "basedll - Win32 DLL Universal Unicode Debug"
+SOURCE=..\..\src\common\dynlib.cpp
+# End Source File
+# Begin Source File

 
 

-# Begin Custom Build - Creating ..\..\lib\vc_mswunivuddll\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+SOURCE=..\..\src\common\dynload.cpp
+# End Source File
+# Begin Source File

 
 

-"..\..\lib\vc_mswunivuddll\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_mswunivuddll\wx\setup.h
+SOURCE=..\..\src\common\encconv.cpp
+# End Source File
+# Begin Source File

 
 

-# End Custom Build
+SOURCE=..\..\src\common\event.cpp
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "basedll - Win32 DLL Universal Unicode Release"
+SOURCE=..\..\src\common\extended.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File

 
 

-# Begin Custom Build - Creating ..\..\lib\vc_mswunivudll\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+SOURCE=..\..\src\common\ffile.cpp
+# End Source File
+# Begin Source File

 
 

-"..\..\lib\vc_mswunivudll\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_mswunivudll\wx\setup.h
+SOURCE=..\..\src\common\file.cpp
+# End Source File
+# Begin Source File

 
 

-# End Custom Build
+SOURCE=..\..\src\common\fileconf.cpp
+# End Source File
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\src\common\filefn.cpp
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\common\filename.cpp

 # End Source File
 # End Source File

-# End Group
-# Begin Group "Common Headers"
+# Begin Source File

 
 

-# PROP Default_Filter ""
+SOURCE=..\..\src\common\filesys.cpp
+# End Source File

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\include\wx\app.h
+SOURCE=..\..\src\common\fmapbase.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\apptrait.h
+SOURCE=..\..\src\common\fs_mem.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\arrstr.h
+SOURCE=..\..\src\common\fs_zip.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\beforestd.h
+SOURCE=..\..\src\common\hash.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\buffer.h
+SOURCE=..\..\src\common\hashmap.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\build.h
+SOURCE=..\..\src\common\init.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\chkconf.h
+SOURCE=..\..\src\common\intl.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\clntdata.h
+SOURCE=..\..\src\common\ipcbase.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\cmdline.h
+SOURCE=..\..\src\common\list.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\confbase.h
+SOURCE=..\..\src\common\log.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\config.h
+SOURCE=..\..\src\common\longlong.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\containr.h
+SOURCE=..\..\src\common\memory.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\datetime.h
+SOURCE=..\..\src\common\mimecmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\datstrm.h
+SOURCE=..\..\src\common\module.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dde.h
+SOURCE=..\..\src\common\msgout.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\debug.h
+SOURCE=..\..\src\common\mstream.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\defs.h
+SOURCE=..\..\src\common\object.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dir.h
+SOURCE=..\..\src\common\process.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dynarray.h
+SOURCE=..\..\src\common\regex.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dynlib.h
+SOURCE=..\..\src\common\stopwatch.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dynload.h
+SOURCE=..\..\src\common\strconv.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\encconv.h
+SOURCE=..\..\src\common\stream.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\event.h
+SOURCE=..\..\src\common\string.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\features.h
+SOURCE=..\..\src\common\sysopt.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\ffile.h
+SOURCE=..\..\src\common\textbuf.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\file.h
+SOURCE=..\..\src\common\textfile.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\fileconf.h
+SOURCE=..\..\src\common\tokenzr.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\filefn.h
+SOURCE=..\..\src\common\txtstrm.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\filename.h
+SOURCE=..\..\src\common\unzip.c
+# SUBTRACT CPP /YX /Yc /Yu

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\filesys.h
+SOURCE=..\..\src\common\utilscmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\fontenc.h
+SOURCE=..\..\src\common\variant.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\fontmap.h
+SOURCE=..\..\src\common\wfstream.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\fs_mem.h
+SOURCE=..\..\src\common\wxchar.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\fs_zip.h
+SOURCE=..\..\src\common\zipstrm.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\hash.h
+SOURCE=..\..\src\common\zstream.cpp

 # End Source File
 # End Source File

+# End Group
+# Begin Group "MSW Sources"
+
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\include\wx\hashmap.h
+SOURCE=..\..\src\msw\basemsw.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\iconloc.h
+SOURCE=..\..\src\msw\crashrpt.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\init.h
+SOURCE=..\..\src\msw\dde.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\intl.h
+SOURCE=..\..\src\msw\dir.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\iosfwrap.h
+SOURCE=..\..\src\msw\dummy.cpp
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\ioswrap.h
+SOURCE=..\..\src\msw\main.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\ipc.h
+SOURCE=..\..\src\msw\mimetype.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\ipcbase.h
+SOURCE=..\..\src\msw\mslu.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\isql.h
+SOURCE=..\..\src\msw\regconf.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\isqlext.h
+SOURCE=..\..\src\msw\registry.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\list.h
+SOURCE=..\..\src\msw\snglinst.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\log.h
+SOURCE=..\..\src\msw\thread.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\longlong.h
+SOURCE=..\..\src\msw\utils.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\math.h
+SOURCE=..\..\src\msw\utilsexc.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\memconf.h
+SOURCE=..\..\src\msw\volume.cpp

 # End Source File
 # End Source File

+# End Group
+# Begin Group "Setup Headers"
+
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\include\wx\memory.h
-# End Source File
-# Begin Source File
+SOURCE=..\..\include\wx\msw\setup.h
+
+!IF  "$(CFG)" == "basedll - Win32 DLL Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_mswddll\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_mswddll\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_mswddll\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "basedll - Win32 DLL Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_mswdll\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_mswdll\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_mswdll\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "basedll - Win32 DLL Unicode Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_mswuddll\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_mswuddll\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_mswuddll\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "basedll - Win32 DLL Unicode Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_mswudll\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_mswudll\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_mswudll\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "basedll - Win32 DLL Universal Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_mswunivddll\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_mswunivddll\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_mswunivddll\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "basedll - Win32 DLL Universal Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_mswunivdll\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_mswunivdll\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_mswunivdll\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "basedll - Win32 DLL Universal Unicode Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_mswunivuddll\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_mswunivuddll\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_mswunivuddll\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "basedll - Win32 DLL Universal Unicode Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_mswunivudll\wx\setup.h
+InputPath=..\include\wx\msw\setup.h

 
 

-SOURCE=..\..\include\wx\memtext.h
-# End Source File
-# Begin Source File
+"..\..\lib\vc_mswunivudll\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_mswunivudll\wx\setup.h

 
 

-SOURCE=..\..\include\wx\mimetype.h
-# End Source File
-# Begin Source File
+# End Custom Build

 
 

-SOURCE=..\..\include\wx\module.h
-# End Source File
-# Begin Source File
+!ENDIF

 
 

-SOURCE=..\..\include\wx\msgout.h

 # End Source File
 # End Source File

-# Begin Source File
+# End Group
+# Begin Group "MSW Headers"

 
 

-SOURCE=..\..\include\wx\mstream.h
-# End Source File
+# PROP Default_Filter ""

 # Begin Source File
 
 SOURCE=..\..\include\wx\msw\chkconf.h
 # Begin Source File
 
 SOURCE=..\..\include\wx\msw\chkconf.h


@@ -597,401 +661,341 @@ SOURCE=..\..\include\wx\msw\wrapcctl.h
 
 SOURCE=..\..\include\wx\msw\wrapwin.h
 # End Source File
 
 SOURCE=..\..\include\wx\msw\wrapwin.h
 # End Source File

-# Begin Source File
-
-SOURCE=..\..\include\wx\object.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\platform.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\process.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\regex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\snglinst.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\stopwatch.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\strconv.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\stream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\string.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\sysopt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\textbuf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\textfile.h
-# End Source File
-# Begin Source File
+# End Group
+# Begin Group "Common Headers"

 
 

-SOURCE=..\..\include\wx\thread.h
-# End Source File
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\include\wx\tokenzr.h
+SOURCE=..\..\include\wx\app.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\txtstrm.h
+SOURCE=..\..\include\wx\apptrait.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\types.h
+SOURCE=..\..\include\wx\arrstr.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\utils.h
+SOURCE=..\..\include\wx\beforestd.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\variant.h
+SOURCE=..\..\include\wx\buffer.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\vector.h
+SOURCE=..\..\include\wx\build.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\version.h
+SOURCE=..\..\include\wx\chkconf.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\volume.h
+SOURCE=..\..\include\wx\clntdata.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\wfstream.h
+SOURCE=..\..\include\wx\cmdline.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\wx.h
+SOURCE=..\..\include\wx\confbase.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\wxchar.h
+SOURCE=..\..\include\wx\config.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\wxprec.h
+SOURCE=..\..\include\wx\containr.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\zipstrm.h
+SOURCE=..\..\include\wx\datetime.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\zstream.h
+SOURCE=..\..\include\wx\datstrm.h

 # End Source File
 # End Source File

-# End Group
-# Begin Group "Common Sources"
-
-# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\common\appbase.cpp
+SOURCE=..\..\include\wx\dde.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\clntdata.cpp
+SOURCE=..\..\include\wx\debug.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\cmdline.cpp
+SOURCE=..\..\include\wx\defs.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\config.cpp
+SOURCE=..\..\include\wx\dir.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\datetime.cpp
+SOURCE=..\..\include\wx\dynarray.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\datstrm.cpp
+SOURCE=..\..\include\wx\dynlib.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\dircmn.cpp
+SOURCE=..\..\include\wx\dynload.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\dynarray.cpp
+SOURCE=..\..\include\wx\encconv.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\dynlib.cpp
+SOURCE=..\..\include\wx\event.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\dynload.cpp
+SOURCE=..\..\include\wx\features.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\encconv.cpp
+SOURCE=..\..\include\wx\ffile.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\event.cpp
+SOURCE=..\..\include\wx\file.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\extended.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=..\..\include\wx\fileconf.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\ffile.cpp
+SOURCE=..\..\include\wx\filefn.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\file.cpp
+SOURCE=..\..\include\wx\filename.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\fileconf.cpp
+SOURCE=..\..\include\wx\filesys.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\filefn.cpp
+SOURCE=..\..\include\wx\fontenc.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\filename.cpp
+SOURCE=..\..\include\wx\fontmap.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\filesys.cpp
+SOURCE=..\..\include\wx\fs_mem.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\fmapbase.cpp
+SOURCE=..\..\include\wx\fs_zip.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\fs_mem.cpp
+SOURCE=..\..\include\wx\hash.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\fs_zip.cpp
+SOURCE=..\..\include\wx\hashmap.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\hash.cpp
+SOURCE=..\..\include\wx\iconloc.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\hashmap.cpp
+SOURCE=..\..\include\wx\init.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\init.cpp
+SOURCE=..\..\include\wx\intl.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\intl.cpp
+SOURCE=..\..\include\wx\iosfwrap.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\ipcbase.cpp
+SOURCE=..\..\include\wx\ioswrap.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\list.cpp
+SOURCE=..\..\include\wx\ipc.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\log.cpp
+SOURCE=..\..\include\wx\ipcbase.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\longlong.cpp
+SOURCE=..\..\include\wx\isql.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\memory.cpp
+SOURCE=..\..\include\wx\isqlext.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\mimecmn.cpp
+SOURCE=..\..\include\wx\list.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\module.cpp
+SOURCE=..\..\include\wx\log.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\msgout.cpp
+SOURCE=..\..\include\wx\longlong.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\mstream.cpp
+SOURCE=..\..\include\wx\math.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\object.cpp
+SOURCE=..\..\include\wx\memconf.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\process.cpp
+SOURCE=..\..\include\wx\memory.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\regex.cpp
+SOURCE=..\..\include\wx\memtext.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\stopwatch.cpp
+SOURCE=..\..\include\wx\mimetype.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\strconv.cpp
+SOURCE=..\..\include\wx\module.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\stream.cpp
+SOURCE=..\..\include\wx\msgout.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\string.cpp
+SOURCE=..\..\include\wx\mstream.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\sysopt.cpp
+SOURCE=..\..\include\wx\object.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\textbuf.cpp
+SOURCE=..\..\include\wx\platform.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\textfile.cpp
+SOURCE=..\..\include\wx\process.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\tokenzr.cpp
+SOURCE=..\..\include\wx\regex.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\txtstrm.cpp
+SOURCE=..\..\include\wx\snglinst.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\unzip.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=..\..\include\wx\stopwatch.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\utilscmn.cpp
+SOURCE=..\..\include\wx\strconv.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\variant.cpp
+SOURCE=..\..\include\wx\stream.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\wfstream.cpp
+SOURCE=..\..\include\wx\string.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\wxchar.cpp
+SOURCE=..\..\include\wx\sysopt.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\zipstrm.cpp
+SOURCE=..\..\include\wx\textbuf.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\zstream.cpp
+SOURCE=..\..\include\wx\textfile.h

 # End Source File
 # End Source File

-# End Group
-# Begin Group "MSW Sources"
-
-# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\msw\basemsw.cpp
+SOURCE=..\..\include\wx\thread.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\crashrpt.cpp
+SOURCE=..\..\include\wx\tokenzr.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\dde.cpp
+SOURCE=..\..\include\wx\txtstrm.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\dir.cpp
+SOURCE=..\..\include\wx\types.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
+SOURCE=..\..\include\wx\utils.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\main.cpp
+SOURCE=..\..\include\wx\variant.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\mimetype.cpp
+SOURCE=..\..\include\wx\vector.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\mslu.cpp
+SOURCE=..\..\include\wx\version.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\regconf.cpp
+SOURCE=..\..\include\wx\volume.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\registry.cpp
+SOURCE=..\..\include\wx\wfstream.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\snglinst.cpp
+SOURCE=..\..\include\wx\wx.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\thread.cpp
+SOURCE=..\..\include\wx\wxchar.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\utils.cpp
+SOURCE=..\..\include\wx\wxprec.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\utilsexc.cpp
+SOURCE=..\..\include\wx\zipstrm.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\volume.cpp
+SOURCE=..\..\include\wx\zstream.h

 # End Source File
 # End Group
 # End Target
 # End Source File
 # End Group
 # End Target

diff --git a/build/msw/wx_baselib.dsp b/build/msw/wx_baselib.dsp
index daadfe98f2253a6d3a24bad06a7c4c4abe7f07f9..d8141668dc5ec5591257eeb13dc3d082f5a44b65 100644 (file)
--- a/build/msw/wx_baselib.dsp
+++ b/build/msw/wx_baselib.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
 # PROP Output_Dir "..\..\lib\vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\baselib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\baselib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -69,8 +69,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_msw"
 # PROP Intermediate_Dir "vc_msw\baselib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_msw"
 # PROP Intermediate_Dir "vc_msw\baselib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_msw" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_msw\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_msw" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_msw\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_msw" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_msw\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_msw" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_msw\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -92,8 +92,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\baselib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\baselib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -115,8 +115,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\baselib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\baselib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -138,8 +138,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\baselib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\baselib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivd\wxbase25d.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -161,8 +161,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\baselib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\baselib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswuniv" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswuniv\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswuniv" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswuniv\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswuniv" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswuniv\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswuniv" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswuniv\wxbase25.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -184,8 +184,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\baselib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\baselib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivud\wxbase25ud.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -207,8 +207,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\baselib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\baselib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswunivu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswunivu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_BASE=1 /D wxUSE_GUI=0 /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswunivu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswunivu\wxbase25u.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_baselib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D wxUSE_BASE=1 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -230,324 +230,388 @@ LIB32=link.exe -lib
 # Name "baselib - Win32 Universal Release"
 # Name "baselib - Win32 Universal Unicode Debug"
 # Name "baselib - Win32 Universal Unicode Release"
 # Name "baselib - Win32 Universal Release"
 # Name "baselib - Win32 Universal Unicode Debug"
 # Name "baselib - Win32 Universal Unicode Release"

-# Begin Group "Setup Headers"
+# Begin Group "Common Sources"

 
 # PROP Default_Filter ""
 # Begin Source File
 
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=..\..\include\wx\msw\setup.h
-
-!IF  "$(CFG)" == "baselib - Win32 Debug"
-
-# Begin Custom Build - Creating ..\..\lib\vc_mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_mswd\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "baselib - Win32 Release"
-
-# Begin Custom Build - Creating ..\..\lib\vc_msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_msw\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "baselib - Win32 Unicode Debug"
-
-# Begin Custom Build - Creating ..\..\lib\vc_mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_mswud\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "baselib - Win32 Unicode Release"
-
-# Begin Custom Build - Creating ..\..\lib\vc_mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_mswu\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "baselib - Win32 Universal Debug"
+SOURCE=..\..\src\common\appbase.cpp
+# End Source File
+# Begin Source File

 
 

-# Begin Custom Build - Creating ..\..\lib\vc_mswunivd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+SOURCE=..\..\src\common\clntdata.cpp
+# End Source File
+# Begin Source File

 
 

-"..\..\lib\vc_mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_mswunivd\wx\setup.h
+SOURCE=..\..\src\common\cmdline.cpp
+# End Source File
+# Begin Source File

 
 

-# End Custom Build
+SOURCE=..\..\src\common\config.cpp
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "baselib - Win32 Universal Release"
+SOURCE=..\..\src\common\datetime.cpp
+# End Source File
+# Begin Source File

 
 

-# Begin Custom Build - Creating ..\..\lib\vc_mswuniv\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+SOURCE=..\..\src\common\datstrm.cpp
+# End Source File
+# Begin Source File

 
 

-"..\..\lib\vc_mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_mswuniv\wx\setup.h
+SOURCE=..\..\src\common\dircmn.cpp
+# End Source File
+# Begin Source File

 
 

-# End Custom Build
+SOURCE=..\..\src\common\dynarray.cpp
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "baselib - Win32 Universal Unicode Debug"
+SOURCE=..\..\src\common\dynlib.cpp
+# End Source File
+# Begin Source File

 
 

-# Begin Custom Build - Creating ..\..\lib\vc_mswunivud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+SOURCE=..\..\src\common\dynload.cpp
+# End Source File
+# Begin Source File

 
 

-"..\..\lib\vc_mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_mswunivud\wx\setup.h
+SOURCE=..\..\src\common\encconv.cpp
+# End Source File
+# Begin Source File

 
 

-# End Custom Build
+SOURCE=..\..\src\common\event.cpp
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "baselib - Win32 Universal Unicode Release"
+SOURCE=..\..\src\common\extended.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File

 
 

-# Begin Custom Build - Creating ..\..\lib\vc_mswunivu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+SOURCE=..\..\src\common\ffile.cpp
+# End Source File
+# Begin Source File

 
 

-"..\..\lib\vc_mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_mswunivu\wx\setup.h
+SOURCE=..\..\src\common\file.cpp
+# End Source File
+# Begin Source File

 
 

-# End Custom Build
+SOURCE=..\..\src\common\fileconf.cpp
+# End Source File
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\src\common\filefn.cpp
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\src\common\filename.cpp

 # End Source File
 # End Source File

-# End Group
-# Begin Group "Common Headers"
+# Begin Source File

 
 

-# PROP Default_Filter ""
+SOURCE=..\..\src\common\filesys.cpp
+# End Source File

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\include\wx\app.h
+SOURCE=..\..\src\common\fmapbase.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\apptrait.h
+SOURCE=..\..\src\common\fs_mem.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\arrstr.h
+SOURCE=..\..\src\common\fs_zip.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\beforestd.h
+SOURCE=..\..\src\common\hash.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\buffer.h
+SOURCE=..\..\src\common\hashmap.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\build.h
+SOURCE=..\..\src\common\init.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\chkconf.h
+SOURCE=..\..\src\common\intl.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\clntdata.h
+SOURCE=..\..\src\common\ipcbase.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\cmdline.h
+SOURCE=..\..\src\common\list.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\confbase.h
+SOURCE=..\..\src\common\log.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\config.h
+SOURCE=..\..\src\common\longlong.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\containr.h
+SOURCE=..\..\src\common\memory.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\datetime.h
+SOURCE=..\..\src\common\mimecmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\datstrm.h
+SOURCE=..\..\src\common\module.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dde.h
+SOURCE=..\..\src\common\msgout.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\debug.h
+SOURCE=..\..\src\common\mstream.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\defs.h
+SOURCE=..\..\src\common\object.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dir.h
+SOURCE=..\..\src\common\process.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dynarray.h
+SOURCE=..\..\src\common\regex.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dynlib.h
+SOURCE=..\..\src\common\stopwatch.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dynload.h
+SOURCE=..\..\src\common\strconv.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\encconv.h
+SOURCE=..\..\src\common\stream.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\event.h
+SOURCE=..\..\src\common\string.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\features.h
+SOURCE=..\..\src\common\sysopt.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\ffile.h
+SOURCE=..\..\src\common\textbuf.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\file.h
+SOURCE=..\..\src\common\textfile.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\fileconf.h
+SOURCE=..\..\src\common\tokenzr.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\filefn.h
+SOURCE=..\..\src\common\txtstrm.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\filename.h
+SOURCE=..\..\src\common\unzip.c
+# SUBTRACT CPP /YX /Yc /Yu

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\filesys.h
+SOURCE=..\..\src\common\utilscmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\fontenc.h
+SOURCE=..\..\src\common\variant.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\fontmap.h
+SOURCE=..\..\src\common\wfstream.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\fs_mem.h
+SOURCE=..\..\src\common\wxchar.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\fs_zip.h
+SOURCE=..\..\src\common\zipstrm.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\hash.h
+SOURCE=..\..\src\common\zstream.cpp

 # End Source File
 # End Source File

+# End Group
+# Begin Group "MSW Sources"
+
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\include\wx\hashmap.h
+SOURCE=..\..\src\msw\basemsw.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\iconloc.h
+SOURCE=..\..\src\msw\crashrpt.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\init.h
+SOURCE=..\..\src\msw\dde.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\intl.h
+SOURCE=..\..\src\msw\dir.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\iosfwrap.h
+SOURCE=..\..\src\msw\dummy.cpp
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\ioswrap.h
+SOURCE=..\..\src\msw\main.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\ipc.h
+SOURCE=..\..\src\msw\mimetype.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\ipcbase.h
+SOURCE=..\..\src\msw\mslu.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\isql.h
+SOURCE=..\..\src\msw\regconf.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\isqlext.h
+SOURCE=..\..\src\msw\registry.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\list.h
+SOURCE=..\..\src\msw\snglinst.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\log.h
+SOURCE=..\..\src\msw\thread.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\longlong.h
+SOURCE=..\..\src\msw\utils.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\math.h
+SOURCE=..\..\src\msw\utilsexc.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\memconf.h
+SOURCE=..\..\src\msw\volume.cpp

 # End Source File
 # End Source File

+# End Group
+# Begin Group "Setup Headers"
+
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\include\wx\memory.h
-# End Source File
-# Begin Source File
+SOURCE=..\..\include\wx\msw\setup.h
+
+!IF  "$(CFG)" == "baselib - Win32 Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_mswd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_mswd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "baselib - Win32 Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "baselib - Win32 Unicode Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_mswud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "baselib - Win32 Unicode Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "baselib - Win32 Universal Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_mswunivd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_mswunivd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "baselib - Win32 Universal Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_mswuniv\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_mswuniv\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "baselib - Win32 Universal Unicode Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_mswunivud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_mswunivud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "baselib - Win32 Universal Unicode Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_mswunivu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h

 
 

-SOURCE=..\..\include\wx\memtext.h
-# End Source File
-# Begin Source File
+"..\..\lib\vc_mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_mswunivu\wx\setup.h

 
 

-SOURCE=..\..\include\wx\mimetype.h
-# End Source File
-# Begin Source File
+# End Custom Build

 
 

-SOURCE=..\..\include\wx\module.h
-# End Source File
-# Begin Source File
+!ENDIF

 
 

-SOURCE=..\..\include\wx\msgout.h

 # End Source File
 # End Source File

-# Begin Source File
+# End Group
+# Begin Group "MSW Headers"

 
 

-SOURCE=..\..\include\wx\mstream.h
-# End Source File
+# PROP Default_Filter ""

 # Begin Source File
 
 SOURCE=..\..\include\wx\msw\chkconf.h
 # Begin Source File
 
 SOURCE=..\..\include\wx\msw\chkconf.h


@@ -580,401 +644,341 @@ SOURCE=..\..\include\wx\msw\wrapcctl.h
 
 SOURCE=..\..\include\wx\msw\wrapwin.h
 # End Source File
 
 SOURCE=..\..\include\wx\msw\wrapwin.h
 # End Source File

-# Begin Source File
-
-SOURCE=..\..\include\wx\object.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\platform.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\process.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\regex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\snglinst.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\stopwatch.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\strconv.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\stream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\string.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\sysopt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\textbuf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\textfile.h
-# End Source File
-# Begin Source File
+# End Group
+# Begin Group "Common Headers"

 
 

-SOURCE=..\..\include\wx\thread.h
-# End Source File
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\include\wx\tokenzr.h
+SOURCE=..\..\include\wx\app.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\txtstrm.h
+SOURCE=..\..\include\wx\apptrait.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\types.h
+SOURCE=..\..\include\wx\arrstr.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\utils.h
+SOURCE=..\..\include\wx\beforestd.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\variant.h
+SOURCE=..\..\include\wx\buffer.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\vector.h
+SOURCE=..\..\include\wx\build.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\version.h
+SOURCE=..\..\include\wx\chkconf.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\volume.h
+SOURCE=..\..\include\wx\clntdata.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\wfstream.h
+SOURCE=..\..\include\wx\cmdline.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\wx.h
+SOURCE=..\..\include\wx\confbase.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\wxchar.h
+SOURCE=..\..\include\wx\config.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\wxprec.h
+SOURCE=..\..\include\wx\containr.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\zipstrm.h
+SOURCE=..\..\include\wx\datetime.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\zstream.h
+SOURCE=..\..\include\wx\datstrm.h

 # End Source File
 # End Source File

-# End Group
-# Begin Group "Common Sources"
-
-# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\common\appbase.cpp
+SOURCE=..\..\include\wx\dde.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\clntdata.cpp
+SOURCE=..\..\include\wx\debug.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\cmdline.cpp
+SOURCE=..\..\include\wx\defs.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\config.cpp
+SOURCE=..\..\include\wx\dir.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\datetime.cpp
+SOURCE=..\..\include\wx\dynarray.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\datstrm.cpp
+SOURCE=..\..\include\wx\dynlib.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\dircmn.cpp
+SOURCE=..\..\include\wx\dynload.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\dynarray.cpp
+SOURCE=..\..\include\wx\encconv.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\dynlib.cpp
+SOURCE=..\..\include\wx\event.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\dynload.cpp
+SOURCE=..\..\include\wx\features.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\encconv.cpp
+SOURCE=..\..\include\wx\ffile.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\event.cpp
+SOURCE=..\..\include\wx\file.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\extended.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=..\..\include\wx\fileconf.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\ffile.cpp
+SOURCE=..\..\include\wx\filefn.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\file.cpp
+SOURCE=..\..\include\wx\filename.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\fileconf.cpp
+SOURCE=..\..\include\wx\filesys.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\filefn.cpp
+SOURCE=..\..\include\wx\fontenc.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\filename.cpp
+SOURCE=..\..\include\wx\fontmap.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\filesys.cpp
+SOURCE=..\..\include\wx\fs_mem.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\fmapbase.cpp
+SOURCE=..\..\include\wx\fs_zip.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\fs_mem.cpp
+SOURCE=..\..\include\wx\hash.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\fs_zip.cpp
+SOURCE=..\..\include\wx\hashmap.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\hash.cpp
+SOURCE=..\..\include\wx\iconloc.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\hashmap.cpp
+SOURCE=..\..\include\wx\init.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\init.cpp
+SOURCE=..\..\include\wx\intl.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\intl.cpp
+SOURCE=..\..\include\wx\iosfwrap.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\ipcbase.cpp
+SOURCE=..\..\include\wx\ioswrap.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\list.cpp
+SOURCE=..\..\include\wx\ipc.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\log.cpp
+SOURCE=..\..\include\wx\ipcbase.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\longlong.cpp
+SOURCE=..\..\include\wx\isql.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\memory.cpp
+SOURCE=..\..\include\wx\isqlext.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\mimecmn.cpp
+SOURCE=..\..\include\wx\list.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\module.cpp
+SOURCE=..\..\include\wx\log.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\msgout.cpp
+SOURCE=..\..\include\wx\longlong.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\mstream.cpp
+SOURCE=..\..\include\wx\math.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\object.cpp
+SOURCE=..\..\include\wx\memconf.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\process.cpp
+SOURCE=..\..\include\wx\memory.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\regex.cpp
+SOURCE=..\..\include\wx\memtext.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\stopwatch.cpp
+SOURCE=..\..\include\wx\mimetype.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\strconv.cpp
+SOURCE=..\..\include\wx\module.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\stream.cpp
+SOURCE=..\..\include\wx\msgout.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\string.cpp
+SOURCE=..\..\include\wx\mstream.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\sysopt.cpp
+SOURCE=..\..\include\wx\object.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\textbuf.cpp
+SOURCE=..\..\include\wx\platform.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\textfile.cpp
+SOURCE=..\..\include\wx\process.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\tokenzr.cpp
+SOURCE=..\..\include\wx\regex.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\txtstrm.cpp
+SOURCE=..\..\include\wx\snglinst.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\unzip.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=..\..\include\wx\stopwatch.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\utilscmn.cpp
+SOURCE=..\..\include\wx\strconv.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\variant.cpp
+SOURCE=..\..\include\wx\stream.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\wfstream.cpp
+SOURCE=..\..\include\wx\string.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\wxchar.cpp
+SOURCE=..\..\include\wx\sysopt.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\zipstrm.cpp
+SOURCE=..\..\include\wx\textbuf.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\zstream.cpp
+SOURCE=..\..\include\wx\textfile.h

 # End Source File
 # End Source File

-# End Group
-# Begin Group "MSW Sources"
-
-# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\msw\basemsw.cpp
+SOURCE=..\..\include\wx\thread.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\crashrpt.cpp
+SOURCE=..\..\include\wx\tokenzr.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\dde.cpp
+SOURCE=..\..\include\wx\txtstrm.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\dir.cpp
+SOURCE=..\..\include\wx\types.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
+SOURCE=..\..\include\wx\utils.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\main.cpp
+SOURCE=..\..\include\wx\variant.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\mimetype.cpp
+SOURCE=..\..\include\wx\vector.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\mslu.cpp
+SOURCE=..\..\include\wx\version.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\regconf.cpp
+SOURCE=..\..\include\wx\volume.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\registry.cpp
+SOURCE=..\..\include\wx\wfstream.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\snglinst.cpp
+SOURCE=..\..\include\wx\wx.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\thread.cpp
+SOURCE=..\..\include\wx\wxchar.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\utils.cpp
+SOURCE=..\..\include\wx\wxprec.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\utilsexc.cpp
+SOURCE=..\..\include\wx\zipstrm.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\volume.cpp
+SOURCE=..\..\include\wx\zstream.h

 # End Source File
 # End Group
 # End Target
 # End Source File
 # End Group
 # End Target

diff --git a/build/msw/wx_coredll.dsp b/build/msw/wx_coredll.dsp
index 19ac7dcf6968df00ac5b35c290a208874d274a2f..8f807a1704a4651aa1423900450564d61ed01589 100644 (file)
--- a/build/msw/wx_coredll.dsp
+++ b/build/msw/wx_coredll.dsp
@@ -247,1653 +247,1225 @@ LINK32=link.exe
 # Name "coredll - Win32 DLL Universal Release"
 # Name "coredll - Win32 DLL Universal Unicode Debug"
 # Name "coredll - Win32 DLL Universal Unicode Release"
 # Name "coredll - Win32 DLL Universal Release"
 # Name "coredll - Win32 DLL Universal Unicode Debug"
 # Name "coredll - Win32 DLL Universal Unicode Release"

-# Begin Group "Common Headers"
+# Begin Group "Common Sources"

 
 # PROP Default_Filter ""
 # Begin Source File
 
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=..\..\include\wx\accel.h
+SOURCE=..\..\src\common\accesscmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\access.h
+SOURCE=..\..\src\common\appcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\afterstd.h
+SOURCE=..\..\src\common\artprov.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\artprov.h
+SOURCE=..\..\src\common\artstd.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\bitmap.h
+SOURCE=..\..\src\common\bmpbase.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\bmpbuttn.h
+SOURCE=..\..\src\common\choiccmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\brush.h
+SOURCE=..\..\src\common\clipcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\busyinfo.h
+SOURCE=..\..\src\common\cmdproc.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\button.h
+SOURCE=..\..\src\common\cmndata.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\caret.h
+SOURCE=..\..\src\common\containr.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\checkbox.h
+SOURCE=..\..\src\common\cshelp.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\checklst.h
+SOURCE=..\..\src\common\ctrlcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\choicdlg.h
+SOURCE=..\..\src\common\ctrlsub.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\choice.h
+SOURCE=..\..\src\common\datacmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\clipbrd.h
+SOURCE=..\..\src\common\dcbase.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\cmdproc.h
+SOURCE=..\..\src\common\dlgcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\cmndata.h
+SOURCE=..\..\src\common\dndcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\colordlg.h
+SOURCE=..\..\src\common\dobjcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\colour.h
+SOURCE=..\..\src\common\docmdi.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\combobox.h
+SOURCE=..\..\src\common\docview.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\control.h
+SOURCE=..\..\src\common\dpycmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\cshelp.h
+SOURCE=..\..\src\common\dseldlg.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\ctrlsub.h
+SOURCE=..\..\src\common\effects.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\cursor.h
+SOURCE=..\..\src\common\event.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dataobj.h
+SOURCE=..\..\src\common\fddlgcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dc.h
+SOURCE=..\..\src\common\fldlgcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dcclient.h
+SOURCE=..\..\src\common\fontcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dcmemory.h
+SOURCE=..\..\src\common\fontmap.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dcmirror.h
+SOURCE=..\..\src\common\framecmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dcprint.h
+SOURCE=..\..\src\common\fs_mem.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dcps.h
+SOURCE=..\..\src\common\gaugecmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dcscreen.h
+SOURCE=..\..\src\common\gdicmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dialog.h
+SOURCE=..\..\src\common\geometry.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dialup.h
+SOURCE=..\..\src\common\gifdecod.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dirctrl.h
+SOURCE=..\..\src\common\helpbase.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dirdlg.h
+SOURCE=..\..\src\common\iconbndl.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\display.h
+SOURCE=..\..\src\common\imagall.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dnd.h
+SOURCE=..\..\src\common\imagbmp.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\docmdi.h
+SOURCE=..\..\src\common\image.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\docview.h
+SOURCE=..\..\src\common\imagfill.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dragimag.h
+SOURCE=..\..\src\common\imaggif.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\effects.h
+SOURCE=..\..\src\common\imagiff.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\evtloop.h
+SOURCE=..\..\src\common\imagjpeg.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\fdrepdlg.h
+SOURCE=..\..\src\common\imagpcx.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\filedlg.h
+SOURCE=..\..\src\common\imagpng.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\fmappriv.h
+SOURCE=..\..\src\common\imagpnm.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\font.h
+SOURCE=..\..\src\common\imagtiff.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\fontdlg.h
+SOURCE=..\..\src\common\imagxpm.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\fontenum.h
+SOURCE=..\..\src\common\layout.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\fontutil.h
+SOURCE=..\..\src\common\lboxcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\frame.h
+SOURCE=..\..\src\common\matrix.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\gauge.h
+SOURCE=..\..\src\common\menucmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\gdicmn.h
+SOURCE=..\..\src\common\msgout.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\gdiobj.h
+SOURCE=..\..\src\common\nbkbase.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\accel.h
+SOURCE=..\..\src\common\paper.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\choicdgg.h
+SOURCE=..\..\src\common\popupcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\colrdlgg.h
+SOURCE=..\..\src\common\prntbase.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\dcpsg.h
+SOURCE=..\..\src\common\quantize.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\dirctrlg.h
+SOURCE=..\..\src\common\radiocmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\dirdlgg.h
+SOURCE=..\..\src\common\rendcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\dragimgg.h
+SOURCE=..\..\src\common\rgncmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\fdrepdlg.h
+SOURCE=..\..\src\common\settcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\filedlgg.h
+SOURCE=..\..\src\common\sizer.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\fontdlgg.h
+SOURCE=..\..\src\common\statbar.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\imaglist.h
+SOURCE=..\..\src\common\tbarbase.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\listctrl.h
+SOURCE=..\..\src\common\textcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\logg.h
+SOURCE=..\..\src\common\timercmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\mdig.h
+SOURCE=..\..\src\common\toplvcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\msgdlgg.h
+SOURCE=..\..\src\common\treebase.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\notebook.h
+SOURCE=..\..\src\common\utilscmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\panelg.h
+SOURCE=..\..\src\common\valgen.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\prntdlgg.h
+SOURCE=..\..\src\common\validate.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\progdlgg.h
+SOURCE=..\..\src\common\valtext.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\scrolwin.h
+SOURCE=..\..\src\common\wincmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\spinctlg.h
+SOURCE=..\..\src\common\xpmdecod.cpp

 # End Source File
 # End Source File

-# Begin Source File
+# End Group
+# Begin Group "MSW Sources"

 
 

-SOURCE=..\..\include\wx\generic\splitter.h
-# End Source File
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\statusbr.h
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\accel.cpp

 
 

-SOURCE=..\..\include\wx\generic\tabg.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "coredll - Win32 DLL Debug"

 
 

-SOURCE=..\..\include\wx\generic\textdlgg.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\generic\timer.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"

 
 

-SOURCE=..\..\include\wx\generic\treectlg.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\geometry.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"

 
 

-SOURCE=..\..\include\wx\gifdecod.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\glcanvas.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"

 
 

-SOURCE=..\..\include\wx\help.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\helpbase.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"

 
 

-SOURCE=..\..\include\wx\helphtml.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\helpwin.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"

 
 

-SOURCE=..\..\include\wx\icon.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\iconbndl.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"

 
 

-SOURCE=..\..\include\wx\imagbmp.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\image.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"

 
 

-SOURCE=..\..\include\wx\imaggif.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\imagiff.h
-# End Source File
-# Begin Source File
+!ENDIF

 
 

-SOURCE=..\..\include\wx\imagjpeg.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\imaglist.h
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\ole\access.cpp

 
 

-SOURCE=..\..\include\wx\imagpcx.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "coredll - Win32 DLL Debug"

 
 

-SOURCE=..\..\include\wx\imagpng.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\imagpnm.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"

 
 

-SOURCE=..\..\include\wx\imagtiff.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\imagxpm.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"

 
 

-SOURCE=..\..\include\wx\layout.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\listbase.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"

 
 

-SOURCE=..\..\include\wx\listbox.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\listctrl.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"

 
 

-SOURCE=..\..\include\wx\matrix.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\mdi.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"

 
 

-SOURCE=..\..\include\wx\menu.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\menuitem.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"

 
 

-SOURCE=..\..\include\wx\metafile.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\minifram.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"

 
 

-SOURCE=..\..\include\wx\msgdlg.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\accel.h
-# End Source File
-# Begin Source File
+!ENDIF

 
 

-SOURCE=..\..\include\wx\msw\app.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\msw\bitmap.h
+SOURCE=..\..\src\msw\app.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\msw\bmpbuttn.h
+SOURCE=..\..\src\msw\ole\automtn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\msw\brush.h
+SOURCE=..\..\src\msw\bitmap.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\msw\button.h
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\bmpbuttn.cpp

 
 

-SOURCE=..\..\include\wx\msw\caret.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "coredll - Win32 DLL Debug"

 
 

-SOURCE=..\..\include\wx\msw\checkbox.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\checklst.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"

 
 

-SOURCE=..\..\include\wx\msw\choice.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\clipbrd.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"

 
 

-SOURCE=..\..\include\wx\msw\colordlg.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\colour.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"

 
 

-SOURCE=..\..\include\wx\msw\combobox.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\control.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"

 
 

-SOURCE=..\..\include\wx\msw\cursor.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\dc.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"

 
 

-SOURCE=..\..\include\wx\msw\dcclient.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\dcmemory.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"

 
 

-SOURCE=..\..\include\wx\msw\dcprint.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\dcscreen.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"

 
 

-SOURCE=..\..\include\wx\msw\dialog.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\dib.h
-# End Source File
-# Begin Source File
+!ENDIF

 
 

-SOURCE=..\..\include\wx\msw\dirdlg.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\msw\dragimag.h
+SOURCE=..\..\src\msw\brush.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\msw\enhmeta.h
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\button.cpp

 
 

-SOURCE=..\..\include\wx\msw\fdrepdlg.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "coredll - Win32 DLL Debug"

 
 

-SOURCE=..\..\include\wx\msw\filedlg.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\font.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"

 
 

-SOURCE=..\..\include\wx\msw\fontdlg.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\frame.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"

 
 

-SOURCE=..\..\include\wx\msw\gauge95.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\gdiimage.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"

 
 

-SOURCE=..\..\include\wx\msw\gdiobj.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\gnuwin32\winresrc.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"

 
 

-SOURCE=..\..\include\wx\msw\helpbest.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\helpchm.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"

 
 

-SOURCE=..\..\include\wx\msw\helpwin.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\icon.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"

 
 

-SOURCE=..\..\include\wx\msw\imaglist.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\iniconf.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"

 
 

-SOURCE=..\..\include\wx\msw\listbox.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\listctrl.h
-# End Source File
-# Begin Source File
+!ENDIF

 
 

-SOURCE=..\..\include\wx\msw\mdi.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\msw\menu.h
+SOURCE=..\..\src\msw\caret.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\msw\menuitem.h
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\checkbox.cpp

 
 

-SOURCE=..\..\include\wx\msw\metafile.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "coredll - Win32 DLL Debug"

 
 

-SOURCE=..\..\include\wx\msw\minifram.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\missing.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"

 
 

-SOURCE=..\..\include\wx\msw\msgdlg.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\mslu.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"

 
 

-SOURCE=..\..\include\wx\msw\msvcrt.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\notebook.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"

 
 

-SOURCE=..\..\include\wx\msw\ole\access.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\ole\automtn.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"

 
 

-SOURCE=..\..\include\wx\msw\ole\dataform.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\ole\dataobj.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"

 
 

-SOURCE=..\..\include\wx\msw\ole\dataobj2.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\ole\dropsrc.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"

 
 

-SOURCE=..\..\include\wx\msw\ole\droptgt.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\ole\oleutils.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"

 
 

-SOURCE=..\..\include\wx\msw\ole\uuid.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1
+
+!ENDIF

 
 

-SOURCE=..\..\include\wx\msw\palette.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\msw\pen.h
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\checklst.cpp

 
 

-SOURCE=..\..\include\wx\msw\printdlg.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "coredll - Win32 DLL Debug"

 
 

-SOURCE=..\..\include\wx\msw\printwin.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\private.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"

 
 

-SOURCE=..\..\include\wx\msw\radiobox.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\radiobut.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"

 
 

-SOURCE=..\..\include\wx\msw\regconf.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\region.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"

 
 

-SOURCE=..\..\include\wx\msw\registry.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\scrolbar.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"

 
 

-SOURCE=..\..\include\wx\msw\setup0.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\slider95.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"

 
 

-SOURCE=..\..\include\wx\msw\slidrmsw.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\spinbutt.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"

 
 

-SOURCE=..\..\include\wx\msw\spinctrl.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\statbmp.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"

 
 

-SOURCE=..\..\include\wx\msw\statbox.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\statbr95.h
-# End Source File
-# Begin Source File
+!ENDIF

 
 

-SOURCE=..\..\include\wx\msw\statline.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\msw\stattext.h
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\choice.cpp

 
 

-SOURCE=..\..\include\wx\msw\tabctrl.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "coredll - Win32 DLL Debug"

 
 

-SOURCE=..\..\include\wx\msw\tbar95.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\tbarmsw.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"

 
 

-SOURCE=..\..\include\wx\msw\textctrl.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\tglbtn.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"

 
 

-SOURCE=..\..\include\wx\msw\timer.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\tooltip.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"

 
 

-SOURCE=..\..\include\wx\msw\toplevel.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\treectrl.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"

 
 

-SOURCE=..\..\include\wx\msw\window.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\notebook.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"

 
 

-SOURCE=..\..\include\wx\ownerdrw.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\palette.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"

 
 

-SOURCE=..\..\include\wx\panel.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\paper.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"

 
 

-SOURCE=..\..\include\wx\pen.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\popupwin.h
-# End Source File
-# Begin Source File
+!ENDIF

 
 

-SOURCE=..\..\include\wx\print.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\printdlg.h
+SOURCE=..\..\src\msw\clipbrd.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\prntbase.h
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\colordlg.cpp

 
 

-SOURCE=..\..\include\wx\progdlg.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "coredll - Win32 DLL Debug"

 
 

-SOURCE=..\..\include\wx\ptr_scpd.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\quantize.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"

 
 

-SOURCE=..\..\include\wx\radiobox.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\radiobut.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"

 
 

-SOURCE=..\..\include\wx\rawbmp.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\region.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"

 
 

-SOURCE=..\..\include\wx\renderer.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\scopeguard.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"

 
 

-SOURCE=..\..\include\wx\scrolbar.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\scrolwin.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"

 
 

-SOURCE=..\..\include\wx\selstore.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\settings.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"

 
 

-SOURCE=..\..\include\wx\sizer.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\slider.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"

 
 

-SOURCE=..\..\include\wx\spinbutt.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\spinctrl.h
-# End Source File
-# Begin Source File
+!ENDIF

 
 

-SOURCE=..\..\include\wx\splitter.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\stack.h
+SOURCE=..\..\src\msw\colour.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\statbmp.h
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\combobox.cpp

 
 

-SOURCE=..\..\include\wx\statbox.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "coredll - Win32 DLL Debug"

 
 

-SOURCE=..\..\include\wx\statline.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\stattext.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"

 
 

-SOURCE=..\..\include\wx\statusbr.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\tab.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"

 
 

-SOURCE=..\..\include\wx\tabctrl.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\tbarbase.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"

 
 

-SOURCE=..\..\include\wx\tbarsmpl.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\textctrl.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"

 
 

-SOURCE=..\..\include\wx\textdlg.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\tglbtn.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"

 
 

-SOURCE=..\..\include\wx\timer.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\tipwin.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"

 
 

-SOURCE=..\..\include\wx\toolbar.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\tooltip.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"

 
 

-SOURCE=..\..\include\wx\toplevel.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\treebase.h
-# End Source File
-# Begin Source File
+!ENDIF

 
 

-SOURCE=..\..\include\wx\treectrl.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\univ\app.h
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\control.cpp

 
 

-SOURCE=..\..\include\wx\univ\bmpbuttn.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "coredll - Win32 DLL Debug"

 
 

-SOURCE=..\..\include\wx\univ\button.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\univ\checkbox.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"

 
 

-SOURCE=..\..\include\wx\univ\checklst.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\univ\choice.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"

 
 

-SOURCE=..\..\include\wx\univ\colschem.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\univ\combobox.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"

 
 

-SOURCE=..\..\include\wx\univ\control.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\univ\dialog.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"

 
 

-SOURCE=..\..\include\wx\univ\frame.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\univ\gauge.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"

 
 

-SOURCE=..\..\include\wx\univ\inpcons.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\univ\inphand.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"

 
 

-SOURCE=..\..\include\wx\univ\listbox.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\univ\menu.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"

 
 

-SOURCE=..\..\include\wx\univ\menuitem.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\univ\notebook.h
-# End Source File
-# Begin Source File
+!ENDIF

 
 

-SOURCE=..\..\include\wx\univ\radiobox.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\univ\radiobut.h
+SOURCE=..\..\src\msw\cursor.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\univ\renderer.h
+SOURCE=..\..\src\msw\data.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\univ\scrarrow.h
+SOURCE=..\..\src\msw\ole\dataobj.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\univ\scrolbar.h
+SOURCE=..\..\src\msw\dc.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\univ\scrthumb.h
+SOURCE=..\..\src\msw\dcclient.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\univ\scrtimer.h
+SOURCE=..\..\src\msw\dcmemory.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\univ\slider.h
+SOURCE=..\..\src\msw\dcprint.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\univ\spinbutt.h
+SOURCE=..\..\src\msw\dcscreen.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\univ\statbmp.h
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\dialog.cpp

 
 

-SOURCE=..\..\include\wx\univ\statbox.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "coredll - Win32 DLL Debug"

 
 

-SOURCE=..\..\include\wx\univ\statline.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\univ\stattext.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"

 
 

-SOURCE=..\..\include\wx\univ\statusbr.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\univ\textctrl.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"

 
 

-SOURCE=..\..\include\wx\univ\theme.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\univ\toolbar.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"

 
 

-SOURCE=..\..\include\wx\univ\toplevel.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\univ\window.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"

 
 

-SOURCE=..\..\include\wx\valgen.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\validate.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"

 
 

-SOURCE=..\..\include\wx\valtext.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\vlbox.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF

 
 

-SOURCE=..\..\include\wx\vms_x_fix.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\vscroll.h
+SOURCE=..\..\src\msw\dialup.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\window.h
+SOURCE=..\..\src\msw\dib.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\xpmdecod.h
+SOURCE=..\..\src\msw\dirdlg.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\xpmhand.h
+SOURCE=..\..\src\msw\display.cpp

 # End Source File
 # End Source File

-# End Group
-# Begin Group "Generic Sources"
-
-# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\generic\accel.cpp
+SOURCE=..\..\src\msw\dragimag.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\busyinfo.cpp
+SOURCE=..\..\src\msw\ole\dropsrc.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\choicdgg.cpp
+SOURCE=..\..\src\msw\ole\droptgt.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\colrdlgg.cpp
+SOURCE=..\..\src\msw\dummy.cpp
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\enhmeta.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\evtloop.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\fdrepdlg.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\dcpsg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\dirctrlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\dirdlgg.cpp
+SOURCE=..\..\src\msw\filedlg.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\dragimgg.cpp
+SOURCE=..\..\src\msw\font.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\fdrepdlg.cpp
+SOURCE=..\..\src\msw\fontdlg.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\filedlgg.cpp
-
-!IF  "$(CFG)" == "coredll - Win32 DLL Debug"
+SOURCE=..\..\src\msw\fontenum.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\fontutil.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\frame.cpp
+
+!IF  "$(CFG)" == "coredll - Win32 DLL Debug"

 
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\fontdlgg.cpp
+SOURCE=..\..\src\msw\gauge95.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\imaglist.cpp
+SOURCE=..\..\src\msw\gdiimage.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\gdiobj.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\gsockmsw.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\helpchm.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\helpwin.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\icon.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\imaglist.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\listctrl.cpp
+SOURCE=..\..\src\msw\iniconf.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\logg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\mdig.cpp
+SOURCE=..\..\src\msw\listbox.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\msgdlgg.cpp
+SOURCE=..\..\src\msw\listctrl.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\numdlgg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\panelg.cpp
+SOURCE=..\..\src\msw\main.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\prntdlgg.cpp
+SOURCE=..\..\src\msw\mdi.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\progdlgg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\renderg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\scrlwing.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\selstore.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\spinctlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\splitter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\statusbr.cpp
+SOURCE=..\..\src\msw\menu.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 


@@ -1928,910 +1500,954 @@ SOURCE=..\..\src\generic\statusbr.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\tabg.cpp
+SOURCE=..\..\src\msw\menuitem.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\tbarsmpl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\textdlgg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\tipwin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\treectlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\vlbox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\vscroll.cpp
-# End Source File
-# End Group
-# Begin Group "wxUniv Sources"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\univ\bmpbuttn.cpp
+SOURCE=..\..\src\msw\metafile.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\button.cpp
+SOURCE=..\..\src\msw\minifram.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\msgdlg.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\checkbox.cpp
+SOURCE=..\..\src\msw\mslu.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\nativdlg.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\checklst.cpp
+SOURCE=..\..\src\msw\notebook.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\choice.cpp
+SOURCE=..\..\src\msw\ole\oleutils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\ownerdrw.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\colschem.cpp
+SOURCE=..\..\src\msw\palette.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\pen.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\penwin.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\combobox.cpp
-
+SOURCE=..\..\src\msw\popupwin.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\printdlg.cpp
+

 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\control.cpp
+SOURCE=..\..\src\msw\printwin.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\ctrlrend.cpp
+SOURCE=..\..\src\msw\radiobox.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\dialog.cpp
+SOURCE=..\..\src\msw\radiobut.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\framuniv.cpp
+SOURCE=..\..\src\msw\region.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\renderer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\scrolbar.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\gauge.cpp
+SOURCE=..\..\src\msw\settings.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\slider95.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\inpcons.cpp
+SOURCE=..\..\src\msw\spinbutt.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\inphand.cpp
+SOURCE=..\..\src\msw\spinctrl.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\listbox.cpp
+SOURCE=..\..\src\msw\statbmp.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\menu.cpp
+SOURCE=..\..\src\msw\statbox.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\notebook.cpp
+SOURCE=..\..\src\msw\statbr95.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\radiobox.cpp
+SOURCE=..\..\src\msw\statline.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\radiobut.cpp
+SOURCE=..\..\src\msw\stattext.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\scrarrow.cpp
+SOURCE=..\..\src\msw\tabctrl.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\scrolbar.cpp
+SOURCE=..\..\src\msw\tbar95.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\scrthumb.cpp
+SOURCE=..\..\src\msw\textctrl.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\slider.cpp
+SOURCE=..\..\src\msw\tglbtn.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\spinbutt.cpp
+SOURCE=..\..\src\msw\timer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\tooltip.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\toplevel.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\treectrl.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\statbmp.cpp
+SOURCE=..\..\src\msw\utilsgui.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\ole\uuid.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\uxtheme.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\volume.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\window.cpp
+# End Source File
+# End Group
+# Begin Group "Generic Sources"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\src\generic\accel.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 


@@ -2866,7 +2482,15 @@ SOURCE=..\..\src\univ\statbmp.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\statbox.cpp
+SOURCE=..\..\src\generic\busyinfo.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\choicdgg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\colrdlgg.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 


@@ -2901,7 +2525,15 @@ SOURCE=..\..\src\univ\statbox.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\statline.cpp
+SOURCE=..\..\src\generic\dcpsg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\dirctrlg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\dirdlgg.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 


@@ -2936,8 +2568,12 @@ SOURCE=..\..\src\univ\statline.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\stattext.cpp
-
+SOURCE=..\..\src\generic\dragimgg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\fdrepdlg.cpp
+

 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1


@@ -2971,7 +2607,7 @@ SOURCE=..\..\src\univ\stattext.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\statusbr.cpp
+SOURCE=..\..\src\generic\filedlgg.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 


@@ -3006,7 +2642,7 @@ SOURCE=..\..\src\univ\statusbr.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\textctrl.cpp
+SOURCE=..\..\src\generic\fontdlgg.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 


@@ -3041,7 +2677,7 @@ SOURCE=..\..\src\univ\textctrl.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\theme.cpp
+SOURCE=..\..\src\generic\imaglist.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 


@@ -3076,7 +2712,7 @@ SOURCE=..\..\src\univ\theme.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\themes\gtk.cpp
+SOURCE=..\..\src\generic\listctrl.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 


@@ -3111,7 +2747,11 @@ SOURCE=..\..\src\univ\themes\gtk.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\themes\metal.cpp
+SOURCE=..\..\src\generic\logg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\mdig.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 


@@ -3146,7 +2786,7 @@ SOURCE=..\..\src\univ\themes\metal.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\themes\win32.cpp
+SOURCE=..\..\src\generic\msgdlgg.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 


@@ -3181,7 +2821,15 @@ SOURCE=..\..\src\univ\themes\win32.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\toolbar.cpp
+SOURCE=..\..\src\generic\numdlgg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\panelg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\prntdlgg.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 


@@ -3216,42 +2864,66 @@ SOURCE=..\..\src\univ\toolbar.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\topluniv.cpp
+SOURCE=..\..\src\generic\progdlgg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\renderg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\scrlwing.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\selstore.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\spinctlg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\splitter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\statusbr.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\winuniv.cpp
+SOURCE=..\..\src\generic\tabg.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 


@@ -3284,2200 +2956,2540 @@ SOURCE=..\..\src\univ\winuniv.cpp
 !ENDIF
 
 # End Source File
 !ENDIF
 
 # End Source File

-# End Group
-# Begin Group "Common Sources"
-
-# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\common\accesscmn.cpp
+SOURCE=..\..\src\generic\tbarsmpl.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\appcmn.cpp
+SOURCE=..\..\src\generic\textdlgg.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\artprov.cpp
+SOURCE=..\..\src\generic\tipwin.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\artstd.cpp
+SOURCE=..\..\src\generic\treectlg.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\bmpbase.cpp
+SOURCE=..\..\src\generic\vlbox.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\choiccmn.cpp
+SOURCE=..\..\src\generic\vscroll.cpp

 # End Source File
 # End Source File

-# Begin Source File
+# End Group
+# Begin Group "wxUniv Sources"

 
 

-SOURCE=..\..\src\common\clipcmn.cpp
-# End Source File
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\common\cmdproc.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\univ\bmpbuttn.cpp

 
 

-SOURCE=..\..\src\common\cmndata.cpp
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "coredll - Win32 DLL Debug"

 
 

-SOURCE=..\..\src\common\containr.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\cshelp.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"

 
 

-SOURCE=..\..\src\common\ctrlcmn.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\ctrlsub.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"

 
 

-SOURCE=..\..\src\common\datacmn.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\dcbase.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"

 
 

-SOURCE=..\..\src\common\dlgcmn.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\dndcmn.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"

 
 

-SOURCE=..\..\src\common\dobjcmn.cpp
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\src\common\docmdi.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"

 
 

-SOURCE=..\..\src\common\docview.cpp
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\src\common\dpycmn.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"

 
 

-SOURCE=..\..\src\common\dseldlg.cpp
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\src\common\effects.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"

 
 

-SOURCE=..\..\src\common\event.cpp
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\src\common\fddlgcmn.cpp
-# End Source File
-# Begin Source File
+!ENDIF

 
 

-SOURCE=..\..\src\common\fldlgcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\fontcmn.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\univ\button.cpp

 
 

-SOURCE=..\..\src\common\fontmap.cpp
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "coredll - Win32 DLL Debug"

 
 

-SOURCE=..\..\src\common\framecmn.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\fs_mem.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"

 
 

-SOURCE=..\..\src\common\gaugecmn.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\gdicmn.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"

 
 

-SOURCE=..\..\src\common\geometry.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\gifdecod.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"

 
 

-SOURCE=..\..\src\common\helpbase.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\iconbndl.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"

 
 

-SOURCE=..\..\src\common\imagall.cpp
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\src\common\imagbmp.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"

 
 

-SOURCE=..\..\src\common\image.cpp
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\src\common\imagfill.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"

 
 

-SOURCE=..\..\src\common\imaggif.cpp
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\src\common\imagiff.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"

 
 

-SOURCE=..\..\src\common\imagjpeg.cpp
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\src\common\imagpcx.cpp
-# End Source File
-# Begin Source File
+!ENDIF

 
 

-SOURCE=..\..\src\common\imagpng.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\imagpnm.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\univ\checkbox.cpp

 
 

-SOURCE=..\..\src\common\imagtiff.cpp
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "coredll - Win32 DLL Debug"

 
 

-SOURCE=..\..\src\common\imagxpm.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\layout.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"

 
 

-SOURCE=..\..\src\common\lboxcmn.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\matrix.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"

 
 

-SOURCE=..\..\src\common\menucmn.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\msgout.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"

 
 

-SOURCE=..\..\src\common\nbkbase.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\paper.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"

 
 

-SOURCE=..\..\src\common\popupcmn.cpp
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\src\common\prntbase.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"

 
 

-SOURCE=..\..\src\common\quantize.cpp
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\src\common\radiocmn.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"

 
 

-SOURCE=..\..\src\common\rendcmn.cpp
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\src\common\rgncmn.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"

 
 

-SOURCE=..\..\src\common\settcmn.cpp
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\src\common\sizer.cpp
-# End Source File
-# Begin Source File
+!ENDIF

 
 

-SOURCE=..\..\src\common\statbar.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\tbarbase.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\univ\checklst.cpp

 
 

-SOURCE=..\..\src\common\textcmn.cpp
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "coredll - Win32 DLL Debug"

 
 

-SOURCE=..\..\src\common\timercmn.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\toplvcmn.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"

 
 

-SOURCE=..\..\src\common\treebase.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\utilscmn.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"

 
 

-SOURCE=..\..\src\common\valgen.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\validate.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"

 
 

-SOURCE=..\..\src\common\valtext.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\wincmn.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"

 
 

-SOURCE=..\..\src\common\xpmdecod.cpp
-# End Source File
-# End Group
-# Begin Group "MSW Sources"

 
 

-# PROP Default_Filter ""
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
+
+
+!ENDIF
+
+# End Source File

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\msw\accel.cpp
+SOURCE=..\..\src\univ\choice.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\app.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\bitmap.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\bmpbuttn.cpp
+SOURCE=..\..\src\univ\colschem.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\brush.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\button.cpp
+SOURCE=..\..\src\univ\combobox.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\caret.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\checkbox.cpp
+SOURCE=..\..\src\univ\control.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\checklst.cpp
+SOURCE=..\..\src\univ\ctrlrend.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\choice.cpp
+SOURCE=..\..\src\univ\dialog.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\clipbrd.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\colordlg.cpp
+SOURCE=..\..\src\univ\framuniv.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\colour.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\combobox.cpp
+SOURCE=..\..\src\univ\gauge.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\control.cpp
+SOURCE=..\..\src\univ\themes\gtk.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\cursor.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\data.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dcclient.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dcmemory.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dcprint.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dcscreen.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dialog.cpp
+SOURCE=..\..\src\univ\inpcons.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\dialup.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dib.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dirdlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\display.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dragimag.cpp
+SOURCE=..\..\src\univ\inphand.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\enhmeta.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\evtloop.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\fdrepdlg.cpp
+SOURCE=..\..\src\univ\listbox.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\filedlg.cpp
+SOURCE=..\..\src\univ\menu.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\font.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\fontdlg.cpp
+SOURCE=..\..\src\univ\themes\metal.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\fontenum.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\fontutil.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\frame.cpp
+SOURCE=..\..\src\univ\notebook.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\gauge95.cpp
+SOURCE=..\..\src\univ\radiobox.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\gdiimage.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\gdiobj.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\gsockmsw.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\helpchm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\helpwin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\icon.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\imaglist.cpp
+SOURCE=..\..\src\univ\radiobut.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\iniconf.cpp
+SOURCE=..\..\src\univ\scrarrow.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\listbox.cpp
+SOURCE=..\..\src\univ\scrolbar.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\listctrl.cpp
+SOURCE=..\..\src\univ\scrthumb.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\main.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\mdi.cpp
+SOURCE=..\..\src\univ\slider.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\menu.cpp
+SOURCE=..\..\src\univ\spinbutt.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\menuitem.cpp
+SOURCE=..\..\src\univ\statbmp.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\metafile.cpp
+SOURCE=..\..\src\univ\statbox.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\minifram.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\msgdlg.cpp
+SOURCE=..\..\src\univ\statline.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\mslu.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\nativdlg.cpp
+SOURCE=..\..\src\univ\stattext.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\notebook.cpp
+SOURCE=..\..\src\univ\statusbr.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\ole\access.cpp
+SOURCE=..\..\src\univ\textctrl.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\ole\automtn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\ole\dataobj.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\ole\dropsrc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\ole\droptgt.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\ole\oleutils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\ole\uuid.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\ownerdrw.cpp
+SOURCE=..\..\src\univ\theme.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\palette.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\pen.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\penwin.cpp
+SOURCE=..\..\src\univ\toolbar.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\popupwin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\printdlg.cpp
+SOURCE=..\..\src\univ\topluniv.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\printwin.cpp
+SOURCE=..\..\src\univ\themes\win32.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\radiobox.cpp
+SOURCE=..\..\src\univ\winuniv.cpp

 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 
 
 !IF  "$(CFG)" == "coredll - Win32 DLL Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 
 !ENDIF
 
 # End Source File

+# End Group
+# Begin Group "MSW Headers"
+
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\msw\radiobut.cpp
+SOURCE=..\..\include\wx\msw\accel.h
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "coredll - Win32 DLL Debug"
+SOURCE=..\..\include\wx\msw\ole\access.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\app.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
+SOURCE=..\..\include\wx\msw\ole\automtn.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\bitmap.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
+SOURCE=..\..\include\wx\msw\bmpbuttn.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\brush.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
+SOURCE=..\..\include\wx\msw\button.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\caret.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
+SOURCE=..\..\include\wx\msw\checkbox.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\checklst.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
+SOURCE=..\..\include\wx\msw\choice.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\clipbrd.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
+SOURCE=..\..\include\wx\msw\colordlg.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\colour.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
+SOURCE=..\..\include\wx\msw\combobox.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\control.h
+# End Source File
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\include\wx\msw\cursor.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\ole\dataform.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\region.cpp
+SOURCE=..\..\include\wx\msw\ole\dataobj.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\renderer.cpp
+SOURCE=..\..\include\wx\msw\ole\dataobj2.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\scrolbar.cpp
+SOURCE=..\..\include\wx\msw\dc.h
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "coredll - Win32 DLL Debug"
+SOURCE=..\..\include\wx\msw\dcclient.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\dcmemory.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
+SOURCE=..\..\include\wx\msw\dcprint.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\dcscreen.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
+SOURCE=..\..\include\wx\msw\dialog.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\dib.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
+SOURCE=..\..\include\wx\msw\dirdlg.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\dragimag.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
+SOURCE=..\..\include\wx\msw\ole\dropsrc.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\ole\droptgt.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
+SOURCE=..\..\include\wx\msw\enhmeta.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\fdrepdlg.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
+SOURCE=..\..\include\wx\msw\filedlg.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\font.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
+SOURCE=..\..\include\wx\msw\fontdlg.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\frame.h
+# End Source File
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\include\wx\msw\gauge95.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\gdiimage.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\settings.cpp
+SOURCE=..\..\include\wx\msw\gdiobj.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\slider95.cpp
+SOURCE=..\..\include\wx\msw\helpbest.h
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "coredll - Win32 DLL Debug"
+SOURCE=..\..\include\wx\msw\helpchm.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\helpwin.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
+SOURCE=..\..\include\wx\msw\icon.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\imaglist.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
+SOURCE=..\..\include\wx\msw\iniconf.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\listbox.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
+SOURCE=..\..\include\wx\msw\listctrl.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\mdi.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
+SOURCE=..\..\include\wx\msw\menu.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\menuitem.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
+SOURCE=..\..\include\wx\msw\metafile.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\minifram.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
+SOURCE=..\..\include\wx\msw\missing.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\msgdlg.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
+SOURCE=..\..\include\wx\msw\mslu.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\msvcrt.h
+# End Source File
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\include\wx\msw\notebook.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\ole\oleutils.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\spinbutt.cpp
+SOURCE=..\..\include\wx\msw\palette.h
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "coredll - Win32 DLL Debug"
+SOURCE=..\..\include\wx\msw\pen.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\printdlg.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
+SOURCE=..\..\include\wx\msw\printwin.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\private.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
+SOURCE=..\..\include\wx\msw\radiobox.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\radiobut.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
+SOURCE=..\..\include\wx\msw\regconf.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\region.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
+SOURCE=..\..\include\wx\msw\registry.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\scrolbar.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
+SOURCE=..\..\include\wx\msw\setup0.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\slider95.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
+SOURCE=..\..\include\wx\msw\slidrmsw.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\spinbutt.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
+SOURCE=..\..\include\wx\msw\spinctrl.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\statbmp.h
+# End Source File
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\include\wx\msw\statbox.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\statbr95.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\spinctrl.cpp
+SOURCE=..\..\include\wx\msw\statline.h
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "coredll - Win32 DLL Debug"
+SOURCE=..\..\include\wx\msw\stattext.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\tabctrl.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
+SOURCE=..\..\include\wx\msw\tbar95.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\tbarmsw.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
+SOURCE=..\..\include\wx\msw\textctrl.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\tglbtn.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
+SOURCE=..\..\include\wx\msw\timer.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\tooltip.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
+SOURCE=..\..\include\wx\msw\toplevel.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\treectrl.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
+SOURCE=..\..\include\wx\msw\ole\uuid.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\window.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
+SOURCE=..\..\include\wx\msw\gnuwin32\winresrc.h
+# End Source File
+# End Group
+# Begin Group "Generic Headers"

 
 

-# PROP Exclude_From_Build 1
+# PROP Default_Filter ""
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
+SOURCE=..\..\include\wx\generic\accel.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\generic\choicdgg.h
+# End Source File
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\include\wx\generic\colrdlgg.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\generic\dcpsg.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\statbmp.cpp
+SOURCE=..\..\include\wx\generic\dirctrlg.h
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "coredll - Win32 DLL Debug"
+SOURCE=..\..\include\wx\generic\dirdlgg.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\generic\dragimgg.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
+SOURCE=..\..\include\wx\generic\fdrepdlg.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\generic\filedlgg.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
+SOURCE=..\..\include\wx\generic\fontdlgg.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\generic\imaglist.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
+SOURCE=..\..\include\wx\generic\listctrl.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\generic\logg.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
+SOURCE=..\..\include\wx\generic\mdig.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\generic\msgdlgg.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
+SOURCE=..\..\include\wx\generic\notebook.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\generic\panelg.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
+SOURCE=..\..\include\wx\generic\prntdlgg.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\generic\progdlgg.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
+SOURCE=..\..\include\wx\generic\scrolwin.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\generic\spinctlg.h
+# End Source File
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\include\wx\generic\splitter.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\generic\statusbr.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\statbox.cpp
+SOURCE=..\..\include\wx\generic\tabg.h
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "coredll - Win32 DLL Debug"
+SOURCE=..\..\include\wx\generic\textdlgg.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\generic\timer.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
+SOURCE=..\..\include\wx\generic\treectlg.h
+# End Source File
+# End Group
+# Begin Group "wxUniv Headers"

 
 

+# PROP Default_Filter ""
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
+SOURCE=..\..\include\wx\univ\app.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\univ\bmpbuttn.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
+SOURCE=..\..\include\wx\univ\button.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\univ\checkbox.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
+SOURCE=..\..\include\wx\univ\checklst.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\univ\choice.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
+SOURCE=..\..\include\wx\univ\colschem.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\univ\combobox.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
+SOURCE=..\..\include\wx\univ\control.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\univ\dialog.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
+SOURCE=..\..\include\wx\univ\frame.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\univ\gauge.h
+# End Source File
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\include\wx\univ\inpcons.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\univ\inphand.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\statbr95.cpp
+SOURCE=..\..\include\wx\univ\listbox.h
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "coredll - Win32 DLL Debug"
+SOURCE=..\..\include\wx\univ\menu.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\univ\menuitem.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
+SOURCE=..\..\include\wx\univ\notebook.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\univ\radiobox.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
+SOURCE=..\..\include\wx\univ\radiobut.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\univ\renderer.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
+SOURCE=..\..\include\wx\univ\scrarrow.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\univ\scrolbar.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
+SOURCE=..\..\include\wx\univ\scrthumb.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\univ\scrtimer.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
+SOURCE=..\..\include\wx\univ\slider.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\univ\spinbutt.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
+SOURCE=..\..\include\wx\univ\statbmp.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\univ\statbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\univ\statline.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\univ\stattext.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\univ\statusbr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\univ\textctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\univ\theme.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\univ\toolbar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\univ\toplevel.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
+SOURCE=..\..\include\wx\univ\window.h
+# End Source File
+# End Group
+# Begin Group "Common Headers"

 
 

-# PROP Exclude_From_Build 1
+# PROP Default_Filter ""
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\include\wx\accel.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\access.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\statline.cpp
+SOURCE=..\..\include\wx\afterstd.h
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "coredll - Win32 DLL Debug"
+SOURCE=..\..\include\wx\artprov.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\bitmap.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
+SOURCE=..\..\include\wx\bmpbuttn.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\brush.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
+SOURCE=..\..\include\wx\busyinfo.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\button.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
+SOURCE=..\..\include\wx\caret.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\checkbox.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
+SOURCE=..\..\include\wx\checklst.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\choicdlg.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
+SOURCE=..\..\include\wx\choice.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\clipbrd.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
+SOURCE=..\..\include\wx\cmdproc.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\cmndata.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
+SOURCE=..\..\include\wx\colordlg.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\colour.h
+# End Source File
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\include\wx\combobox.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\control.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\stattext.cpp
+SOURCE=..\..\include\wx\cshelp.h
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "coredll - Win32 DLL Debug"
+SOURCE=..\..\include\wx\ctrlsub.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\cursor.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
+SOURCE=..\..\include\wx\dataobj.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\dc.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
+SOURCE=..\..\include\wx\dcclient.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\dcmemory.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
+SOURCE=..\..\include\wx\dcmirror.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\dcprint.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
+SOURCE=..\..\include\wx\dcps.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\dcscreen.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
+SOURCE=..\..\include\wx\dialog.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\dialup.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
+SOURCE=..\..\include\wx\dirctrl.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\dirdlg.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
+SOURCE=..\..\include\wx\display.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\dnd.h
+# End Source File
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\include\wx\docmdi.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\docview.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\tabctrl.cpp
+SOURCE=..\..\include\wx\dragimag.h
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "coredll - Win32 DLL Debug"
+SOURCE=..\..\include\wx\effects.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\evtloop.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
+SOURCE=..\..\include\wx\fdrepdlg.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\filedlg.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
+SOURCE=..\..\include\wx\fmappriv.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\font.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
+SOURCE=..\..\include\wx\fontdlg.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\fontenum.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
+SOURCE=..\..\include\wx\fontutil.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\frame.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
+SOURCE=..\..\include\wx\gauge.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\gdicmn.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
+SOURCE=..\..\include\wx\gdiobj.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\geometry.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
+SOURCE=..\..\include\wx\gifdecod.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\glcanvas.h
+# End Source File
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\include\wx\help.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\helpbase.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\tbar95.cpp
+SOURCE=..\..\include\wx\helphtml.h
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "coredll - Win32 DLL Debug"
+SOURCE=..\..\include\wx\helpwin.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\icon.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
+SOURCE=..\..\include\wx\iconbndl.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\imagbmp.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
+SOURCE=..\..\include\wx\image.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\imaggif.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
+SOURCE=..\..\include\wx\imagiff.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\imagjpeg.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
+SOURCE=..\..\include\wx\imaglist.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\imagpcx.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
+SOURCE=..\..\include\wx\imagpng.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\imagpnm.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
+SOURCE=..\..\include\wx\imagtiff.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\imagxpm.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
+SOURCE=..\..\include\wx\layout.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\listbase.h
+# End Source File
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\include\wx\listbox.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\listctrl.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\textctrl.cpp
+SOURCE=..\..\include\wx\matrix.h
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "coredll - Win32 DLL Debug"
+SOURCE=..\..\include\wx\mdi.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\menu.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
+SOURCE=..\..\include\wx\menuitem.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\metafile.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
+SOURCE=..\..\include\wx\minifram.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msgdlg.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
+SOURCE=..\..\include\wx\notebook.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\ownerdrw.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
+SOURCE=..\..\include\wx\palette.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\panel.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
+SOURCE=..\..\include\wx\paper.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\pen.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
+SOURCE=..\..\include\wx\popupwin.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\print.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
+SOURCE=..\..\include\wx\printdlg.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\prntbase.h
+# End Source File
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\include\wx\progdlg.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\ptr_scpd.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\tglbtn.cpp
+SOURCE=..\..\include\wx\quantize.h
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "coredll - Win32 DLL Debug"
+SOURCE=..\..\include\wx\radiobox.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\radiobut.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
+SOURCE=..\..\include\wx\rawbmp.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\region.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
+SOURCE=..\..\include\wx\renderer.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\scopeguard.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
+SOURCE=..\..\include\wx\scrolbar.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\scrolwin.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
+SOURCE=..\..\include\wx\selstore.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\settings.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
+SOURCE=..\..\include\wx\sizer.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\slider.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
+SOURCE=..\..\include\wx\spinbutt.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\spinctrl.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
+SOURCE=..\..\include\wx\splitter.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\stack.h
+# End Source File
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\include\wx\statbmp.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\statbox.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\timer.cpp
+SOURCE=..\..\include\wx\statline.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\tooltip.cpp
+SOURCE=..\..\include\wx\stattext.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\toplevel.cpp
+SOURCE=..\..\include\wx\statusbr.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\treectrl.cpp
+SOURCE=..\..\include\wx\tab.h
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "coredll - Win32 DLL Debug"
+SOURCE=..\..\include\wx\tabctrl.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\tbarbase.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Release"
+SOURCE=..\..\include\wx\tbarsmpl.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\textctrl.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Debug"
+SOURCE=..\..\include\wx\textdlg.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\tglbtn.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Unicode Release"
+SOURCE=..\..\include\wx\timer.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\tipwin.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Debug"
+SOURCE=..\..\include\wx\toolbar.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\tooltip.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Release"
+SOURCE=..\..\include\wx\toplevel.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\treebase.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Debug"
+SOURCE=..\..\include\wx\treectrl.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\valgen.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "coredll - Win32 DLL Universal Unicode Release"
+SOURCE=..\..\include\wx\validate.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\valtext.h
+# End Source File
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\include\wx\vlbox.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\vms_x_fix.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\utilsgui.cpp
+SOURCE=..\..\include\wx\vscroll.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\uxtheme.cpp
+SOURCE=..\..\include\wx\window.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\volume.cpp
+SOURCE=..\..\include\wx\xpmdecod.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\window.cpp
+SOURCE=..\..\include\wx\xpmhand.h

 # End Source File
 # End Group
 # End Target
 # End Source File
 # End Group
 # End Target

diff --git a/build/msw/wx_corelib.dsp b/build/msw/wx_corelib.dsp
index 9ab073cc512a70b26fd8715759d6a2daa4386410..b81ce77d3cf5d59e81943317a532be405b9440ff 100644 (file)
--- a/build/msw/wx_corelib.dsp
+++ b/build/msw/wx_corelib.dsp
@@ -230,1653 +230,1225 @@ LIB32=link.exe -lib
 # Name "corelib - Win32 Universal Release"
 # Name "corelib - Win32 Universal Unicode Debug"
 # Name "corelib - Win32 Universal Unicode Release"
 # Name "corelib - Win32 Universal Release"
 # Name "corelib - Win32 Universal Unicode Debug"
 # Name "corelib - Win32 Universal Unicode Release"

-# Begin Group "Common Headers"
+# Begin Group "Common Sources"

 
 # PROP Default_Filter ""
 # Begin Source File
 
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=..\..\include\wx\accel.h
+SOURCE=..\..\src\common\accesscmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\access.h
+SOURCE=..\..\src\common\appcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\afterstd.h
+SOURCE=..\..\src\common\artprov.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\artprov.h
+SOURCE=..\..\src\common\artstd.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\bitmap.h
+SOURCE=..\..\src\common\bmpbase.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\bmpbuttn.h
+SOURCE=..\..\src\common\choiccmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\brush.h
+SOURCE=..\..\src\common\clipcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\busyinfo.h
+SOURCE=..\..\src\common\cmdproc.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\button.h
+SOURCE=..\..\src\common\cmndata.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\caret.h
+SOURCE=..\..\src\common\containr.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\checkbox.h
+SOURCE=..\..\src\common\cshelp.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\checklst.h
+SOURCE=..\..\src\common\ctrlcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\choicdlg.h
+SOURCE=..\..\src\common\ctrlsub.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\choice.h
+SOURCE=..\..\src\common\datacmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\clipbrd.h
+SOURCE=..\..\src\common\dcbase.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\cmdproc.h
+SOURCE=..\..\src\common\dlgcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\cmndata.h
+SOURCE=..\..\src\common\dndcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\colordlg.h
+SOURCE=..\..\src\common\dobjcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\colour.h
+SOURCE=..\..\src\common\docmdi.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\combobox.h
+SOURCE=..\..\src\common\docview.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\control.h
+SOURCE=..\..\src\common\dpycmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\cshelp.h
+SOURCE=..\..\src\common\dseldlg.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\ctrlsub.h
+SOURCE=..\..\src\common\effects.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\cursor.h
+SOURCE=..\..\src\common\event.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dataobj.h
+SOURCE=..\..\src\common\fddlgcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dc.h
+SOURCE=..\..\src\common\fldlgcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dcclient.h
+SOURCE=..\..\src\common\fontcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dcmemory.h
+SOURCE=..\..\src\common\fontmap.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dcmirror.h
+SOURCE=..\..\src\common\framecmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dcprint.h
+SOURCE=..\..\src\common\fs_mem.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dcps.h
+SOURCE=..\..\src\common\gaugecmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dcscreen.h
+SOURCE=..\..\src\common\gdicmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dialog.h
+SOURCE=..\..\src\common\geometry.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dialup.h
+SOURCE=..\..\src\common\gifdecod.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dirctrl.h
+SOURCE=..\..\src\common\helpbase.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dirdlg.h
+SOURCE=..\..\src\common\iconbndl.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\display.h
+SOURCE=..\..\src\common\imagall.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dnd.h
+SOURCE=..\..\src\common\imagbmp.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\docmdi.h
+SOURCE=..\..\src\common\image.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\docview.h
+SOURCE=..\..\src\common\imagfill.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dragimag.h
+SOURCE=..\..\src\common\imaggif.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\effects.h
+SOURCE=..\..\src\common\imagiff.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\evtloop.h
+SOURCE=..\..\src\common\imagjpeg.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\fdrepdlg.h
+SOURCE=..\..\src\common\imagpcx.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\filedlg.h
+SOURCE=..\..\src\common\imagpng.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\fmappriv.h
+SOURCE=..\..\src\common\imagpnm.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\font.h
+SOURCE=..\..\src\common\imagtiff.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\fontdlg.h
+SOURCE=..\..\src\common\imagxpm.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\fontenum.h
+SOURCE=..\..\src\common\layout.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\fontutil.h
+SOURCE=..\..\src\common\lboxcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\frame.h
+SOURCE=..\..\src\common\matrix.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\gauge.h
+SOURCE=..\..\src\common\menucmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\gdicmn.h
+SOURCE=..\..\src\common\msgout.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\gdiobj.h
+SOURCE=..\..\src\common\nbkbase.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\accel.h
+SOURCE=..\..\src\common\paper.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\choicdgg.h
+SOURCE=..\..\src\common\popupcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\colrdlgg.h
+SOURCE=..\..\src\common\prntbase.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\dcpsg.h
+SOURCE=..\..\src\common\quantize.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\dirctrlg.h
+SOURCE=..\..\src\common\radiocmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\dirdlgg.h
+SOURCE=..\..\src\common\rendcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\dragimgg.h
+SOURCE=..\..\src\common\rgncmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\fdrepdlg.h
+SOURCE=..\..\src\common\settcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\filedlgg.h
+SOURCE=..\..\src\common\sizer.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\fontdlgg.h
+SOURCE=..\..\src\common\statbar.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\imaglist.h
+SOURCE=..\..\src\common\tbarbase.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\listctrl.h
+SOURCE=..\..\src\common\textcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\logg.h
+SOURCE=..\..\src\common\timercmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\mdig.h
+SOURCE=..\..\src\common\toplvcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\msgdlgg.h
+SOURCE=..\..\src\common\treebase.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\notebook.h
+SOURCE=..\..\src\common\utilscmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\panelg.h
+SOURCE=..\..\src\common\valgen.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\prntdlgg.h
+SOURCE=..\..\src\common\validate.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\progdlgg.h
+SOURCE=..\..\src\common\valtext.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\scrolwin.h
+SOURCE=..\..\src\common\wincmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\spinctlg.h
+SOURCE=..\..\src\common\xpmdecod.cpp

 # End Source File
 # End Source File

-# Begin Source File
+# End Group
+# Begin Group "MSW Sources"

 
 

-SOURCE=..\..\include\wx\generic\splitter.h
-# End Source File
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\include\wx\generic\statusbr.h
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\accel.cpp

 
 

-SOURCE=..\..\include\wx\generic\tabg.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "corelib - Win32 Debug"

 
 

-SOURCE=..\..\include\wx\generic\textdlgg.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\generic\timer.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Release"

 
 

-SOURCE=..\..\include\wx\generic\treectlg.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\geometry.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"

 
 

-SOURCE=..\..\include\wx\gifdecod.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\glcanvas.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"

 
 

-SOURCE=..\..\include\wx\help.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\helpbase.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"

 
 

-SOURCE=..\..\include\wx\helphtml.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\helpwin.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"

 
 

-SOURCE=..\..\include\wx\icon.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\iconbndl.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"

 
 

-SOURCE=..\..\include\wx\imagbmp.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\image.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"

 
 

-SOURCE=..\..\include\wx\imaggif.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\imagiff.h
-# End Source File
-# Begin Source File
+!ENDIF

 
 

-SOURCE=..\..\include\wx\imagjpeg.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\imaglist.h
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\ole\access.cpp

 
 

-SOURCE=..\..\include\wx\imagpcx.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "corelib - Win32 Debug"

 
 

-SOURCE=..\..\include\wx\imagpng.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\imagpnm.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Release"

 
 

-SOURCE=..\..\include\wx\imagtiff.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\imagxpm.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"

 
 

-SOURCE=..\..\include\wx\layout.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\listbase.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"

 
 

-SOURCE=..\..\include\wx\listbox.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\listctrl.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"

 
 

-SOURCE=..\..\include\wx\matrix.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\mdi.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"

 
 

-SOURCE=..\..\include\wx\menu.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\menuitem.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"

 
 

-SOURCE=..\..\include\wx\metafile.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\minifram.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"

 
 

-SOURCE=..\..\include\wx\msgdlg.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\accel.h
-# End Source File
-# Begin Source File
+!ENDIF

 
 

-SOURCE=..\..\include\wx\msw\app.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\msw\bitmap.h
+SOURCE=..\..\src\msw\app.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\msw\bmpbuttn.h
+SOURCE=..\..\src\msw\ole\automtn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\msw\brush.h
+SOURCE=..\..\src\msw\bitmap.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\msw\button.h
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\bmpbuttn.cpp

 
 

-SOURCE=..\..\include\wx\msw\caret.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "corelib - Win32 Debug"

 
 

-SOURCE=..\..\include\wx\msw\checkbox.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\checklst.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Release"

 
 

-SOURCE=..\..\include\wx\msw\choice.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\clipbrd.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"

 
 

-SOURCE=..\..\include\wx\msw\colordlg.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\colour.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"

 
 

-SOURCE=..\..\include\wx\msw\combobox.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\control.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"

 
 

-SOURCE=..\..\include\wx\msw\cursor.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\dc.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"

 
 

-SOURCE=..\..\include\wx\msw\dcclient.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\dcmemory.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"

 
 

-SOURCE=..\..\include\wx\msw\dcprint.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\dcscreen.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"

 
 

-SOURCE=..\..\include\wx\msw\dialog.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\dib.h
-# End Source File
-# Begin Source File
+!ENDIF

 
 

-SOURCE=..\..\include\wx\msw\dirdlg.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\msw\dragimag.h
+SOURCE=..\..\src\msw\brush.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\msw\enhmeta.h
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\button.cpp

 
 

-SOURCE=..\..\include\wx\msw\fdrepdlg.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "corelib - Win32 Debug"

 
 

-SOURCE=..\..\include\wx\msw\filedlg.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\font.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Release"

 
 

-SOURCE=..\..\include\wx\msw\fontdlg.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\frame.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"

 
 

-SOURCE=..\..\include\wx\msw\gauge95.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\gdiimage.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"

 
 

-SOURCE=..\..\include\wx\msw\gdiobj.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\gnuwin32\winresrc.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"

 
 

-SOURCE=..\..\include\wx\msw\helpbest.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\helpchm.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"

 
 

-SOURCE=..\..\include\wx\msw\helpwin.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\icon.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"

 
 

-SOURCE=..\..\include\wx\msw\imaglist.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\iniconf.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"

 
 

-SOURCE=..\..\include\wx\msw\listbox.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\listctrl.h
-# End Source File
-# Begin Source File
+!ENDIF

 
 

-SOURCE=..\..\include\wx\msw\mdi.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\msw\menu.h
+SOURCE=..\..\src\msw\caret.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\msw\menuitem.h
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\checkbox.cpp

 
 

-SOURCE=..\..\include\wx\msw\metafile.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "corelib - Win32 Debug"

 
 

-SOURCE=..\..\include\wx\msw\minifram.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\missing.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Release"

 
 

-SOURCE=..\..\include\wx\msw\msgdlg.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\mslu.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"

 
 

-SOURCE=..\..\include\wx\msw\msvcrt.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\notebook.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"

 
 

-SOURCE=..\..\include\wx\msw\ole\access.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\ole\automtn.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"

 
 

-SOURCE=..\..\include\wx\msw\ole\dataform.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\ole\dataobj.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"

 
 

-SOURCE=..\..\include\wx\msw\ole\dataobj2.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\ole\dropsrc.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"

 
 

-SOURCE=..\..\include\wx\msw\ole\droptgt.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\ole\oleutils.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"

 
 

-SOURCE=..\..\include\wx\msw\ole\uuid.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1
+
+!ENDIF

 
 

-SOURCE=..\..\include\wx\msw\palette.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\msw\pen.h
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\checklst.cpp

 
 

-SOURCE=..\..\include\wx\msw\printdlg.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "corelib - Win32 Debug"

 
 

-SOURCE=..\..\include\wx\msw\printwin.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\private.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Release"

 
 

-SOURCE=..\..\include\wx\msw\radiobox.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\radiobut.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"

 
 

-SOURCE=..\..\include\wx\msw\regconf.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\region.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"

 
 

-SOURCE=..\..\include\wx\msw\registry.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\scrolbar.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"

 
 

-SOURCE=..\..\include\wx\msw\setup0.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\slider95.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"

 
 

-SOURCE=..\..\include\wx\msw\slidrmsw.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\spinbutt.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"

 
 

-SOURCE=..\..\include\wx\msw\spinctrl.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\statbmp.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"

 
 

-SOURCE=..\..\include\wx\msw\statbox.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\msw\statbr95.h
-# End Source File
-# Begin Source File
+!ENDIF

 
 

-SOURCE=..\..\include\wx\msw\statline.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\msw\stattext.h
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\choice.cpp

 
 

-SOURCE=..\..\include\wx\msw\tabctrl.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "corelib - Win32 Debug"

 
 

-SOURCE=..\..\include\wx\msw\tbar95.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\tbarmsw.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Release"

 
 

-SOURCE=..\..\include\wx\msw\textctrl.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\tglbtn.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"

 
 

-SOURCE=..\..\include\wx\msw\timer.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\tooltip.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"

 
 

-SOURCE=..\..\include\wx\msw\toplevel.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\msw\treectrl.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"

 
 

-SOURCE=..\..\include\wx\msw\window.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\notebook.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"

 
 

-SOURCE=..\..\include\wx\ownerdrw.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\palette.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"

 
 

-SOURCE=..\..\include\wx\panel.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\paper.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"

 
 

-SOURCE=..\..\include\wx\pen.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\popupwin.h
-# End Source File
-# Begin Source File
+!ENDIF

 
 

-SOURCE=..\..\include\wx\print.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\printdlg.h
+SOURCE=..\..\src\msw\clipbrd.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\prntbase.h
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\colordlg.cpp

 
 

-SOURCE=..\..\include\wx\progdlg.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "corelib - Win32 Debug"

 
 

-SOURCE=..\..\include\wx\ptr_scpd.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\quantize.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Release"

 
 

-SOURCE=..\..\include\wx\radiobox.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\radiobut.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"

 
 

-SOURCE=..\..\include\wx\rawbmp.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\region.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"

 
 

-SOURCE=..\..\include\wx\renderer.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\scopeguard.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"

 
 

-SOURCE=..\..\include\wx\scrolbar.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\scrolwin.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"

 
 

-SOURCE=..\..\include\wx\selstore.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\settings.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"

 
 

-SOURCE=..\..\include\wx\sizer.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\slider.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"

 
 

-SOURCE=..\..\include\wx\spinbutt.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\spinctrl.h
-# End Source File
-# Begin Source File
+!ENDIF

 
 

-SOURCE=..\..\include\wx\splitter.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\stack.h
+SOURCE=..\..\src\msw\colour.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\statbmp.h
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\combobox.cpp

 
 

-SOURCE=..\..\include\wx\statbox.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "corelib - Win32 Debug"

 
 

-SOURCE=..\..\include\wx\statline.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\stattext.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Release"

 
 

-SOURCE=..\..\include\wx\statusbr.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\tab.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"

 
 

-SOURCE=..\..\include\wx\tabctrl.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\tbarbase.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"

 
 

-SOURCE=..\..\include\wx\tbarsmpl.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\textctrl.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"

 
 

-SOURCE=..\..\include\wx\textdlg.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\tglbtn.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"

 
 

-SOURCE=..\..\include\wx\timer.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\tipwin.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"

 
 

-SOURCE=..\..\include\wx\toolbar.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\tooltip.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"

 
 

-SOURCE=..\..\include\wx\toplevel.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\treebase.h
-# End Source File
-# Begin Source File
+!ENDIF

 
 

-SOURCE=..\..\include\wx\treectrl.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\univ\app.h
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\control.cpp

 
 

-SOURCE=..\..\include\wx\univ\bmpbuttn.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "corelib - Win32 Debug"

 
 

-SOURCE=..\..\include\wx\univ\button.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\univ\checkbox.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Release"

 
 

-SOURCE=..\..\include\wx\univ\checklst.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\univ\choice.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"

 
 

-SOURCE=..\..\include\wx\univ\colschem.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\univ\combobox.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"

 
 

-SOURCE=..\..\include\wx\univ\control.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\univ\dialog.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"

 
 

-SOURCE=..\..\include\wx\univ\frame.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\univ\gauge.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"

 
 

-SOURCE=..\..\include\wx\univ\inpcons.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\univ\inphand.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"

 
 

-SOURCE=..\..\include\wx\univ\listbox.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\univ\menu.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"

 
 

-SOURCE=..\..\include\wx\univ\menuitem.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\univ\notebook.h
-# End Source File
-# Begin Source File
+!ENDIF

 
 

-SOURCE=..\..\include\wx\univ\radiobox.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\univ\radiobut.h
+SOURCE=..\..\src\msw\cursor.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\univ\renderer.h
+SOURCE=..\..\src\msw\data.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\univ\scrarrow.h
+SOURCE=..\..\src\msw\ole\dataobj.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\univ\scrolbar.h
+SOURCE=..\..\src\msw\dc.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\univ\scrthumb.h
+SOURCE=..\..\src\msw\dcclient.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\univ\scrtimer.h
+SOURCE=..\..\src\msw\dcmemory.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\univ\slider.h
+SOURCE=..\..\src\msw\dcprint.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\univ\spinbutt.h
+SOURCE=..\..\src\msw\dcscreen.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\univ\statbmp.h
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\dialog.cpp

 
 

-SOURCE=..\..\include\wx\univ\statbox.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "corelib - Win32 Debug"

 
 

-SOURCE=..\..\include\wx\univ\statline.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\univ\stattext.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Release"

 
 

-SOURCE=..\..\include\wx\univ\statusbr.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\univ\textctrl.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"

 
 

-SOURCE=..\..\include\wx\univ\theme.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\univ\toolbar.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"

 
 

-SOURCE=..\..\include\wx\univ\toplevel.h
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\include\wx\univ\window.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"

 
 

-SOURCE=..\..\include\wx\valgen.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\validate.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"

 
 

-SOURCE=..\..\include\wx\valtext.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\include\wx\vlbox.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF

 
 

-SOURCE=..\..\include\wx\vms_x_fix.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\vscroll.h
+SOURCE=..\..\src\msw\dialup.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\window.h
+SOURCE=..\..\src\msw\dib.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\xpmdecod.h
+SOURCE=..\..\src\msw\dirdlg.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\xpmhand.h
+SOURCE=..\..\src\msw\display.cpp

 # End Source File
 # End Source File

-# End Group
-# Begin Group "Generic Sources"
-
-# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\generic\accel.cpp
+SOURCE=..\..\src\msw\dragimag.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\busyinfo.cpp
+SOURCE=..\..\src\msw\ole\dropsrc.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\choicdgg.cpp
+SOURCE=..\..\src\msw\ole\droptgt.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\colrdlgg.cpp
+SOURCE=..\..\src\msw\dummy.cpp
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\enhmeta.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\evtloop.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\fdrepdlg.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\dcpsg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\dirctrlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\dirdlgg.cpp
+SOURCE=..\..\src\msw\filedlg.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\dragimgg.cpp
+SOURCE=..\..\src\msw\font.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\fdrepdlg.cpp
+SOURCE=..\..\src\msw\fontdlg.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\filedlgg.cpp
-
-!IF  "$(CFG)" == "corelib - Win32 Debug"
+SOURCE=..\..\src\msw\fontenum.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\fontutil.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\frame.cpp
+
+!IF  "$(CFG)" == "corelib - Win32 Debug"

 
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\fontdlgg.cpp
+SOURCE=..\..\src\msw\gauge95.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\imaglist.cpp
+SOURCE=..\..\src\msw\gdiimage.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\gdiobj.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\gsockmsw.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\helpchm.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\helpwin.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\icon.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\imaglist.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\listctrl.cpp
+SOURCE=..\..\src\msw\iniconf.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\logg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\mdig.cpp
+SOURCE=..\..\src\msw\listbox.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\msgdlgg.cpp
+SOURCE=..\..\src\msw\listctrl.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\numdlgg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\panelg.cpp
+SOURCE=..\..\src\msw\main.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\prntdlgg.cpp
+SOURCE=..\..\src\msw\mdi.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\progdlgg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\renderg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\scrlwing.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\selstore.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\spinctlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\splitter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\statusbr.cpp
+SOURCE=..\..\src\msw\menu.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 


@@ -1911,910 +1483,954 @@ SOURCE=..\..\src\generic\statusbr.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\tabg.cpp
+SOURCE=..\..\src\msw\menuitem.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\generic\tbarsmpl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\textdlgg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\tipwin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\treectlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\vlbox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\vscroll.cpp
-# End Source File
-# End Group
-# Begin Group "wxUniv Sources"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\univ\bmpbuttn.cpp
+SOURCE=..\..\src\msw\metafile.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\button.cpp
+SOURCE=..\..\src\msw\minifram.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\msgdlg.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\checkbox.cpp
+SOURCE=..\..\src\msw\mslu.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\nativdlg.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\checklst.cpp
+SOURCE=..\..\src\msw\notebook.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\choice.cpp
+SOURCE=..\..\src\msw\ole\oleutils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\ownerdrw.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\colschem.cpp
+SOURCE=..\..\src\msw\palette.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\pen.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\penwin.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\combobox.cpp
-
+SOURCE=..\..\src\msw\popupwin.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\printdlg.cpp
+

 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\control.cpp
+SOURCE=..\..\src\msw\printwin.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\ctrlrend.cpp
+SOURCE=..\..\src\msw\radiobox.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\dialog.cpp
+SOURCE=..\..\src\msw\radiobut.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\framuniv.cpp
+SOURCE=..\..\src\msw\region.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\renderer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\scrolbar.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\gauge.cpp
+SOURCE=..\..\src\msw\settings.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\slider95.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\inpcons.cpp
+SOURCE=..\..\src\msw\spinbutt.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\inphand.cpp
+SOURCE=..\..\src\msw\spinctrl.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\listbox.cpp
+SOURCE=..\..\src\msw\statbmp.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\menu.cpp
+SOURCE=..\..\src\msw\statbox.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\notebook.cpp
+SOURCE=..\..\src\msw\statbr95.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\radiobox.cpp
+SOURCE=..\..\src\msw\statline.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\radiobut.cpp
+SOURCE=..\..\src\msw\stattext.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\scrarrow.cpp
+SOURCE=..\..\src\msw\tabctrl.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\scrolbar.cpp
+SOURCE=..\..\src\msw\tbar95.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\scrthumb.cpp
+SOURCE=..\..\src\msw\textctrl.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\slider.cpp
+SOURCE=..\..\src\msw\tglbtn.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\spinbutt.cpp
+SOURCE=..\..\src\msw\timer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\tooltip.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\toplevel.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\treectrl.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\statbmp.cpp
+SOURCE=..\..\src\msw\utilsgui.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\ole\uuid.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\uxtheme.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\volume.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\window.cpp
+# End Source File
+# End Group
+# Begin Group "Generic Sources"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\src\generic\accel.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 


@@ -2849,7 +2465,15 @@ SOURCE=..\..\src\univ\statbmp.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\statbox.cpp
+SOURCE=..\..\src\generic\busyinfo.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\choicdgg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\colrdlgg.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 


@@ -2884,7 +2508,15 @@ SOURCE=..\..\src\univ\statbox.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\statline.cpp
+SOURCE=..\..\src\generic\dcpsg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\dirctrlg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\dirdlgg.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 


@@ -2919,8 +2551,12 @@ SOURCE=..\..\src\univ\statline.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\stattext.cpp
-
+SOURCE=..\..\src\generic\dragimgg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\fdrepdlg.cpp
+

 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 # PROP Exclude_From_Build 1


@@ -2954,7 +2590,7 @@ SOURCE=..\..\src\univ\stattext.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\statusbr.cpp
+SOURCE=..\..\src\generic\filedlgg.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 


@@ -2989,7 +2625,7 @@ SOURCE=..\..\src\univ\statusbr.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\textctrl.cpp
+SOURCE=..\..\src\generic\fontdlgg.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 


@@ -3024,7 +2660,7 @@ SOURCE=..\..\src\univ\textctrl.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\theme.cpp
+SOURCE=..\..\src\generic\imaglist.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 


@@ -3059,7 +2695,7 @@ SOURCE=..\..\src\univ\theme.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\themes\gtk.cpp
+SOURCE=..\..\src\generic\listctrl.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 


@@ -3094,7 +2730,11 @@ SOURCE=..\..\src\univ\themes\gtk.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\themes\metal.cpp
+SOURCE=..\..\src\generic\logg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\mdig.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 


@@ -3129,7 +2769,7 @@ SOURCE=..\..\src\univ\themes\metal.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\themes\win32.cpp
+SOURCE=..\..\src\generic\msgdlgg.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 


@@ -3164,7 +2804,15 @@ SOURCE=..\..\src\univ\themes\win32.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\toolbar.cpp
+SOURCE=..\..\src\generic\numdlgg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\panelg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\prntdlgg.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 


@@ -3199,42 +2847,66 @@ SOURCE=..\..\src\univ\toolbar.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\topluniv.cpp
+SOURCE=..\..\src\generic\progdlgg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\renderg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\scrlwing.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\selstore.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\spinctlg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\splitter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\statusbr.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\univ\winuniv.cpp
+SOURCE=..\..\src\generic\tabg.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 


@@ -3267,2200 +2939,2540 @@ SOURCE=..\..\src\univ\winuniv.cpp
 !ENDIF
 
 # End Source File
 !ENDIF
 
 # End Source File

-# End Group
-# Begin Group "Common Sources"
-
-# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\common\accesscmn.cpp
+SOURCE=..\..\src\generic\tbarsmpl.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\appcmn.cpp
+SOURCE=..\..\src\generic\textdlgg.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\artprov.cpp
+SOURCE=..\..\src\generic\tipwin.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\artstd.cpp
+SOURCE=..\..\src\generic\treectlg.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\bmpbase.cpp
+SOURCE=..\..\src\generic\vlbox.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\choiccmn.cpp
+SOURCE=..\..\src\generic\vscroll.cpp

 # End Source File
 # End Source File

-# Begin Source File
+# End Group
+# Begin Group "wxUniv Sources"

 
 

-SOURCE=..\..\src\common\clipcmn.cpp
-# End Source File
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\common\cmdproc.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\univ\bmpbuttn.cpp

 
 

-SOURCE=..\..\src\common\cmndata.cpp
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "corelib - Win32 Debug"

 
 

-SOURCE=..\..\src\common\containr.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\cshelp.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Release"

 
 

-SOURCE=..\..\src\common\ctrlcmn.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\ctrlsub.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"

 
 

-SOURCE=..\..\src\common\datacmn.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\dcbase.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"

 
 

-SOURCE=..\..\src\common\dlgcmn.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\dndcmn.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"

 
 

-SOURCE=..\..\src\common\dobjcmn.cpp
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\src\common\docmdi.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"

 
 

-SOURCE=..\..\src\common\docview.cpp
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\src\common\dpycmn.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"

 
 

-SOURCE=..\..\src\common\dseldlg.cpp
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\src\common\effects.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"

 
 

-SOURCE=..\..\src\common\event.cpp
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\src\common\fddlgcmn.cpp
-# End Source File
-# Begin Source File
+!ENDIF

 
 

-SOURCE=..\..\src\common\fldlgcmn.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\fontcmn.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\univ\button.cpp

 
 

-SOURCE=..\..\src\common\fontmap.cpp
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "corelib - Win32 Debug"

 
 

-SOURCE=..\..\src\common\framecmn.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\fs_mem.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Release"

 
 

-SOURCE=..\..\src\common\gaugecmn.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\gdicmn.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"

 
 

-SOURCE=..\..\src\common\geometry.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\gifdecod.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"

 
 

-SOURCE=..\..\src\common\helpbase.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\iconbndl.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"

 
 

-SOURCE=..\..\src\common\imagall.cpp
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\src\common\imagbmp.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"

 
 

-SOURCE=..\..\src\common\image.cpp
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\src\common\imagfill.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"

 
 

-SOURCE=..\..\src\common\imaggif.cpp
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\src\common\imagiff.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"

 
 

-SOURCE=..\..\src\common\imagjpeg.cpp
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\src\common\imagpcx.cpp
-# End Source File
-# Begin Source File
+!ENDIF

 
 

-SOURCE=..\..\src\common\imagpng.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\imagpnm.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\univ\checkbox.cpp

 
 

-SOURCE=..\..\src\common\imagtiff.cpp
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "corelib - Win32 Debug"

 
 

-SOURCE=..\..\src\common\imagxpm.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\layout.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Release"

 
 

-SOURCE=..\..\src\common\lboxcmn.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\matrix.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"

 
 

-SOURCE=..\..\src\common\menucmn.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\msgout.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"

 
 

-SOURCE=..\..\src\common\nbkbase.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\paper.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"

 
 

-SOURCE=..\..\src\common\popupcmn.cpp
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\src\common\prntbase.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"

 
 

-SOURCE=..\..\src\common\quantize.cpp
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\src\common\radiocmn.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"

 
 

-SOURCE=..\..\src\common\rendcmn.cpp
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\src\common\rgncmn.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"

 
 

-SOURCE=..\..\src\common\settcmn.cpp
-# End Source File
-# Begin Source File

 
 

-SOURCE=..\..\src\common\sizer.cpp
-# End Source File
-# Begin Source File
+!ENDIF

 
 

-SOURCE=..\..\src\common\statbar.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\tbarbase.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\univ\checklst.cpp

 
 

-SOURCE=..\..\src\common\textcmn.cpp
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "corelib - Win32 Debug"

 
 

-SOURCE=..\..\src\common\timercmn.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\toplvcmn.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Release"

 
 

-SOURCE=..\..\src\common\treebase.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\utilscmn.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"

 
 

-SOURCE=..\..\src\common\valgen.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\validate.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"

 
 

-SOURCE=..\..\src\common\valtext.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1

 
 

-SOURCE=..\..\src\common\wincmn.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"

 
 

-SOURCE=..\..\src\common\xpmdecod.cpp
-# End Source File
-# End Group
-# Begin Group "MSW Sources"

 
 

-# PROP Default_Filter ""
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
+
+
+!ENDIF
+
+# End Source File

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\msw\accel.cpp
+SOURCE=..\..\src\univ\choice.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\app.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\bitmap.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\bmpbuttn.cpp
+SOURCE=..\..\src\univ\colschem.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\brush.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\button.cpp
+SOURCE=..\..\src\univ\combobox.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\caret.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\checkbox.cpp
+SOURCE=..\..\src\univ\control.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\checklst.cpp
+SOURCE=..\..\src\univ\ctrlrend.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\choice.cpp
+SOURCE=..\..\src\univ\dialog.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\clipbrd.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\colordlg.cpp
+SOURCE=..\..\src\univ\framuniv.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\colour.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\combobox.cpp
+SOURCE=..\..\src\univ\gauge.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\control.cpp
+SOURCE=..\..\src\univ\themes\gtk.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\cursor.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\data.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dcclient.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dcmemory.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dcprint.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dcscreen.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dialog.cpp
+SOURCE=..\..\src\univ\inpcons.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\dialup.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dib.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dirdlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\display.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dragimag.cpp
+SOURCE=..\..\src\univ\inphand.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\enhmeta.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\evtloop.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\fdrepdlg.cpp
+SOURCE=..\..\src\univ\listbox.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\filedlg.cpp
+SOURCE=..\..\src\univ\menu.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\font.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\fontdlg.cpp
+SOURCE=..\..\src\univ\themes\metal.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\fontenum.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\fontutil.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\frame.cpp
+SOURCE=..\..\src\univ\notebook.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\gauge95.cpp
+SOURCE=..\..\src\univ\radiobox.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\gdiimage.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\gdiobj.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\gsockmsw.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\helpchm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\helpwin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\icon.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\imaglist.cpp
+SOURCE=..\..\src\univ\radiobut.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\iniconf.cpp
+SOURCE=..\..\src\univ\scrarrow.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\listbox.cpp
+SOURCE=..\..\src\univ\scrolbar.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\listctrl.cpp
+SOURCE=..\..\src\univ\scrthumb.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\main.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\mdi.cpp
+SOURCE=..\..\src\univ\slider.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\menu.cpp
+SOURCE=..\..\src\univ\spinbutt.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\menuitem.cpp
+SOURCE=..\..\src\univ\statbmp.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\metafile.cpp
+SOURCE=..\..\src\univ\statbox.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\minifram.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\msgdlg.cpp
+SOURCE=..\..\src\univ\statline.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\mslu.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\nativdlg.cpp
+SOURCE=..\..\src\univ\stattext.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\notebook.cpp
+SOURCE=..\..\src\univ\statusbr.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\ole\access.cpp
+SOURCE=..\..\src\univ\textctrl.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\ole\automtn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\ole\dataobj.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\ole\dropsrc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\ole\droptgt.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\ole\oleutils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\ole\uuid.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\ownerdrw.cpp
+SOURCE=..\..\src\univ\theme.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\palette.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\pen.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\penwin.cpp
+SOURCE=..\..\src\univ\toolbar.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\popupwin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\printdlg.cpp
+SOURCE=..\..\src\univ\topluniv.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\printwin.cpp
+SOURCE=..\..\src\univ\themes\win32.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\radiobox.cpp
+SOURCE=..\..\src\univ\winuniv.cpp

 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 
 
 !IF  "$(CFG)" == "corelib - Win32 Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
 

+# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
 

-# PROP Exclude_From_Build 1

 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
 

-# PROP Exclude_From_Build 1

 
 !ENDIF
 
 # End Source File
 
 !ENDIF
 
 # End Source File

+# End Group
+# Begin Group "MSW Headers"
+
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\msw\radiobut.cpp
+SOURCE=..\..\include\wx\msw\accel.h
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "corelib - Win32 Debug"
+SOURCE=..\..\include\wx\msw\ole\access.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\app.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Release"
+SOURCE=..\..\include\wx\msw\ole\automtn.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\bitmap.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
+SOURCE=..\..\include\wx\msw\bmpbuttn.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\brush.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
+SOURCE=..\..\include\wx\msw\button.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\caret.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
+SOURCE=..\..\include\wx\msw\checkbox.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\checklst.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
+SOURCE=..\..\include\wx\msw\choice.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\clipbrd.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
+SOURCE=..\..\include\wx\msw\colordlg.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\colour.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
+SOURCE=..\..\include\wx\msw\combobox.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\control.h
+# End Source File
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\include\wx\msw\cursor.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\ole\dataform.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\region.cpp
+SOURCE=..\..\include\wx\msw\ole\dataobj.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\renderer.cpp
+SOURCE=..\..\include\wx\msw\ole\dataobj2.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\scrolbar.cpp
+SOURCE=..\..\include\wx\msw\dc.h
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "corelib - Win32 Debug"
+SOURCE=..\..\include\wx\msw\dcclient.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\dcmemory.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Release"
+SOURCE=..\..\include\wx\msw\dcprint.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\dcscreen.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
+SOURCE=..\..\include\wx\msw\dialog.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\dib.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
+SOURCE=..\..\include\wx\msw\dirdlg.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\dragimag.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
+SOURCE=..\..\include\wx\msw\ole\dropsrc.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\ole\droptgt.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
+SOURCE=..\..\include\wx\msw\enhmeta.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\fdrepdlg.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
+SOURCE=..\..\include\wx\msw\filedlg.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\font.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
+SOURCE=..\..\include\wx\msw\fontdlg.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\frame.h
+# End Source File
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\include\wx\msw\gauge95.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\gdiimage.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\settings.cpp
+SOURCE=..\..\include\wx\msw\gdiobj.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\slider95.cpp
+SOURCE=..\..\include\wx\msw\helpbest.h
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "corelib - Win32 Debug"
+SOURCE=..\..\include\wx\msw\helpchm.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\helpwin.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Release"
+SOURCE=..\..\include\wx\msw\icon.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\imaglist.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
+SOURCE=..\..\include\wx\msw\iniconf.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\listbox.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
+SOURCE=..\..\include\wx\msw\listctrl.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\mdi.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
+SOURCE=..\..\include\wx\msw\menu.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\menuitem.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
+SOURCE=..\..\include\wx\msw\metafile.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\minifram.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
+SOURCE=..\..\include\wx\msw\missing.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\msgdlg.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
+SOURCE=..\..\include\wx\msw\mslu.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\msvcrt.h
+# End Source File
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\include\wx\msw\notebook.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\ole\oleutils.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\spinbutt.cpp
+SOURCE=..\..\include\wx\msw\palette.h
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "corelib - Win32 Debug"
+SOURCE=..\..\include\wx\msw\pen.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\printdlg.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Release"
+SOURCE=..\..\include\wx\msw\printwin.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\private.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
+SOURCE=..\..\include\wx\msw\radiobox.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\radiobut.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
+SOURCE=..\..\include\wx\msw\regconf.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\region.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
+SOURCE=..\..\include\wx\msw\registry.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\scrolbar.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
+SOURCE=..\..\include\wx\msw\setup0.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\slider95.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
+SOURCE=..\..\include\wx\msw\slidrmsw.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\spinbutt.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
+SOURCE=..\..\include\wx\msw\spinctrl.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\statbmp.h
+# End Source File
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\include\wx\msw\statbox.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\statbr95.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\spinctrl.cpp
+SOURCE=..\..\include\wx\msw\statline.h
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "corelib - Win32 Debug"
+SOURCE=..\..\include\wx\msw\stattext.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\tabctrl.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Release"
+SOURCE=..\..\include\wx\msw\tbar95.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\tbarmsw.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
+SOURCE=..\..\include\wx\msw\textctrl.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\tglbtn.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
+SOURCE=..\..\include\wx\msw\timer.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msw\tooltip.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
+SOURCE=..\..\include\wx\msw\toplevel.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\treectrl.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
+SOURCE=..\..\include\wx\msw\ole\uuid.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\msw\window.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
+SOURCE=..\..\include\wx\msw\gnuwin32\winresrc.h
+# End Source File
+# End Group
+# Begin Group "Generic Headers"

 
 

-# PROP Exclude_From_Build 1
+# PROP Default_Filter ""
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
+SOURCE=..\..\include\wx\generic\accel.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\generic\choicdgg.h
+# End Source File
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\include\wx\generic\colrdlgg.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\generic\dcpsg.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\statbmp.cpp
+SOURCE=..\..\include\wx\generic\dirctrlg.h
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "corelib - Win32 Debug"
+SOURCE=..\..\include\wx\generic\dirdlgg.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\generic\dragimgg.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Release"
+SOURCE=..\..\include\wx\generic\fdrepdlg.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\generic\filedlgg.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
+SOURCE=..\..\include\wx\generic\fontdlgg.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\generic\imaglist.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
+SOURCE=..\..\include\wx\generic\listctrl.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\generic\logg.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
+SOURCE=..\..\include\wx\generic\mdig.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\generic\msgdlgg.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
+SOURCE=..\..\include\wx\generic\notebook.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\generic\panelg.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
+SOURCE=..\..\include\wx\generic\prntdlgg.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\generic\progdlgg.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
+SOURCE=..\..\include\wx\generic\scrolwin.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\generic\spinctlg.h
+# End Source File
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\include\wx\generic\splitter.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\generic\statusbr.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\statbox.cpp
+SOURCE=..\..\include\wx\generic\tabg.h
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "corelib - Win32 Debug"
+SOURCE=..\..\include\wx\generic\textdlgg.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\generic\timer.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Release"
+SOURCE=..\..\include\wx\generic\treectlg.h
+# End Source File
+# End Group
+# Begin Group "wxUniv Headers"

 
 

+# PROP Default_Filter ""
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
+SOURCE=..\..\include\wx\univ\app.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\univ\bmpbuttn.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
+SOURCE=..\..\include\wx\univ\button.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\univ\checkbox.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
+SOURCE=..\..\include\wx\univ\checklst.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\univ\choice.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
+SOURCE=..\..\include\wx\univ\colschem.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\univ\combobox.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
+SOURCE=..\..\include\wx\univ\control.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\univ\dialog.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
+SOURCE=..\..\include\wx\univ\frame.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\univ\gauge.h
+# End Source File
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\include\wx\univ\inpcons.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\univ\inphand.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\statbr95.cpp
+SOURCE=..\..\include\wx\univ\listbox.h
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "corelib - Win32 Debug"
+SOURCE=..\..\include\wx\univ\menu.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\univ\menuitem.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Release"
+SOURCE=..\..\include\wx\univ\notebook.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\univ\radiobox.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
+SOURCE=..\..\include\wx\univ\radiobut.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\univ\renderer.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
+SOURCE=..\..\include\wx\univ\scrarrow.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\univ\scrolbar.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
+SOURCE=..\..\include\wx\univ\scrthumb.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\univ\scrtimer.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
+SOURCE=..\..\include\wx\univ\slider.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\univ\spinbutt.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
+SOURCE=..\..\include\wx\univ\statbmp.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\univ\statbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\univ\statline.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\univ\stattext.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\univ\statusbr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\univ\textctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\univ\theme.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\univ\toolbar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\univ\toplevel.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
+SOURCE=..\..\include\wx\univ\window.h
+# End Source File
+# End Group
+# Begin Group "Common Headers"

 
 

-# PROP Exclude_From_Build 1
+# PROP Default_Filter ""
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\include\wx\accel.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\access.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\statline.cpp
+SOURCE=..\..\include\wx\afterstd.h
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "corelib - Win32 Debug"
+SOURCE=..\..\include\wx\artprov.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\bitmap.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Release"
+SOURCE=..\..\include\wx\bmpbuttn.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\brush.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
+SOURCE=..\..\include\wx\busyinfo.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\button.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
+SOURCE=..\..\include\wx\caret.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\checkbox.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
+SOURCE=..\..\include\wx\checklst.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\choicdlg.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
+SOURCE=..\..\include\wx\choice.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\clipbrd.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
+SOURCE=..\..\include\wx\cmdproc.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\cmndata.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
+SOURCE=..\..\include\wx\colordlg.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\colour.h
+# End Source File
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\include\wx\combobox.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\control.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\stattext.cpp
+SOURCE=..\..\include\wx\cshelp.h
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "corelib - Win32 Debug"
+SOURCE=..\..\include\wx\ctrlsub.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\cursor.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Release"
+SOURCE=..\..\include\wx\dataobj.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\dc.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
+SOURCE=..\..\include\wx\dcclient.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\dcmemory.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
+SOURCE=..\..\include\wx\dcmirror.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\dcprint.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
+SOURCE=..\..\include\wx\dcps.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\dcscreen.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
+SOURCE=..\..\include\wx\dialog.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\dialup.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
+SOURCE=..\..\include\wx\dirctrl.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\dirdlg.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
+SOURCE=..\..\include\wx\display.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\dnd.h
+# End Source File
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\include\wx\docmdi.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\docview.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\tabctrl.cpp
+SOURCE=..\..\include\wx\dragimag.h
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "corelib - Win32 Debug"
+SOURCE=..\..\include\wx\effects.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\evtloop.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Release"
+SOURCE=..\..\include\wx\fdrepdlg.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\filedlg.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
+SOURCE=..\..\include\wx\fmappriv.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\font.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
+SOURCE=..\..\include\wx\fontdlg.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\fontenum.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
+SOURCE=..\..\include\wx\fontutil.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\frame.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
+SOURCE=..\..\include\wx\gauge.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\gdicmn.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
+SOURCE=..\..\include\wx\gdiobj.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\geometry.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
+SOURCE=..\..\include\wx\gifdecod.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\glcanvas.h
+# End Source File
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\include\wx\help.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\helpbase.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\tbar95.cpp
+SOURCE=..\..\include\wx\helphtml.h
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "corelib - Win32 Debug"
+SOURCE=..\..\include\wx\helpwin.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\icon.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Release"
+SOURCE=..\..\include\wx\iconbndl.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\imagbmp.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
+SOURCE=..\..\include\wx\image.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\imaggif.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
+SOURCE=..\..\include\wx\imagiff.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\imagjpeg.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
+SOURCE=..\..\include\wx\imaglist.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\imagpcx.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
+SOURCE=..\..\include\wx\imagpng.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\imagpnm.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
+SOURCE=..\..\include\wx\imagtiff.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\imagxpm.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
+SOURCE=..\..\include\wx\layout.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\listbase.h
+# End Source File
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\include\wx\listbox.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\listctrl.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\textctrl.cpp
+SOURCE=..\..\include\wx\matrix.h
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "corelib - Win32 Debug"
+SOURCE=..\..\include\wx\mdi.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\menu.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Release"
+SOURCE=..\..\include\wx\menuitem.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\metafile.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
+SOURCE=..\..\include\wx\minifram.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\msgdlg.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
+SOURCE=..\..\include\wx\notebook.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\ownerdrw.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
+SOURCE=..\..\include\wx\palette.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\panel.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
+SOURCE=..\..\include\wx\paper.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\pen.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
+SOURCE=..\..\include\wx\popupwin.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\print.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
+SOURCE=..\..\include\wx\printdlg.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\prntbase.h
+# End Source File
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\include\wx\progdlg.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\ptr_scpd.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\tglbtn.cpp
+SOURCE=..\..\include\wx\quantize.h
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "corelib - Win32 Debug"
+SOURCE=..\..\include\wx\radiobox.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\radiobut.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Release"
+SOURCE=..\..\include\wx\rawbmp.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\region.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
+SOURCE=..\..\include\wx\renderer.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\scopeguard.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
+SOURCE=..\..\include\wx\scrolbar.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\scrolwin.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
+SOURCE=..\..\include\wx\selstore.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\settings.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
+SOURCE=..\..\include\wx\sizer.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\slider.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
+SOURCE=..\..\include\wx\spinbutt.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\spinctrl.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
+SOURCE=..\..\include\wx\splitter.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\stack.h
+# End Source File
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\include\wx\statbmp.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\statbox.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\timer.cpp
+SOURCE=..\..\include\wx\statline.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\tooltip.cpp
+SOURCE=..\..\include\wx\stattext.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\toplevel.cpp
+SOURCE=..\..\include\wx\statusbr.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\treectrl.cpp
+SOURCE=..\..\include\wx\tab.h
+# End Source File
+# Begin Source File

 
 

-!IF  "$(CFG)" == "corelib - Win32 Debug"
+SOURCE=..\..\include\wx\tabctrl.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\tbarbase.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Release"
+SOURCE=..\..\include\wx\tbarsmpl.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\textctrl.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Debug"
+SOURCE=..\..\include\wx\textdlg.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\tglbtn.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Unicode Release"
+SOURCE=..\..\include\wx\timer.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\tipwin.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Debug"
+SOURCE=..\..\include\wx\toolbar.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\tooltip.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Release"
+SOURCE=..\..\include\wx\toplevel.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\treebase.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Debug"
+SOURCE=..\..\include\wx\treectrl.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\valgen.h
+# End Source File
+# Begin Source File

 
 

-!ELSEIF  "$(CFG)" == "corelib - Win32 Universal Unicode Release"
+SOURCE=..\..\include\wx\validate.h
+# End Source File
+# Begin Source File

 
 

-# PROP Exclude_From_Build 1
+SOURCE=..\..\include\wx\valtext.h
+# End Source File
+# Begin Source File

 
 

-!ENDIF
+SOURCE=..\..\include\wx\vlbox.h
+# End Source File
+# Begin Source File

 
 

+SOURCE=..\..\include\wx\vms_x_fix.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\utilsgui.cpp
+SOURCE=..\..\include\wx\vscroll.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\uxtheme.cpp
+SOURCE=..\..\include\wx\window.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\volume.cpp
+SOURCE=..\..\include\wx\xpmdecod.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\window.cpp
+SOURCE=..\..\include\wx\xpmhand.h

 # End Source File
 # End Group
 # End Target
 # End Source File
 # End Group
 # End Target

diff --git a/build/msw/wx_dbgriddll.dsp b/build/msw/wx_dbgriddll.dsp
index da32c7d19cd0cfd65184441a9f55820a868e9a13..d3a4817dad4ea90c68320043eeb09b7c7692636d 100644 (file)
--- a/build/msw/wx_dbgriddll.dsp
+++ b/build/msw/wx_dbgriddll.dsp
@@ -247,14 +247,6 @@ LINK32=link.exe
 # Name "dbgriddll - Win32 DLL Universal Release"
 # Name "dbgriddll - Win32 DLL Universal Unicode Debug"
 # Name "dbgriddll - Win32 DLL Universal Unicode Release"
 # Name "dbgriddll - Win32 DLL Universal Release"
 # Name "dbgriddll - Win32 DLL Universal Unicode Debug"
 # Name "dbgriddll - Win32 DLL Universal Unicode Release"

-# Begin Group "Common Headers"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\include\wx\dbgrid.h
-# End Source File
-# End Group

 # Begin Group "Common Sources"
 
 # PROP Default_Filter ""
 # Begin Group "Common Sources"
 
 # PROP Default_Filter ""


@@ -273,6 +265,14 @@ SOURCE=..\..\src\msw\dummy.cpp
 # ADD CPP /Yc"wx/wxprec.h"
 # End Source File
 # End Group
 # ADD CPP /Yc"wx/wxprec.h"
 # End Source File
 # End Group

+# Begin Group "Common Headers"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\include\wx\dbgrid.h
+# End Source File
+# End Group

 # End Target
 # End Project
 
 # End Target
 # End Project
 

diff --git a/build/msw/wx_dbgridlib.dsp b/build/msw/wx_dbgridlib.dsp
index 8d654f574c966144ffd28ae103e402f6b1d91472..061c94aa91a9ec590614517f1b7801c7593ff7a7 100644 (file)
--- a/build/msw/wx_dbgridlib.dsp
+++ b/build/msw/wx_dbgridlib.dsp
@@ -230,14 +230,6 @@ LIB32=link.exe -lib
 # Name "dbgridlib - Win32 Universal Release"
 # Name "dbgridlib - Win32 Universal Unicode Debug"
 # Name "dbgridlib - Win32 Universal Unicode Release"
 # Name "dbgridlib - Win32 Universal Release"
 # Name "dbgridlib - Win32 Universal Unicode Debug"
 # Name "dbgridlib - Win32 Universal Unicode Release"

-# Begin Group "Common Headers"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\include\wx\dbgrid.h
-# End Source File
-# End Group

 # Begin Group "Common Sources"
 
 # PROP Default_Filter ""
 # Begin Group "Common Sources"
 
 # PROP Default_Filter ""


@@ -256,6 +248,14 @@ SOURCE=..\..\src\msw\dummy.cpp
 # ADD CPP /Yc"wx/wxprec.h"
 # End Source File
 # End Group
 # ADD CPP /Yc"wx/wxprec.h"
 # End Source File
 # End Group

+# Begin Group "Common Headers"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\include\wx\dbgrid.h
+# End Source File
+# End Group

 # End Target
 # End Project
 
 # End Target
 # End Project
 

diff --git a/build/msw/wx_gldll.dsp b/build/msw/wx_gldll.dsp
index 3c32e5b7daf6bab1abc9fd4710262e88f3351f99..fdb19fa9007a874565e15f8ee1bcbe94a2686dd7 100644 (file)
--- a/build/msw/wx_gldll.dsp
+++ b/build/msw/wx_gldll.dsp
@@ -247,14 +247,6 @@ LINK32=link.exe
 # Name "gldll - Win32 DLL Universal Release"
 # Name "gldll - Win32 DLL Universal Unicode Debug"
 # Name "gldll - Win32 DLL Universal Unicode Release"
 # Name "gldll - Win32 DLL Universal Release"
 # Name "gldll - Win32 DLL Universal Unicode Debug"
 # Name "gldll - Win32 DLL Universal Unicode Release"

-# Begin Group "Common Headers"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\glcanvas.h
-# End Source File
-# End Group

 # Begin Group "MSW Sources"
 
 # PROP Default_Filter ""
 # Begin Group "MSW Sources"
 
 # PROP Default_Filter ""


@@ -269,6 +261,14 @@ SOURCE=..\..\src\msw\dummy.cpp
 SOURCE=..\..\src\msw\glcanvas.cpp
 # End Source File
 # End Group
 SOURCE=..\..\src\msw\glcanvas.cpp
 # End Source File
 # End Group

+# Begin Group "MSW Headers"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\glcanvas.h
+# End Source File
+# End Group

 # End Target
 # End Project
 
 # End Target
 # End Project
 

diff --git a/build/msw/wx_gllib.dsp b/build/msw/wx_gllib.dsp
index d082110062a69ee99ff6657ef794763ec5a517c5..e17c409c9d14c9ca5146f6e730bd0d6f8b15dbfe 100644 (file)
--- a/build/msw/wx_gllib.dsp
+++ b/build/msw/wx_gllib.dsp
@@ -230,14 +230,6 @@ LIB32=link.exe -lib
 # Name "gllib - Win32 Universal Release"
 # Name "gllib - Win32 Universal Unicode Debug"
 # Name "gllib - Win32 Universal Unicode Release"
 # Name "gllib - Win32 Universal Release"
 # Name "gllib - Win32 Universal Unicode Debug"
 # Name "gllib - Win32 Universal Unicode Release"

-# Begin Group "Common Headers"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\glcanvas.h
-# End Source File
-# End Group

 # Begin Group "MSW Sources"
 
 # PROP Default_Filter ""
 # Begin Group "MSW Sources"
 
 # PROP Default_Filter ""


@@ -252,6 +244,14 @@ SOURCE=..\..\src\msw\dummy.cpp
 SOURCE=..\..\src\msw\glcanvas.cpp
 # End Source File
 # End Group
 SOURCE=..\..\src\msw\glcanvas.cpp
 # End Source File
 # End Group

+# Begin Group "MSW Headers"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\glcanvas.h
+# End Source File
+# End Group

 # End Target
 # End Project
 
 # End Target
 # End Project
 

diff --git a/build/msw/wx_htmldll.dsp b/build/msw/wx_htmldll.dsp
index e101a27cb66806eab9304963a9c384e568c9201d..a0c59793af81a79a4cef6b4e471373933503b694 100644 (file)
--- a/build/msw/wx_htmldll.dsp
+++ b/build/msw/wx_htmldll.dsp
@@ -247,178 +247,182 @@ LINK32=link.exe
 # Name "htmldll - Win32 DLL Universal Release"
 # Name "htmldll - Win32 DLL Universal Unicode Debug"
 # Name "htmldll - Win32 DLL Universal Unicode Release"
 # Name "htmldll - Win32 DLL Universal Release"
 # Name "htmldll - Win32 DLL Universal Unicode Debug"
 # Name "htmldll - Win32 DLL Universal Unicode Release"

-# Begin Group "Common Headers"
+# Begin Group "MSW Sources"

 
 # PROP Default_Filter ""
 # Begin Source File
 
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=..\..\include\wx\html\forcelnk.h
+SOURCE=..\..\src\msw\dummy.cpp
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\html\helpctrl.h
+SOURCE=..\..\src\msw\helpbest.cpp

 # End Source File
 # End Source File

+# End Group
+# Begin Group "Generic Sources"
+
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\include\wx\html\helpdata.h
+SOURCE=..\..\src\generic\htmllbox.cpp

 # End Source File
 # End Source File

+# End Group
+# Begin Group "wxHTML Sources"
+
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\include\wx\html\helpfrm.h
+SOURCE=..\..\src\html\helpctrl.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\html\htmlcell.h
+SOURCE=..\..\src\html\helpdata.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\html\htmldefs.h
+SOURCE=..\..\src\html\helpfrm.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\html\htmlfilt.h
+SOURCE=..\..\src\html\htmlcell.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\html\htmlpars.h
+SOURCE=..\..\src\html\htmlfilt.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\html\htmlproc.h
+SOURCE=..\..\src\html\htmlpars.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\html\htmltag.h
+SOURCE=..\..\src\html\htmltag.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\html\htmlwin.h
+SOURCE=..\..\src\html\htmlwin.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\html\htmprint.h
+SOURCE=..\..\src\html\htmprint.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\html\m_templ.h
+SOURCE=..\..\src\html\m_dflist.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\html\winpars.h
+SOURCE=..\..\src\html\m_fonts.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\htmllbox.h
+SOURCE=..\..\src\html\m_hline.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\wxhtml.h
+SOURCE=..\..\src\html\m_image.cpp

 # End Source File
 # End Source File

-# End Group
-# Begin Group "wxHTML Sources"
-
-# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\html\helpctrl.cpp
+SOURCE=..\..\src\html\m_layout.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\helpdata.cpp
+SOURCE=..\..\src\html\m_links.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\helpfrm.cpp
+SOURCE=..\..\src\html\m_list.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\htmlcell.cpp
+SOURCE=..\..\src\html\m_pre.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\htmlfilt.cpp
+SOURCE=..\..\src\html\m_style.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\htmlpars.cpp
+SOURCE=..\..\src\html\m_tables.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\htmltag.cpp
+SOURCE=..\..\src\html\winpars.cpp

 # End Source File
 # End Source File

+# End Group
+# Begin Group "wxHTML Headers"
+
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\html\htmlwin.cpp
+SOURCE=..\..\include\wx\html\forcelnk.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\htmprint.cpp
+SOURCE=..\..\include\wx\html\helpctrl.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\m_dflist.cpp
+SOURCE=..\..\include\wx\html\helpdata.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\m_fonts.cpp
+SOURCE=..\..\include\wx\html\helpfrm.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\m_hline.cpp
+SOURCE=..\..\include\wx\html\htmlcell.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\m_image.cpp
+SOURCE=..\..\include\wx\html\htmldefs.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\m_layout.cpp
+SOURCE=..\..\include\wx\html\htmlfilt.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\m_links.cpp
+SOURCE=..\..\include\wx\html\htmlpars.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\m_list.cpp
+SOURCE=..\..\include\wx\html\htmlproc.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\m_pre.cpp
+SOURCE=..\..\include\wx\html\htmltag.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\m_style.cpp
+SOURCE=..\..\include\wx\html\htmlwin.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\m_tables.cpp
+SOURCE=..\..\include\wx\html\htmprint.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\winpars.cpp
+SOURCE=..\..\include\wx\html\m_templ.h

 # End Source File
 # End Source File

-# End Group
-# Begin Group "Generic Sources"
-
-# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\generic\htmllbox.cpp
+SOURCE=..\..\include\wx\html\winpars.h

 # End Source File
 # End Group
 # End Source File
 # End Group

-# Begin Group "MSW Sources"
+# Begin Group "Common Headers"

 
 # PROP Default_Filter ""
 # Begin Source File
 
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
+SOURCE=..\..\include\wx\htmllbox.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\helpbest.cpp
+SOURCE=..\..\include\wx\wxhtml.h

 # End Source File
 # End Group
 # End Target
 # End Source File
 # End Group
 # End Target

diff --git a/build/msw/wx_htmllib.dsp b/build/msw/wx_htmllib.dsp
index 652ce7d2ef8496b9500e8c909205504ff1ee0c11..806a213a2fa6d2d2fe90a246865e4a304e7acc71 100644 (file)
--- a/build/msw/wx_htmllib.dsp
+++ b/build/msw/wx_htmllib.dsp
@@ -230,178 +230,182 @@ LIB32=link.exe -lib
 # Name "htmllib - Win32 Universal Release"
 # Name "htmllib - Win32 Universal Unicode Debug"
 # Name "htmllib - Win32 Universal Unicode Release"
 # Name "htmllib - Win32 Universal Release"
 # Name "htmllib - Win32 Universal Unicode Debug"
 # Name "htmllib - Win32 Universal Unicode Release"

-# Begin Group "Common Headers"
+# Begin Group "MSW Sources"

 
 # PROP Default_Filter ""
 # Begin Source File
 
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=..\..\include\wx\html\forcelnk.h
+SOURCE=..\..\src\msw\dummy.cpp
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\html\helpctrl.h
+SOURCE=..\..\src\msw\helpbest.cpp

 # End Source File
 # End Source File

+# End Group
+# Begin Group "Generic Sources"
+
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\include\wx\html\helpdata.h
+SOURCE=..\..\src\generic\htmllbox.cpp

 # End Source File
 # End Source File

+# End Group
+# Begin Group "wxHTML Sources"
+
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\include\wx\html\helpfrm.h
+SOURCE=..\..\src\html\helpctrl.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\html\htmlcell.h
+SOURCE=..\..\src\html\helpdata.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\html\htmldefs.h
+SOURCE=..\..\src\html\helpfrm.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\html\htmlfilt.h
+SOURCE=..\..\src\html\htmlcell.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\html\htmlpars.h
+SOURCE=..\..\src\html\htmlfilt.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\html\htmlproc.h
+SOURCE=..\..\src\html\htmlpars.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\html\htmltag.h
+SOURCE=..\..\src\html\htmltag.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\html\htmlwin.h
+SOURCE=..\..\src\html\htmlwin.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\html\htmprint.h
+SOURCE=..\..\src\html\htmprint.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\html\m_templ.h
+SOURCE=..\..\src\html\m_dflist.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\html\winpars.h
+SOURCE=..\..\src\html\m_fonts.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\htmllbox.h
+SOURCE=..\..\src\html\m_hline.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\wxhtml.h
+SOURCE=..\..\src\html\m_image.cpp

 # End Source File
 # End Source File

-# End Group
-# Begin Group "wxHTML Sources"
-
-# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\html\helpctrl.cpp
+SOURCE=..\..\src\html\m_layout.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\helpdata.cpp
+SOURCE=..\..\src\html\m_links.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\helpfrm.cpp
+SOURCE=..\..\src\html\m_list.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\htmlcell.cpp
+SOURCE=..\..\src\html\m_pre.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\htmlfilt.cpp
+SOURCE=..\..\src\html\m_style.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\htmlpars.cpp
+SOURCE=..\..\src\html\m_tables.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\htmltag.cpp
+SOURCE=..\..\src\html\winpars.cpp

 # End Source File
 # End Source File

+# End Group
+# Begin Group "wxHTML Headers"
+
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\html\htmlwin.cpp
+SOURCE=..\..\include\wx\html\forcelnk.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\htmprint.cpp
+SOURCE=..\..\include\wx\html\helpctrl.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\m_dflist.cpp
+SOURCE=..\..\include\wx\html\helpdata.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\m_fonts.cpp
+SOURCE=..\..\include\wx\html\helpfrm.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\m_hline.cpp
+SOURCE=..\..\include\wx\html\htmlcell.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\m_image.cpp
+SOURCE=..\..\include\wx\html\htmldefs.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\m_layout.cpp
+SOURCE=..\..\include\wx\html\htmlfilt.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\m_links.cpp
+SOURCE=..\..\include\wx\html\htmlpars.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\m_list.cpp
+SOURCE=..\..\include\wx\html\htmlproc.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\m_pre.cpp
+SOURCE=..\..\include\wx\html\htmltag.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\m_style.cpp
+SOURCE=..\..\include\wx\html\htmlwin.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\m_tables.cpp
+SOURCE=..\..\include\wx\html\htmprint.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\html\winpars.cpp
+SOURCE=..\..\include\wx\html\m_templ.h

 # End Source File
 # End Source File

-# End Group
-# Begin Group "Generic Sources"
-
-# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\generic\htmllbox.cpp
+SOURCE=..\..\include\wx\html\winpars.h

 # End Source File
 # End Group
 # End Source File
 # End Group

-# Begin Group "MSW Sources"
+# Begin Group "Common Headers"

 
 # PROP Default_Filter ""
 # Begin Source File
 
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
+SOURCE=..\..\include\wx\htmllbox.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\helpbest.cpp
+SOURCE=..\..\include\wx\wxhtml.h

 # End Source File
 # End Group
 # End Target
 # End Source File
 # End Group
 # End Target

diff --git a/build/msw/wx_netdll.dsp b/build/msw/wx_netdll.dsp
index 1d261c4448280b3732d25df74a6ccf853058a722..3848e2a00765f887564b75a4061f12d103fe12e8 100644 (file)
--- a/build/msw/wx_netdll.dsp
+++ b/build/msw/wx_netdll.dsp
@@ -47,12 +47,12 @@ RSC=rc.exe
 # PROP Output_Dir "..\..\lib\vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\netdll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\netdll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswddll\wxbase250d_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswddll\wxbase250d_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswddll\wxbase250d_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswddll\wxbase250d_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -72,12 +72,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\netdll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\netdll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_netdll.pch" /Fd..\..\lib\vc_mswdll\wxbase250_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_netdll.pch" /Fd..\..\lib\vc_mswdll\wxbase250_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_mswdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_mswdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_netdll.pch" /Fd..\..\lib\vc_mswdll\wxbase250_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_netdll.pch" /Fd..\..\lib\vc_mswdll\wxbase250_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_mswdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_mswdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -97,12 +97,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\netdll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\netdll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswuddll\wxbase250ud_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswuddll\wxbase250ud_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswuddll\wxbase250ud_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswuddll\wxbase250ud_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -122,12 +122,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\netdll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\netdll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netdll.pch" /Fd..\..\lib\vc_mswudll\wxbase250u_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netdll.pch" /Fd..\..\lib\vc_mswudll\wxbase250u_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netdll.pch" /Fd..\..\lib\vc_mswudll\wxbase250u_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netdll.pch" /Fd..\..\lib\vc_mswudll\wxbase250u_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -147,12 +147,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\netdll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\netdll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivddll\wxbase250d_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivddll\wxbase250d_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswunivddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswunivddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivddll\wxbase250d_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivddll\wxbase250d_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswunivddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswunivddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -172,12 +172,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\netdll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\netdll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_netdll.pch" /Fd..\..\lib\vc_mswunivdll\wxbase250_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_netdll.pch" /Fd..\..\lib\vc_mswunivdll\wxbase250_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_mswunivdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_mswunivdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_netdll.pch" /Fd..\..\lib\vc_mswunivdll\wxbase250_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_netdll.pch" /Fd..\..\lib\vc_mswunivdll\wxbase250_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_mswunivdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_mswunivdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -197,12 +197,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\netdll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\netdll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivuddll\wxbase250ud_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivuddll\wxbase250ud_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivuddll\wxbase250ud_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivuddll\wxbase250ud_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -222,12 +222,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\netdll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\netdll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netdll.pch" /Fd..\..\lib\vc_mswunivudll\wxbase250u_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netdll.pch" /Fd..\..\lib\vc_mswunivudll\wxbase250u_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netdll.pch" /Fd..\..\lib\vc_mswunivudll\wxbase250u_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netdll.pch" /Fd..\..\lib\vc_mswunivudll\wxbase250u_net_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -247,115 +247,119 @@ LINK32=link.exe
 # Name "netdll - Win32 DLL Universal Release"
 # Name "netdll - Win32 DLL Universal Unicode Debug"
 # Name "netdll - Win32 DLL Universal Unicode Release"
 # Name "netdll - Win32 DLL Universal Release"
 # Name "netdll - Win32 DLL Universal Unicode Debug"
 # Name "netdll - Win32 DLL Universal Unicode Release"

-# Begin Group "Common Headers"
+# Begin Group "Common Sources"

 
 # PROP Default_Filter ""
 # Begin Source File
 
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=..\..\include\wx\fs_inet.h
+SOURCE=..\..\src\common\fs_inet.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\gsocket.h
+SOURCE=..\..\src\common\ftp.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\msw\gsockmsw.h
+SOURCE=..\..\src\common\http.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\protocol\file.h
+SOURCE=..\..\src\common\protocol.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\protocol\ftp.h
+SOURCE=..\..\src\common\sckaddr.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\protocol\http.h
+SOURCE=..\..\src\common\sckfile.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\protocol\protocol.h
+SOURCE=..\..\src\common\sckipc.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\sckaddr.h
+SOURCE=..\..\src\common\sckstrm.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\sckipc.h
+SOURCE=..\..\src\common\socket.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\sckstrm.h
+SOURCE=..\..\src\common\url.cpp

 # End Source File
 # End Source File

+# End Group
+# Begin Group "MSW Sources"
+
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\include\wx\socket.h
+SOURCE=..\..\src\msw\dummy.cpp
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\url.h
+SOURCE=..\..\src\msw\gsocket.c
+# SUBTRACT CPP /YX /Yc /Yu

 # End Source File
 # End Group
 # End Source File
 # End Group

-# Begin Group "Common Sources"
+# Begin Group "MSW Headers"

 
 # PROP Default_Filter ""
 # Begin Source File
 
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=..\..\src\common\fs_inet.cpp
+SOURCE=..\..\include\wx\msw\gsockmsw.h

 # End Source File
 # End Source File

+# End Group
+# Begin Group "Common Headers"
+
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\common\ftp.cpp
+SOURCE=..\..\include\wx\protocol\file.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\http.cpp
+SOURCE=..\..\include\wx\fs_inet.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\protocol.cpp
+SOURCE=..\..\include\wx\protocol\ftp.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\sckaddr.cpp
+SOURCE=..\..\include\wx\gsocket.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\sckfile.cpp
+SOURCE=..\..\include\wx\protocol\http.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\sckipc.cpp
+SOURCE=..\..\include\wx\protocol\protocol.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\sckstrm.cpp
+SOURCE=..\..\include\wx\sckaddr.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\socket.cpp
+SOURCE=..\..\include\wx\sckipc.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\url.cpp
+SOURCE=..\..\include\wx\sckstrm.h

 # End Source File
 # End Source File

-# End Group
-# Begin Group "MSW Sources"
-
-# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
+SOURCE=..\..\include\wx\socket.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\gsocket.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=..\..\include\wx\url.h

 # End Source File
 # End Group
 # End Target
 # End Source File
 # End Group
 # End Target

diff --git a/build/msw/wx_netlib.dsp b/build/msw/wx_netlib.dsp
index aa336c1a79741ad0cf9de01194bdcb06d6d2a2f9..7ec70e74d0f9a9cfb5b0d0fb0264e3836f13b7c8 100644 (file)
--- a/build/msw/wx_netlib.dsp
+++ b/build/msw/wx_netlib.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
 # PROP Output_Dir "..\..\lib\vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\netlib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\netlib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswd\wxbase25d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswd\wxbase25d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswd\wxbase25d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswd\wxbase25d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -69,8 +69,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_msw"
 # PROP Intermediate_Dir "vc_msw\netlib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_msw"
 # PROP Intermediate_Dir "vc_msw\netlib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_msw" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_msw\wxbase25_net.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_msw" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_msw\wxbase25_net.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_msw" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_msw\wxbase25_net.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_msw" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_msw\wxbase25_net.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -92,8 +92,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\netlib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\netlib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswud\wxbase25ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswud\wxbase25ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswud\wxbase25ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswud\wxbase25ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -115,8 +115,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\netlib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\netlib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswu\wxbase25u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswu\wxbase25u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswu\wxbase25u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswu\wxbase25u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -138,8 +138,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\netlib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\netlib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivd\wxbase25d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivd\wxbase25d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivd\wxbase25d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivd\wxbase25d_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -161,8 +161,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\netlib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\netlib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswuniv" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswuniv\wxbase25_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswuniv" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswuniv\wxbase25_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswuniv" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswuniv\wxbase25_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswuniv" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswuniv\wxbase25_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -184,8 +184,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\netlib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\netlib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivud\wxbase25ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivud\wxbase25ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivud\wxbase25ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivud\wxbase25ud_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -207,8 +207,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\netlib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\netlib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswunivu\wxbase25u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswunivu\wxbase25u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswunivu\wxbase25u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswunivu\wxbase25u_net.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_netlib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -230,111 +230,111 @@ LIB32=link.exe -lib
 # Name "netlib - Win32 Universal Release"
 # Name "netlib - Win32 Universal Unicode Debug"
 # Name "netlib - Win32 Universal Unicode Release"
 # Name "netlib - Win32 Universal Release"
 # Name "netlib - Win32 Universal Unicode Debug"
 # Name "netlib - Win32 Universal Unicode Release"

-# Begin Group "Common Headers"
+# Begin Group "Common Sources"

 
 # PROP Default_Filter ""
 # Begin Source File
 
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=..\..\include\wx\fs_inet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\gsocket.h
+SOURCE=..\..\src\common\fs_inet.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\protocol\file.h
+SOURCE=..\..\src\common\ftp.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\protocol\ftp.h
+SOURCE=..\..\src\common\http.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\protocol\http.h
+SOURCE=..\..\src\common\protocol.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\protocol\protocol.h
+SOURCE=..\..\src\common\sckaddr.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\sckaddr.h
+SOURCE=..\..\src\common\sckfile.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\sckipc.h
+SOURCE=..\..\src\common\sckipc.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\sckstrm.h
+SOURCE=..\..\src\common\sckstrm.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\socket.h
+SOURCE=..\..\src\common\socket.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\url.h
+SOURCE=..\..\src\common\url.cpp

 # End Source File
 # End Group
 # End Source File
 # End Group

-# Begin Group "Common Sources"
+# Begin Group "MSW Sources"

 
 # PROP Default_Filter ""
 # Begin Source File
 
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=..\..\src\common\fs_inet.cpp
+SOURCE=..\..\src\msw\dummy.cpp
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\ftp.cpp
+SOURCE=..\..\src\msw\gsocket.c
+# SUBTRACT CPP /YX /Yc /Yu

 # End Source File
 # End Source File

+# End Group
+# Begin Group "Common Headers"
+
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\common\http.cpp
+SOURCE=..\..\include\wx\protocol\file.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\protocol.cpp
+SOURCE=..\..\include\wx\fs_inet.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\sckaddr.cpp
+SOURCE=..\..\include\wx\protocol\ftp.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\sckfile.cpp
+SOURCE=..\..\include\wx\gsocket.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\sckipc.cpp
+SOURCE=..\..\include\wx\protocol\http.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\sckstrm.cpp
+SOURCE=..\..\include\wx\protocol\protocol.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\socket.cpp
+SOURCE=..\..\include\wx\sckaddr.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\url.cpp
+SOURCE=..\..\include\wx\sckipc.h

 # End Source File
 # End Source File

-# End Group
-# Begin Group "MSW Sources"
+# Begin Source File

 
 

-# PROP Default_Filter ""
+SOURCE=..\..\include\wx\sckstrm.h
+# End Source File

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
+SOURCE=..\..\include\wx\socket.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\msw\gsocket.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=..\..\include\wx\url.h

 # End Source File
 # End Group
 # End Target
 # End Source File
 # End Group
 # End Target

diff --git a/build/msw/wx_odbcdll.dsp b/build/msw/wx_odbcdll.dsp
index eae4be4917415c437e9be08efbf55dd066e2c4f8..fc5e99b270a5b0cede2e949ed60964271da54829 100644 (file)
--- a/build/msw/wx_odbcdll.dsp
+++ b/build/msw/wx_odbcdll.dsp
@@ -47,12 +47,12 @@ RSC=rc.exe
 # PROP Output_Dir "..\..\lib\vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\odbcdll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\odbcdll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswddll\wxbase250d_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswddll\wxbase250d_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswddll\wxbase250d_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswddll\wxbase250d_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -72,12 +72,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\odbcdll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\odbcdll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_mswdll\wxbase250_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_mswdll\wxbase250_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_mswdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
-# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_mswdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_mswdll\wxbase250_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_mswdll\wxbase250_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_mswdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_mswdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -97,12 +97,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\odbcdll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\odbcdll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswuddll\wxbase250ud_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswuddll\wxbase250ud_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswuddll\wxbase250ud_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswuddll\wxbase250ud_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -122,12 +122,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\odbcdll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\odbcdll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_mswudll\wxbase250u_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_mswudll\wxbase250u_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_mswudll\wxbase250u_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_mswudll\wxbase250u_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -147,12 +147,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\odbcdll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\odbcdll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivddll\wxbase250d_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivddll\wxbase250d_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswunivddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswunivddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivddll\wxbase250d_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivddll\wxbase250d_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswunivddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswunivddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -172,12 +172,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\odbcdll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\odbcdll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_mswunivdll\wxbase250_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_mswunivdll\wxbase250_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_mswunivdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_mswunivdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_mswunivdll\wxbase250_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_mswunivdll\wxbase250_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_mswunivdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_mswunivdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -197,12 +197,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\odbcdll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\odbcdll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivuddll\wxbase250ud_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivuddll\wxbase250ud_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivuddll\wxbase250ud_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivuddll\wxbase250ud_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -222,12 +222,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\odbcdll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\odbcdll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_mswunivudll\wxbase250u_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_mswunivudll\wxbase250u_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_mswunivudll\wxbase250u_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_mswunivudll\wxbase250u_odbc_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -247,42 +247,42 @@ LINK32=link.exe
 # Name "odbcdll - Win32 DLL Universal Release"
 # Name "odbcdll - Win32 DLL Universal Unicode Debug"
 # Name "odbcdll - Win32 DLL Universal Unicode Release"
 # Name "odbcdll - Win32 DLL Universal Release"
 # Name "odbcdll - Win32 DLL Universal Unicode Debug"
 # Name "odbcdll - Win32 DLL Universal Unicode Release"

-# Begin Group "Common Headers"
+# Begin Group "Common Sources"

 
 # PROP Default_Filter ""
 # Begin Source File
 
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=..\..\include\wx\db.h
+SOURCE=..\..\src\common\db.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dbkeyg.h
+SOURCE=..\..\src\common\dbtable.cpp

 # End Source File
 # End Source File

+# End Group
+# Begin Group "MSW Sources"
+
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\include\wx\dbtable.h
+SOURCE=..\..\src\msw\dummy.cpp
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"

 # End Source File
 # End Group
 # End Source File
 # End Group

-# Begin Group "Common Sources"
+# Begin Group "Common Headers"

 
 # PROP Default_Filter ""
 # Begin Source File
 
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=..\..\src\common\db.cpp
+SOURCE=..\..\include\wx\db.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\dbtable.cpp
+SOURCE=..\..\include\wx\dbkeyg.h

 # End Source File
 # End Source File

-# End Group
-# Begin Group "MSW Sources"
-
-# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
+SOURCE=..\..\include\wx\dbtable.h

 # End Source File
 # End Group
 # End Target
 # End Source File
 # End Group
 # End Target

diff --git a/build/msw/wx_odbclib.dsp b/build/msw/wx_odbclib.dsp
index 5128655f1eb0db90bd576257494189c065f1d922..c551422b7a8820804c26db2a785af27158aadedd 100644 (file)
--- a/build/msw/wx_odbclib.dsp
+++ b/build/msw/wx_odbclib.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
 # PROP Output_Dir "..\..\lib\vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\odbclib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\odbclib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswd\wxbase25d_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswd\wxbase25d_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswd\wxbase25d_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswd\wxbase25d_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -69,8 +69,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_msw"
 # PROP Intermediate_Dir "vc_msw\odbclib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_msw"
 # PROP Intermediate_Dir "vc_msw\odbclib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_msw" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_msw\wxbase25_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_msw" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_msw\wxbase25_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_msw" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_msw\wxbase25_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_msw" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_msw\wxbase25_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_GUI=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -92,8 +92,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\odbclib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\odbclib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswud\wxbase25ud_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswud\wxbase25ud_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswud\wxbase25ud_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswud\wxbase25ud_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -115,8 +115,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\odbclib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\odbclib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswu\wxbase25u_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswu\wxbase25u_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswu\wxbase25u_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswu\wxbase25u_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -138,8 +138,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\odbclib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\odbclib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivd\wxbase25d_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivd\wxbase25d_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivd\wxbase25d_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivd\wxbase25d_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -161,8 +161,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\odbclib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\odbclib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswuniv" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswuniv\wxbase25_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswuniv" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswuniv\wxbase25_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswuniv" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswuniv\wxbase25_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswuniv" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswuniv\wxbase25_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -184,8 +184,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\odbclib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\odbclib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivud\wxbase25ud_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivud\wxbase25ud_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivud\wxbase25ud_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivud\wxbase25ud_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -207,8 +207,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\odbclib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\odbclib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswunivu\wxbase25u_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswunivu\wxbase25u_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswunivu\wxbase25u_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswunivu\wxbase25u_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_odbclib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -230,42 +230,42 @@ LIB32=link.exe -lib
 # Name "odbclib - Win32 Universal Release"
 # Name "odbclib - Win32 Universal Unicode Debug"
 # Name "odbclib - Win32 Universal Unicode Release"
 # Name "odbclib - Win32 Universal Release"
 # Name "odbclib - Win32 Universal Unicode Debug"
 # Name "odbclib - Win32 Universal Unicode Release"

-# Begin Group "Common Headers"
+# Begin Group "Common Sources"

 
 # PROP Default_Filter ""
 # Begin Source File
 
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=..\..\include\wx\db.h
+SOURCE=..\..\src\common\db.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\include\wx\dbkeyg.h
+SOURCE=..\..\src\common\dbtable.cpp

 # End Source File
 # End Source File

+# End Group
+# Begin Group "MSW Sources"
+
+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\include\wx\dbtable.h
+SOURCE=..\..\src\msw\dummy.cpp
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"

 # End Source File
 # End Group
 # End Source File
 # End Group

-# Begin Group "Common Sources"
+# Begin Group "Common Headers"

 
 # PROP Default_Filter ""
 # Begin Source File
 
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=..\..\src\common\db.cpp
+SOURCE=..\..\include\wx\db.h

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\..\src\common\dbtable.cpp
+SOURCE=..\..\include\wx\dbkeyg.h

 # End Source File
 # End Source File

-# End Group
-# Begin Group "MSW Sources"
-
-# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
+SOURCE=..\..\include\wx\dbtable.h

 # End Source File
 # End Group
 # End Target
 # End Source File
 # End Group
 # End Target

diff --git a/build/msw/wx_xmldll.dsp b/build/msw/wx_xmldll.dsp
index a68b9f707f8d8356bbe6c7870465ce12c6b4e120..5c6239e14807412543ffd9c0792436b0a2e06c19 100644 (file)
--- a/build/msw/wx_xmldll.dsp
+++ b/build/msw/wx_xmldll.dsp
@@ -47,12 +47,12 @@ RSC=rc.exe
 # PROP Output_Dir "..\..\lib\vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\xmldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\xmldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswddll\wxbase250d_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswddll\wxbase250d_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswddll\wxbase250d_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswddll\wxbase250d_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -72,12 +72,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\xmldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\xmldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_xmldll.pch" /Fd..\..\lib\vc_mswdll\wxbase250_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_xmldll.pch" /Fd..\..\lib\vc_mswdll\wxbase250_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_mswdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_mswdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_xmldll.pch" /Fd..\..\lib\vc_mswdll\wxbase250_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_xmldll.pch" /Fd..\..\lib\vc_mswdll\wxbase250_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_mswdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_mswdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -97,12 +97,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\xmldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\xmldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswuddll\wxbase250ud_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswuddll\wxbase250ud_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswuddll\wxbase250ud_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswuddll\wxbase250ud_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -122,12 +122,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\xmldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\xmldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xmldll.pch" /Fd..\..\lib\vc_mswudll\wxbase250u_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xmldll.pch" /Fd..\..\lib\vc_mswudll\wxbase250u_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xmldll.pch" /Fd..\..\lib\vc_mswudll\wxbase250u_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_xmldll.pch" /Fd..\..\lib\vc_mswudll\wxbase250u_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -147,12 +147,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\xmldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\xmldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivddll\wxbase250d_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivddll\wxbase250d_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswunivddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswunivddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivddll\wxbase250d_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivddll\wxbase250d_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswunivddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_mswunivddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -172,12 +172,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\xmldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\xmldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_xmldll.pch" /Fd..\..\lib\vc_mswunivdll\wxbase250_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_xmldll.pch" /Fd..\..\lib\vc_mswunivdll\wxbase250_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_mswunivdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_mswunivdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_xmldll.pch" /Fd..\..\lib\vc_mswunivdll\wxbase250_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivdll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_xmldll.pch" /Fd..\..\lib\vc_mswunivdll\wxbase250_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_mswunivdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_mswunivdll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -197,12 +197,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\xmldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\xmldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivuddll\wxbase250ud_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivuddll\wxbase250ud_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivuddll\wxbase250ud_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivuddll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_xmldll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivuddll\wxbase250ud_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivuddll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -222,12 +222,12 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\xmldll"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\xmldll"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xmldll.pch" /Fd..\..\lib\vc_mswunivudll\wxbase250u_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xmldll.pch" /Fd..\..\lib\vc_mswunivudll\wxbase250u_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xmldll.pch" /Fd..\..\lib\vc_mswunivudll\wxbase250u_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivudll" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_xmldll.pch" /Fd..\..\lib\vc_mswunivudll\wxbase250u_xml_vc_custom.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_XML" /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\include" /i "..\..\lib\vc_mswunivudll" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_XML

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -247,22 +247,22 @@ LINK32=link.exe
 # Name "xmldll - Win32 DLL Universal Release"
 # Name "xmldll - Win32 DLL Universal Unicode Debug"
 # Name "xmldll - Win32 DLL Universal Unicode Release"
 # Name "xmldll - Win32 DLL Universal Release"
 # Name "xmldll - Win32 DLL Universal Unicode Debug"
 # Name "xmldll - Win32 DLL Universal Unicode Release"

-# Begin Group "Common Headers"
+# Begin Group "MSW Sources"

 
 # PROP Default_Filter ""
 # Begin Source File
 
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=..\..\include\wx\xml\xml.h
+SOURCE=..\..\src\msw\dummy.cpp
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"

 # End Source File
 # End Group
 # End Source File
 # End Group

-# Begin Group "MSW Sources"
+# Begin Group "Common Headers"

 
 # PROP Default_Filter ""
 # Begin Source File
 
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
+SOURCE=..\..\include\wx\xml\xml.h

 # End Source File
 # End Group
 # Begin Group "Source Files"
 # End Source File
 # End Group
 # Begin Group "Source Files"

diff --git a/build/msw/wx_xmllib.dsp b/build/msw/wx_xmllib.dsp
index 2cbe835cb464fad51ba05c86c4d860c396321cbc..8f04bf2ada88d6266134e67e2063d5ae95e20a63 100644 (file)
--- a/build/msw/wx_xmllib.dsp
+++ b/build/msw/wx_xmllib.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
 # PROP Output_Dir "..\..\lib\vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\xmllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\xmllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswd\wxbase25d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswd\wxbase25d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswd\wxbase25d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswd\wxbase25d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -69,8 +69,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_msw"
 # PROP Intermediate_Dir "vc_msw\xmllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_msw"
 # PROP Intermediate_Dir "vc_msw\xmllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_msw" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_msw\wxbase25_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_msw" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_msw\wxbase25_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_msw" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_msw\wxbase25_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_msw" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_msw\wxbase25_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_GUI=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -92,8 +92,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\xmllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\xmllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswud\wxbase25ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswud\wxbase25ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswud\wxbase25ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswud\wxbase25ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -115,8 +115,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\xmllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\xmllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswu\wxbase25u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswu\wxbase25u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswu\wxbase25u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswu\wxbase25u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -138,8 +138,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\xmllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\xmllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivd\wxbase25d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivd\wxbase25d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivd\wxbase25d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivd" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivd\wxbase25d_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_GUI=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -161,8 +161,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\xmllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\xmllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswuniv" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswuniv\wxbase25_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswuniv" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswuniv\wxbase25_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswuniv" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswuniv\wxbase25_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswuniv" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswuniv\wxbase25_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_GUI=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -184,8 +184,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\xmllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\xmllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivud\wxbase25ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivud\wxbase25ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivud\wxbase25ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\include" /I "..\..\lib\vc_mswunivud" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Zi /Gm /GZ /Fd..\..\lib\vc_mswunivud\wxbase25ud_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -207,8 +207,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\xmllib"
 # PROP Target_Dir ""
 # PROP Output_Dir "..\..\lib\vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\xmllib"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswunivu\wxbase25u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswunivu\wxbase25u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswunivu\wxbase25u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\include" /I "..\..\lib\vc_mswunivu" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /Fd..\..\lib\vc_mswunivu\wxbase25u_xml.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_xmllib.pch" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D wxUSE_GUI=0 /c

 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe


@@ -230,22 +230,22 @@ LIB32=link.exe -lib
 # Name "xmllib - Win32 Universal Release"
 # Name "xmllib - Win32 Universal Unicode Debug"
 # Name "xmllib - Win32 Universal Unicode Release"
 # Name "xmllib - Win32 Universal Release"
 # Name "xmllib - Win32 Universal Unicode Debug"
 # Name "xmllib - Win32 Universal Unicode Release"

-# Begin Group "Common Headers"
+# Begin Group "MSW Sources"

 
 # PROP Default_Filter ""
 # Begin Source File
 
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=..\..\include\wx\xml\xml.h
+SOURCE=..\..\src\msw\dummy.cpp
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"

 # End Source File
 # End Group
 # End Source File
 # End Group

-# Begin Group "MSW Sources"
+# Begin Group "Common Headers"

 
 # PROP Default_Filter ""
 # Begin Source File
 
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
+SOURCE=..\..\include\wx\xml\xml.h

 # End Source File
 # End Group
 # Begin Group "Source Files"
 # End Source File
 # End Group
 # Begin Group "Source Files"

diff --git a/contrib/build/animate/makefile.bcc b/contrib/build/animate/makefile.bcc
index 8d5d321c9cabb45752c9295f81abf5a0bd9740b5..f4a747684513176e0fe4b7a7ac7adbd154907e68 100644 (file)
--- a/contrib/build/animate/makefile.bcc
+++ b/contrib/build/animate/makefile.bcc
@@ -130,6 +130,9 @@ __RUNTIME_LIBS_7 =
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !endif
 !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
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -153,8 +156,6 @@ __animatelib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib
 !endif
 
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib
 !endif
 

-MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DVENDOR=$(VENDOR) -DWXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -179,7 +180,7 @@ $(OBJS)\animatelib_dummy.obj: ../../src/animate\..\..\..\src\msw\dummy.cpp
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll: $(ANIMATEDLL_OBJECTS) $(OBJS)\animatedll_dummy.obj
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll: $(ANIMATEDLL_OBJECTS) $(OBJS)\animatedll_dummy.obj
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|

-       c0d32.obj $(ANIMATEDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
+       c0d32.obj $(ANIMATEDLL_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) import32.lib ole2w32.lib  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,

 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate $@
 !endif
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate $@
 !endif

diff --git a/contrib/build/animate/makefile.gcc b/contrib/build/animate/makefile.gcc
index 04386be29b08bfa6a90e823efc39a70c0bfca374..41ee30de7510893d0811176efd00ee8898130060 100644 (file)
--- a/contrib/build/animate/makefile.gcc
+++ b/contrib/build/animate/makefile.gcc
@@ -120,6 +120,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif

+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif

 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif


@@ -143,8 +146,6 @@ __animatelib___depname = \
        $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a
 endif
 
        $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a
 endif
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) VENDOR=$(VENDOR) WXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -168,7 +169,7 @@ $(OBJS)\animatelib_dummy.o: ../../src/animate\..\..\..\src\msw\dummy.cpp
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_gcc$(VENDORTAG).dll: $(ANIMATEDLL_OBJECTS)
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_gcc$(VENDORTAG).dll: $(ANIMATEDLL_OBJECTS)

-       $(CXX) -shared -o $@ $(ANIMATEDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
+       $(CXX) -shared -o $@ $(ANIMATEDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)

 endif
 
 ifeq ($(SHARED),0)
 endif
 
 ifeq ($(SHARED),0)

diff --git a/contrib/build/animate/makefile.vc b/contrib/build/animate/makefile.vc
index 61b460a793c8709a125b106b4d223bb6df1406b8..1ca264c2adf1bea299aaa87d1b348f9e8c637d23 100644 (file)
--- a/contrib/build/animate/makefile.vc
+++ b/contrib/build/animate/makefile.vc
@@ -164,6 +164,9 @@ __RUNTIME_LIBS = T
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !endif
 !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
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -241,7 +244,7 @@ $(OBJS)\animatelib_dummy.obj: ../../src/animate\..\..\..\src\msw\dummy.cpp
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).dll: $(ANIMATEDLL_OBJECTS) $(OBJS)\animatedll_dummy.obj
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) @<<
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_vc$(VENDORTAG).dll: $(ANIMATEDLL_OBJECTS) $(OBJS)\animatedll_dummy.obj
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) @<<

-       $(ANIMATEDLL_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)_animate.lib
+       $(ANIMATEDLL_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)_animate.lib

 <<
 !endif
 
 <<
 !endif
 

diff --git a/contrib/build/animate/makefile.wat b/contrib/build/animate/makefile.wat
index 3851a1792bb5ef5023f6244d291f022fbc24cea4..64c808ba17c10fa794a460cdd83beb45f546b0a4 100644 (file)
--- a/contrib/build/animate/makefile.wat
+++ b/contrib/build/animate/makefile.wat
@@ -199,8 +199,6 @@ LIBDIRNAME = &
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) VENDOR=$(VENDOR) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -230,7 +228,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animat
        @%append $(OBJS)\animatedll.lbc option incremental
        @%append $(OBJS)\animatedll.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME)
        @for %i in ($(ANIMATEDLL_OBJECTS)) do @%append $(OBJS)\animatedll.lbc file %i
        @%append $(OBJS)\animatedll.lbc option incremental
        @%append $(OBJS)\animatedll.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME)
        @for %i in ($(ANIMATEDLL_OBJECTS)) do @%append $(OBJS)\animatedll.lbc file %i

-       @for %i in ( $(__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)) do @%append $(OBJS)\animatedll.lbc library %i
+       @for %i in ( $(__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)) do @%append $(OBJS)\animatedll.lbc library %i

        @%append $(OBJS)\animatedll.lbc
        @%append $(OBJS)\animatedll.lbc system nt_dll
        wlink @$(OBJS)\animatedll.lbc
        @%append $(OBJS)\animatedll.lbc
        @%append $(OBJS)\animatedll.lbc system nt_dll
        wlink @$(OBJS)\animatedll.lbc

diff --git a/contrib/build/deprecated/deprecated_deprecateddll.dsp b/contrib/build/deprecated/deprecated_deprecateddll.dsp
index 7f001736b46f1f101576259e7759d1e4cee27014..8b2edcff4178a9fa247069be5fb41ffbe276c1f4 100644 (file)
--- a/contrib/build/deprecated/deprecated_deprecateddll.dsp
+++ b/contrib/build/deprecated/deprecated_deprecateddll.dsp
@@ -252,13 +252,13 @@ LINK32=link.exe
 # PROP Default_Filter ""
 # Begin Source File
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=../../src/deprecated\..\..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
+SOURCE=../../src/deprecated\dosyacc.c

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=../../src/deprecated\dosyacc.c
+SOURCE=../../src/deprecated\..\..\..\src\msw\dummy.cpp
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

diff --git a/contrib/build/deprecated/deprecated_deprecatedlib.dsp b/contrib/build/deprecated/deprecated_deprecatedlib.dsp
index bd846c8a0b57c53d4b75f368551c74c0ede361a0..ac7d0c813fbf8765b0788157cde76c319fd707d9 100644 (file)
--- a/contrib/build/deprecated/deprecated_deprecatedlib.dsp
+++ b/contrib/build/deprecated/deprecated_deprecatedlib.dsp
@@ -235,13 +235,13 @@ LIB32=link.exe -lib
 # PROP Default_Filter ""
 # Begin Source File
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=../../src/deprecated\..\..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
+SOURCE=../../src/deprecated\dosyacc.c

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=../../src/deprecated\dosyacc.c
+SOURCE=../../src/deprecated\..\..\..\src\msw\dummy.cpp
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

diff --git a/contrib/build/deprecated/makefile.bcc b/contrib/build/deprecated/makefile.bcc
index 1434dc23fd2478cee25408c4e506597bac4868e9..626da8c08f3513986f4a2647f1d798fc069bd97a 100644 (file)
--- a/contrib/build/deprecated/makefile.bcc
+++ b/contrib/build/deprecated/makefile.bcc
@@ -163,6 +163,9 @@ __RUNTIME_LIBS_7 =
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !endif
 !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
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -186,8 +189,6 @@ __deprecatedlib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib
 !endif
 
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib
 !endif
 

-MAKEARGS = -DBUILD=$(BUILD) -DCC=$(CC) -DCFG=$(CFG) -DCFLAGS=$(CFLAGS) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DVENDOR=$(VENDOR) -DWXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -255,7 +256,7 @@ clean:
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).dll: $(DEPRECATEDDLL_OBJECTS) $(OBJS)\deprecateddll_dummy.obj
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_bcc$(VENDORTAG).dll: $(DEPRECATEDDLL_OBJECTS) $(OBJS)\deprecateddll_dummy.obj
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|

-       c0d32.obj $(DEPRECATEDDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
+       c0d32.obj $(DEPRECATEDDLL_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) import32.lib ole2w32.lib  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,

 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated $@
 !endif
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated $@
 !endif

diff --git a/contrib/build/deprecated/makefile.gcc b/contrib/build/deprecated/makefile.gcc
index 42dc9ba9edbcf94d45be270a6838adcd190ad2a6..ed3df0349c0d2b33edb7dbc2bfe3c67e87578877 100644 (file)
--- a/contrib/build/deprecated/makefile.gcc
+++ b/contrib/build/deprecated/makefile.gcc
@@ -155,6 +155,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif

+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif

 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif


@@ -178,8 +181,6 @@ __deprecatedlib___depname = \
        $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.a
 endif
 
        $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.a
 endif
 

-MAKEARGS = BUILD=$(BUILD) CC=$(CC) CFG=$(CFG) CFLAGS=$(CFLAGS) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) VENDOR=$(VENDOR) WXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -245,7 +246,7 @@ clean:
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_gcc$(VENDORTAG).dll: $(DEPRECATEDDLL_OBJECTS)
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_gcc$(VENDORTAG).dll: $(DEPRECATEDDLL_OBJECTS)

-       $(CXX) -shared -o $@ $(DEPRECATEDDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
+       $(CXX) -shared -o $@ $(DEPRECATEDDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)

 endif
 
 ifeq ($(SHARED),0)
 endif
 
 ifeq ($(SHARED),0)

diff --git a/contrib/build/deprecated/makefile.vc b/contrib/build/deprecated/makefile.vc
index 6642dfbd58ad071b8e346f1db2dcd3b158a90a28..85b2edc7822f49dc9a77b264d1be15563cbc1c4f 100644 (file)
--- a/contrib/build/deprecated/makefile.vc
+++ b/contrib/build/deprecated/makefile.vc
@@ -203,6 +203,9 @@ __RUNTIME_LIBS = T
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !endif
 !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
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -323,7 +326,7 @@ clean:
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).dll: $(DEPRECATEDDLL_OBJECTS) $(OBJS)\deprecateddll_dummy.obj
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) @<<
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).dll: $(DEPRECATEDDLL_OBJECTS) $(OBJS)\deprecateddll_dummy.obj
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) @<<

-       $(DEPRECATEDDLL_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)_deprecated.lib
+       $(DEPRECATEDDLL_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)_deprecated.lib

 <<
 !endif
 
 <<
 !endif
 

diff --git a/contrib/build/deprecated/makefile.wat b/contrib/build/deprecated/makefile.wat
index a37711997754dc1ed4cb5db81054620750f9420f..e4d68e5450c5e2e3ea98034bb87e53b81a6a5e94 100644 (file)
--- a/contrib/build/deprecated/makefile.wat
+++ b/contrib/build/deprecated/makefile.wat
@@ -232,8 +232,6 @@ LIBDIRNAME = &
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 

-MAKEARGS = BUILD=$(BUILD) CC=$(CC) CFG=$(CFG) CFLAGS=$(CFLAGS) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) VENDOR=$(VENDOR) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -308,7 +306,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprec
        @%append $(OBJS)\deprecateddll.lbc option incremental
        @%append $(OBJS)\deprecateddll.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME)
        @for %i in ($(DEPRECATEDDLL_OBJECTS)) do @%append $(OBJS)\deprecateddll.lbc file %i
        @%append $(OBJS)\deprecateddll.lbc option incremental
        @%append $(OBJS)\deprecateddll.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME)
        @for %i in ($(DEPRECATEDDLL_OBJECTS)) do @%append $(OBJS)\deprecateddll.lbc file %i

-       @for %i in ( $(__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)) do @%append $(OBJS)\deprecateddll.lbc library %i
+       @for %i in ( $(__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)) do @%append $(OBJS)\deprecateddll.lbc library %i

        @%append $(OBJS)\deprecateddll.lbc
        @%append $(OBJS)\deprecateddll.lbc system nt_dll
        wlink @$(OBJS)\deprecateddll.lbc
        @%append $(OBJS)\deprecateddll.lbc
        @%append $(OBJS)\deprecateddll.lbc system nt_dll
        wlink @$(OBJS)\deprecateddll.lbc

diff --git a/contrib/build/fl/makefile.bcc b/contrib/build/fl/makefile.bcc
index 41358cd270d1341fdaf8043b59491859ac9b32cf..a02b558310be4bbdc1ab0242ee91e35c04f43500 100644 (file)
--- a/contrib/build/fl/makefile.bcc
+++ b/contrib/build/fl/makefile.bcc
@@ -155,6 +155,9 @@ __RUNTIME_LIBS_7 =
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !endif
 !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
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -178,8 +181,6 @@ __fllib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib
 !endif
 
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib
 !endif
 

-MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DVENDOR=$(VENDOR) -DWXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -307,7 +308,7 @@ clean:
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll: $(FLDLL_OBJECTS) $(OBJS)\fldll_dummy.obj
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_bcc$(VENDORTAG).dll: $(FLDLL_OBJECTS) $(OBJS)\fldll_dummy.obj
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|

-       c0d32.obj $(FLDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
+       c0d32.obj $(FLDLL_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) import32.lib ole2w32.lib  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,

 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl $@
 !endif
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl $@
 !endif

diff --git a/contrib/build/fl/makefile.gcc b/contrib/build/fl/makefile.gcc
index 7193ec984482ba734be111884e6637a356a9a267..a802bd94f08df2426603fe4e44bc758923b8f096 100644 (file)
--- a/contrib/build/fl/makefile.gcc
+++ b/contrib/build/fl/makefile.gcc
@@ -145,6 +145,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif

+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif

 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif


@@ -168,8 +171,6 @@ __fllib___depname = \
        $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a
 endif
 
        $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a
 endif
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) VENDOR=$(VENDOR) WXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -295,7 +296,7 @@ clean:
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_gcc$(VENDORTAG).dll: $(FLDLL_OBJECTS)
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_gcc$(VENDORTAG).dll: $(FLDLL_OBJECTS)

-       $(CXX) -shared -o $@ $(FLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
+       $(CXX) -shared -o $@ $(FLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)

 endif
 
 ifeq ($(SHARED),0)
 endif
 
 ifeq ($(SHARED),0)

diff --git a/contrib/build/fl/makefile.vc b/contrib/build/fl/makefile.vc
index cbddc2881000ca690ff501fe9be626baebeadf5c..fb411ff04c9e6f58908aa345394b6bb6098730c7 100644 (file)
--- a/contrib/build/fl/makefile.vc
+++ b/contrib/build/fl/makefile.vc
@@ -189,6 +189,9 @@ __RUNTIME_LIBS = T
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !endif
 !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
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -369,7 +372,7 @@ clean:
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).dll: $(FLDLL_OBJECTS) $(OBJS)\fldll_dummy.obj
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) @<<
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_vc$(VENDORTAG).dll: $(FLDLL_OBJECTS) $(OBJS)\fldll_dummy.obj
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) @<<

-       $(FLDLL_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)_fl.lib
+       $(FLDLL_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)_fl.lib

 <<
 !endif
 
 <<
 !endif
 

diff --git a/contrib/build/fl/makefile.wat b/contrib/build/fl/makefile.wat
index d1bb1942ef282ce3b82143464afcb4ea091180f1..14964315d0f3ffd5da470e58d18ec88c9ea054a5 100644 (file)
--- a/contrib/build/fl/makefile.wat
+++ b/contrib/build/fl/makefile.wat
@@ -224,8 +224,6 @@ LIBDIRNAME = &
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) VENDOR=$(VENDOR) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -360,7 +358,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl_wat
        @%append $(OBJS)\fldll.lbc option incremental
        @%append $(OBJS)\fldll.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME)
        @for %i in ($(FLDLL_OBJECTS)) do @%append $(OBJS)\fldll.lbc file %i
        @%append $(OBJS)\fldll.lbc option incremental
        @%append $(OBJS)\fldll.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME)
        @for %i in ($(FLDLL_OBJECTS)) do @%append $(OBJS)\fldll.lbc file %i

-       @for %i in ( $(__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)) do @%append $(OBJS)\fldll.lbc library %i
+       @for %i in ( $(__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)) do @%append $(OBJS)\fldll.lbc library %i

        @%append $(OBJS)\fldll.lbc
        @%append $(OBJS)\fldll.lbc system nt_dll
        wlink @$(OBJS)\fldll.lbc
        @%append $(OBJS)\fldll.lbc
        @%append $(OBJS)\fldll.lbc system nt_dll
        wlink @$(OBJS)\fldll.lbc

diff --git a/contrib/build/gizmos/makefile.bcc b/contrib/build/gizmos/makefile.bcc
index bfd1a4c9c7cab22d7ab4e0572fc7fb404b8b4845..5a54ee725aeae0f3a853aa50aa5d64f46aa3828b 100644 (file)
--- a/contrib/build/gizmos/makefile.bcc
+++ b/contrib/build/gizmos/makefile.bcc
@@ -136,6 +136,9 @@ __RUNTIME_LIBS_7 =
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !endif
 !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
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -159,8 +162,6 @@ __gizmoslib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib
 !endif
 
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib
 !endif
 

-MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DVENDOR=$(VENDOR) -DWXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -222,7 +223,7 @@ clean:
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_bcc$(VENDORTAG).dll: $(GIZMOSDLL_OBJECTS) $(OBJS)\gizmosdll_dummy.obj
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_bcc$(VENDORTAG).dll: $(GIZMOSDLL_OBJECTS) $(OBJS)\gizmosdll_dummy.obj
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|

-       c0d32.obj $(GIZMOSDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(__WXLIB_BASE_p) $(__WXLIB_CORE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
+       c0d32.obj $(GIZMOSDLL_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) import32.lib ole2w32.lib  $(__WXLIB_BASE_p) $(__WXLIB_CORE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,

 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos $@
 !endif
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos $@
 !endif

diff --git a/contrib/build/gizmos/makefile.gcc b/contrib/build/gizmos/makefile.gcc
index 063aed0e165761bc927ce1df518ca61ee4c409a7..e61bd94761b194da2bed9463b4f7b194d7ea450a 100644 (file)
--- a/contrib/build/gizmos/makefile.gcc
+++ b/contrib/build/gizmos/makefile.gcc
@@ -126,6 +126,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif

+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif

 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif


@@ -149,8 +152,6 @@ __gizmoslib___depname = \
        $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a
 endif
 
        $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a
 endif
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) VENDOR=$(VENDOR) WXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -210,7 +211,7 @@ clean:
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_gcc$(VENDORTAG).dll: $(GIZMOSDLL_OBJECTS)
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_gcc$(VENDORTAG).dll: $(GIZMOSDLL_OBJECTS)

-       $(CXX) -shared -o $@ $(GIZMOSDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_BASE_p) $(__WXLIB_CORE_p)
+       $(CXX) -shared -o $@ $(GIZMOSDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_BASE_p) $(__WXLIB_CORE_p)

 endif
 
 ifeq ($(SHARED),0)
 endif
 
 ifeq ($(SHARED),0)

diff --git a/contrib/build/gizmos/makefile.vc b/contrib/build/gizmos/makefile.vc
index c2452af9efe53eb99fa5caf0b0397c498e14041c..796e651bce82b188bce05c7346e6104afafd2bc7 100644 (file)
--- a/contrib/build/gizmos/makefile.vc
+++ b/contrib/build/gizmos/makefile.vc
@@ -170,6 +170,9 @@ __RUNTIME_LIBS = T
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !endif
 !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
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -284,7 +287,7 @@ clean:
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_vc$(VENDORTAG).dll: $(GIZMOSDLL_OBJECTS) $(OBJS)\gizmosdll_dummy.obj
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) @<<
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_vc$(VENDORTAG).dll: $(GIZMOSDLL_OBJECTS) $(OBJS)\gizmosdll_dummy.obj
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) @<<

-       $(GIZMOSDLL_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_BASE_p) $(__WXLIB_CORE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib
+       $(GIZMOSDLL_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_BASE_p) $(__WXLIB_CORE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib

 <<
 !endif
 
 <<
 !endif
 

diff --git a/contrib/build/gizmos/makefile.wat b/contrib/build/gizmos/makefile.wat
index 10b43d8276cf0560afc296e462c272f165d2eaa1..b35b91d6d6546d1c7dad050a39af884b9d74517f 100644 (file)
--- a/contrib/build/gizmos/makefile.wat
+++ b/contrib/build/gizmos/makefile.wat
@@ -209,8 +209,6 @@ LIBDIRNAME = &
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) VENDOR=$(VENDOR) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -279,7 +277,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos
        @%append $(OBJS)\gizmosdll.lbc option incremental
        @%append $(OBJS)\gizmosdll.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME)
        @for %i in ($(GIZMOSDLL_OBJECTS)) do @%append $(OBJS)\gizmosdll.lbc file %i
        @%append $(OBJS)\gizmosdll.lbc option incremental
        @%append $(OBJS)\gizmosdll.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME)
        @for %i in ($(GIZMOSDLL_OBJECTS)) do @%append $(OBJS)\gizmosdll.lbc file %i

-       @for %i in ( $(__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_BASE_p) $(__WXLIB_CORE_p)) do @%append $(OBJS)\gizmosdll.lbc library %i
+       @for %i in ( $(__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_BASE_p) $(__WXLIB_CORE_p)) do @%append $(OBJS)\gizmosdll.lbc library %i

        @%append $(OBJS)\gizmosdll.lbc
        @%append $(OBJS)\gizmosdll.lbc system nt_dll
        wlink @$(OBJS)\gizmosdll.lbc
        @%append $(OBJS)\gizmosdll.lbc
        @%append $(OBJS)\gizmosdll.lbc system nt_dll
        wlink @$(OBJS)\gizmosdll.lbc

diff --git a/contrib/build/mmedia/makefile.bcc b/contrib/build/mmedia/makefile.bcc
index 6dca17d20bd57a2eaf10e0ae4a86153c418cdf05..cd1c9082b43dc97ccaa83eb8574d6695ede51036 100644 (file)
--- a/contrib/build/mmedia/makefile.bcc
+++ b/contrib/build/mmedia/makefile.bcc
@@ -164,6 +164,9 @@ __RUNTIME_LIBS_7 =
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !endif
 !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
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -187,8 +190,6 @@ __mmedialib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib
 !endif
 
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib
 !endif
 

-MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DVENDOR=$(VENDOR) -DWXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -334,7 +335,7 @@ clean:
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_bcc$(VENDORTAG).dll: $(MMEDIADLL_OBJECTS) $(OBJS)\mmediadll_dummy.obj
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_bcc$(VENDORTAG).dll: $(MMEDIADLL_OBJECTS) $(OBJS)\mmediadll_dummy.obj
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|

-       c0d32.obj $(MMEDIADLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
+       c0d32.obj $(MMEDIADLL_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) import32.lib ole2w32.lib  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,

 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia $@
 !endif
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia $@
 !endif

diff --git a/contrib/build/mmedia/makefile.gcc b/contrib/build/mmedia/makefile.gcc
index b52d3a0b46e2c1dcbef4de456af02a74dd337144..2adf54fba59f80b7a429047fe916a851bed31c1f 100644 (file)
--- a/contrib/build/mmedia/makefile.gcc
+++ b/contrib/build/mmedia/makefile.gcc
@@ -154,6 +154,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif

+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif

 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif


@@ -177,8 +180,6 @@ __mmedialib___depname = \
        $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.a
 endif
 
        $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.a
 endif
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) VENDOR=$(VENDOR) WXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -322,7 +323,7 @@ clean:
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_gcc$(VENDORTAG).dll: $(MMEDIADLL_OBJECTS)
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_gcc$(VENDORTAG).dll: $(MMEDIADLL_OBJECTS)

-       $(CXX) -shared -o $@ $(MMEDIADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
+       $(CXX) -shared -o $@ $(MMEDIADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)

 endif
 
 ifeq ($(SHARED),0)
 endif
 
 ifeq ($(SHARED),0)

diff --git a/contrib/build/mmedia/makefile.vc b/contrib/build/mmedia/makefile.vc
index e831b6c2bc4d46f8d521f7aa6f57a5bded0787d2..3c082bbd33ee0613c16c9d2a30f07c5f98c21755 100644 (file)
--- a/contrib/build/mmedia/makefile.vc
+++ b/contrib/build/mmedia/makefile.vc
@@ -198,6 +198,9 @@ __RUNTIME_LIBS = T
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !endif
 !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
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -396,7 +399,7 @@ clean:
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_vc$(VENDORTAG).dll: $(MMEDIADLL_OBJECTS) $(OBJS)\mmediadll_dummy.obj
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) @<<
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia_vc$(VENDORTAG).dll: $(MMEDIADLL_OBJECTS) $(OBJS)\mmediadll_dummy.obj
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) @<<

-       $(MMEDIADLL_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)_mmedia.lib
+       $(MMEDIADLL_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)_mmedia.lib

 <<
 !endif
 
 <<
 !endif
 

diff --git a/contrib/build/mmedia/makefile.wat b/contrib/build/mmedia/makefile.wat
index a2b92bf2ff70edc806c827d0ef0578af0c125a88..170c1e8be1011892c9a2f9b7ee6175f9b62b6493 100644 (file)
--- a/contrib/build/mmedia/makefile.wat
+++ b/contrib/build/mmedia/makefile.wat
@@ -237,8 +237,6 @@ MMEDIALIB_OBJECTS =  &
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) VENDOR=$(VENDOR) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -391,7 +389,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia
        @%append $(OBJS)\mmediadll.lbc option incremental
        @%append $(OBJS)\mmediadll.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME)
        @for %i in ($(MMEDIADLL_OBJECTS)) do @%append $(OBJS)\mmediadll.lbc file %i
        @%append $(OBJS)\mmediadll.lbc option incremental
        @%append $(OBJS)\mmediadll.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME)
        @for %i in ($(MMEDIADLL_OBJECTS)) do @%append $(OBJS)\mmediadll.lbc file %i

-       @for %i in ( $(__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)) do @%append $(OBJS)\mmediadll.lbc library %i
+       @for %i in ( $(__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)) do @%append $(OBJS)\mmediadll.lbc library %i

        @%append $(OBJS)\mmediadll.lbc
        @%append $(OBJS)\mmediadll.lbc system nt_dll
        wlink @$(OBJS)\mmediadll.lbc
        @%append $(OBJS)\mmediadll.lbc
        @%append $(OBJS)\mmediadll.lbc system nt_dll
        wlink @$(OBJS)\mmediadll.lbc

diff --git a/contrib/build/mmedia/mmedia_mmediadll.dsp b/contrib/build/mmedia/mmedia_mmediadll.dsp
index 6e0f20350548a55aa464bef34c37d95e1903749a..54f95d9ba350400b613ca86ec4bc3fd33e13f079 100644 (file)
--- a/contrib/build/mmedia/mmedia_mmediadll.dsp
+++ b/contrib/build/mmedia/mmedia_mmediadll.dsp
@@ -252,17 +252,17 @@ LINK32=link.exe
 # PROP Default_Filter ""
 # Begin Source File
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=../../src/mmedia\..\..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
+SOURCE=../../src/mmedia\cdbase.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=../../src/mmedia\cdbase.cpp
+SOURCE=../../src/mmedia\cdwin.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=../../src/mmedia\cdwin.cpp
+SOURCE=../../src/mmedia\..\..\..\src\msw\dummy.cpp
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

diff --git a/contrib/build/mmedia/mmedia_mmedialib.dsp b/contrib/build/mmedia/mmedia_mmedialib.dsp
index 44e0b7ba8d57f994d1c1361cd42043e2dbc09596..c02ac85be0a616fdefb0f0a16718bd8b048cdc24 100644 (file)
--- a/contrib/build/mmedia/mmedia_mmedialib.dsp
+++ b/contrib/build/mmedia/mmedia_mmedialib.dsp
@@ -235,17 +235,17 @@ LIB32=link.exe -lib
 # PROP Default_Filter ""
 # Begin Source File
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=../../src/mmedia\..\..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
+SOURCE=../../src/mmedia\cdbase.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=../../src/mmedia\cdbase.cpp
+SOURCE=../../src/mmedia\cdwin.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=../../src/mmedia\cdwin.cpp
+SOURCE=../../src/mmedia\..\..\..\src\msw\dummy.cpp
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

diff --git a/contrib/build/net/makefile.bcc b/contrib/build/net/makefile.bcc
index 40b404be6e7dab288c93d51ac7e2a1c070b45d37..bdcbea07774d9110a0732269b8ef0f5222ef6fca 100644 (file)
--- a/contrib/build/net/makefile.bcc
+++ b/contrib/build/net/makefile.bcc
@@ -128,6 +128,9 @@ __RUNTIME_LIBS_7 =
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !endif
 !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
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -151,8 +154,6 @@ __netutilslib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.lib
 !endif
 
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.lib
 !endif
 

-MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DVENDOR=$(VENDOR) -DWXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -196,7 +197,7 @@ clean:
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_bcc$(VENDORTAG).dll: $(NETUTILSDLL_OBJECTS) $(OBJS)\netutilsdll_dummy.obj
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_bcc$(VENDORTAG).dll: $(NETUTILSDLL_OBJECTS) $(OBJS)\netutilsdll_dummy.obj
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|

-       c0d32.obj $(NETUTILSDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
+       c0d32.obj $(NETUTILSDLL_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) import32.lib ole2w32.lib  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,

 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils $@
 !endif
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils $@
 !endif

diff --git a/contrib/build/net/makefile.gcc b/contrib/build/net/makefile.gcc
index 50226da0266421659ce064cc8831a6e5e8d70494..82e66cf06283b78071df9fb35b14f7c2fb976ffb 100644 (file)
--- a/contrib/build/net/makefile.gcc
+++ b/contrib/build/net/makefile.gcc
@@ -118,6 +118,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif

+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif

 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif


@@ -141,8 +144,6 @@ __netutilslib___depname = \
        $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.a
 endif
 
        $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.a
 endif
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) VENDOR=$(VENDOR) WXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -184,7 +185,7 @@ clean:
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_gcc$(VENDORTAG).dll: $(NETUTILSDLL_OBJECTS)
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_gcc$(VENDORTAG).dll: $(NETUTILSDLL_OBJECTS)

-       $(CXX) -shared -o $@ $(NETUTILSDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
+       $(CXX) -shared -o $@ $(NETUTILSDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)

 endif
 
 ifeq ($(SHARED),0)
 endif
 
 ifeq ($(SHARED),0)

diff --git a/contrib/build/net/makefile.vc b/contrib/build/net/makefile.vc
index 5a120d02103e48bb7f2ca353faeb0589ff4329ab..b7527b85edc203cf6bd7161a3947bb04d2d68859 100644 (file)
--- a/contrib/build/net/makefile.vc
+++ b/contrib/build/net/makefile.vc
@@ -161,6 +161,9 @@ __RUNTIME_LIBS = T
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !endif
 !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
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -257,7 +260,7 @@ clean:
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_vc$(VENDORTAG).dll: $(NETUTILSDLL_OBJECTS) $(OBJS)\netutilsdll_dummy.obj
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) @<<
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_vc$(VENDORTAG).dll: $(NETUTILSDLL_OBJECTS) $(OBJS)\netutilsdll_dummy.obj
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) @<<

-       $(NETUTILSDLL_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)_netutils.lib
+       $(NETUTILSDLL_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)_netutils.lib

 <<
 !endif
 
 <<
 !endif
 

diff --git a/contrib/build/net/makefile.wat b/contrib/build/net/makefile.wat
index a0036d21fbc287706e788edac830688c5e7c4e71..9ee40e96d81e9296379c7d176e86522af177eced 100644 (file)
--- a/contrib/build/net/makefile.wat
+++ b/contrib/build/net/makefile.wat
@@ -198,8 +198,6 @@ NETUTILSLIB_OBJECTS =  &
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) VENDOR=$(VENDOR) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -250,7 +248,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netuti
        @%append $(OBJS)\netutilsdll.lbc option incremental
        @%append $(OBJS)\netutilsdll.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME)
        @for %i in ($(NETUTILSDLL_OBJECTS)) do @%append $(OBJS)\netutilsdll.lbc file %i
        @%append $(OBJS)\netutilsdll.lbc option incremental
        @%append $(OBJS)\netutilsdll.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME)
        @for %i in ($(NETUTILSDLL_OBJECTS)) do @%append $(OBJS)\netutilsdll.lbc file %i

-       @for %i in ( $(__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)) do @%append $(OBJS)\netutilsdll.lbc library %i
+       @for %i in ( $(__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)) do @%append $(OBJS)\netutilsdll.lbc library %i

        @%append $(OBJS)\netutilsdll.lbc
        @%append $(OBJS)\netutilsdll.lbc system nt_dll
        wlink @$(OBJS)\netutilsdll.lbc
        @%append $(OBJS)\netutilsdll.lbc
        @%append $(OBJS)\netutilsdll.lbc system nt_dll
        wlink @$(OBJS)\netutilsdll.lbc

diff --git a/contrib/build/ogl/makefile.bcc b/contrib/build/ogl/makefile.bcc
index 5f566f5f0cdd88a746674af8ba5317c86a9efe33..80418764e054aaa4cccc3aecd9e4c653d38ae112 100644 (file)
--- a/contrib/build/ogl/makefile.bcc
+++ b/contrib/build/ogl/makefile.bcc
@@ -145,6 +145,9 @@ __RUNTIME_LIBS_7 =
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !endif
 !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
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -168,8 +171,6 @@ __ogllib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib
 !endif
 
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib
 !endif
 

-MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DVENDOR=$(VENDOR) -DWXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -267,7 +268,7 @@ clean:
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).dll: $(OGLDLL_OBJECTS) $(OBJS)\ogldll_dummy.obj
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).dll: $(OGLDLL_OBJECTS) $(OBJS)\ogldll_dummy.obj
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|

-       c0d32.obj $(OGLDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
+       c0d32.obj $(OGLDLL_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) import32.lib ole2w32.lib  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,

 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl $@
 !endif
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl $@
 !endif

diff --git a/contrib/build/ogl/makefile.gcc b/contrib/build/ogl/makefile.gcc
index d59f7049dfe3f02d6c9765ef4a1d6164904cf6ce..dac1ec8705b482b86c57f98e12efd9e66fa6cddd 100644 (file)
--- a/contrib/build/ogl/makefile.gcc
+++ b/contrib/build/ogl/makefile.gcc
@@ -135,6 +135,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif

+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif

 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif


@@ -158,8 +161,6 @@ __ogllib___depname = \
        $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a
 endif
 
        $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a
 endif
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) VENDOR=$(VENDOR) WXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -255,7 +256,7 @@ clean:
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll: $(OGLDLL_OBJECTS)
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll: $(OGLDLL_OBJECTS)

-       $(CXX) -shared -o $@ $(OGLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
+       $(CXX) -shared -o $@ $(OGLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)

 endif
 
 ifeq ($(SHARED),0)
 endif
 
 ifeq ($(SHARED),0)

diff --git a/contrib/build/ogl/makefile.vc b/contrib/build/ogl/makefile.vc
index dd996acedf996e4dfce1aa9e946b85755d28389f..3a2eca50acea43bcfcc728663eff4c241dec1366 100644 (file)
--- a/contrib/build/ogl/makefile.vc
+++ b/contrib/build/ogl/makefile.vc
@@ -179,6 +179,9 @@ __RUNTIME_LIBS = T
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !endif
 !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
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -329,7 +332,7 @@ clean:
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_vc$(VENDORTAG).dll: $(OGLDLL_OBJECTS) $(OBJS)\ogldll_dummy.obj
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) @<<
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_vc$(VENDORTAG).dll: $(OGLDLL_OBJECTS) $(OBJS)\ogldll_dummy.obj
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) @<<

-       $(OGLDLL_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)_ogl.lib
+       $(OGLDLL_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)_ogl.lib

 <<
 !endif
 
 <<
 !endif
 

diff --git a/contrib/build/ogl/makefile.wat b/contrib/build/ogl/makefile.wat
index c0cafb3dc9440ac6a88d8b5b99da5084e3698e72..c2806db9ef5acb98a83552ddd837b7d3ffe44677 100644 (file)
--- a/contrib/build/ogl/makefile.wat
+++ b/contrib/build/ogl/makefile.wat
@@ -215,8 +215,6 @@ OGLLIB_OBJECTS =  &
        $(OBJS)\ogllib_lines.obj &
        $(OBJS)\ogllib_ogldiag.obj
 
        $(OBJS)\ogllib_lines.obj &
        $(OBJS)\ogllib_ogldiag.obj
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) VENDOR=$(VENDOR) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -321,7 +319,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_wa
        @%append $(OBJS)\ogldll.lbc option incremental
        @%append $(OBJS)\ogldll.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME)
        @for %i in ($(OGLDLL_OBJECTS)) do @%append $(OBJS)\ogldll.lbc file %i
        @%append $(OBJS)\ogldll.lbc option incremental
        @%append $(OBJS)\ogldll.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME)
        @for %i in ($(OGLDLL_OBJECTS)) do @%append $(OBJS)\ogldll.lbc file %i

-       @for %i in ( $(__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)) do @%append $(OBJS)\ogldll.lbc library %i
+       @for %i in ( $(__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)) do @%append $(OBJS)\ogldll.lbc library %i

        @%append $(OBJS)\ogldll.lbc
        @%append $(OBJS)\ogldll.lbc system nt_dll
        wlink @$(OBJS)\ogldll.lbc
        @%append $(OBJS)\ogldll.lbc
        @%append $(OBJS)\ogldll.lbc system nt_dll
        wlink @$(OBJS)\ogldll.lbc

diff --git a/contrib/build/plot/makefile.bcc b/contrib/build/plot/makefile.bcc
index 90e88e2a942ac3cbf08891676623a6ce05a99454..58817cc8bd9501fcea40e4c379a2e7ddcb0b15da 100644 (file)
--- a/contrib/build/plot/makefile.bcc
+++ b/contrib/build/plot/makefile.bcc
@@ -125,6 +125,9 @@ __RUNTIME_LIBS_7 =
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !endif
 !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
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -148,8 +151,6 @@ __plotlib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib
 !endif
 
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib
 !endif
 

-MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DVENDOR=$(VENDOR) -DWXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -181,7 +182,7 @@ clean:
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_bcc$(VENDORTAG).dll: $(PLOTDLL_OBJECTS) $(OBJS)\plotdll_dummy.obj
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_bcc$(VENDORTAG).dll: $(PLOTDLL_OBJECTS) $(OBJS)\plotdll_dummy.obj
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|

-       c0d32.obj $(PLOTDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
+       c0d32.obj $(PLOTDLL_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) import32.lib ole2w32.lib  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,

 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot $@
 !endif
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot $@
 !endif

diff --git a/contrib/build/plot/makefile.gcc b/contrib/build/plot/makefile.gcc
index 96558e0bf70b302e0c29d7038f8fa62e8d9050f0..663572c526746d4559b0802884aebf5787d04eac 100644 (file)
--- a/contrib/build/plot/makefile.gcc
+++ b/contrib/build/plot/makefile.gcc
@@ -115,6 +115,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif

+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif

 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif


@@ -138,8 +141,6 @@ __plotlib___depname = \
        $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.a
 endif
 
        $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.a
 endif
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) VENDOR=$(VENDOR) WXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -169,7 +170,7 @@ clean:
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_gcc$(VENDORTAG).dll: $(PLOTDLL_OBJECTS)
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_gcc$(VENDORTAG).dll: $(PLOTDLL_OBJECTS)

-       $(CXX) -shared -o $@ $(PLOTDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
+       $(CXX) -shared -o $@ $(PLOTDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)

 endif
 
 ifeq ($(SHARED),0)
 endif
 
 ifeq ($(SHARED),0)

diff --git a/contrib/build/plot/makefile.vc b/contrib/build/plot/makefile.vc
index d83b48bdc28f04847a22d5db5145c8fff582dc1d..920c3fb367bbaf6074cf13be2554b1a226fc9463 100644 (file)
--- a/contrib/build/plot/makefile.vc
+++ b/contrib/build/plot/makefile.vc
@@ -159,6 +159,9 @@ __RUNTIME_LIBS = T
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !endif
 !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
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -243,7 +246,7 @@ clean:
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_vc$(VENDORTAG).dll: $(PLOTDLL_OBJECTS) $(OBJS)\plotdll_dummy.obj
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) @<<
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_vc$(VENDORTAG).dll: $(PLOTDLL_OBJECTS) $(OBJS)\plotdll_dummy.obj
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) @<<

-       $(PLOTDLL_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)_plot.lib
+       $(PLOTDLL_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)_plot.lib

 <<
 !endif
 
 <<
 !endif
 

diff --git a/contrib/build/plot/makefile.wat b/contrib/build/plot/makefile.wat
index a5798711a2167e4529f0ff68ab3c010a0cea5d6e..f80ce5a8cee7cd3c82e8b94094bccdf0b26e4ed1 100644 (file)
--- a/contrib/build/plot/makefile.wat
+++ b/contrib/build/plot/makefile.wat
@@ -193,8 +193,6 @@ PLOTLIB_OBJECTS =  &
        $(OBJS)\plotlib_dummy.obj &
        $(OBJS)\plotlib_plot.obj
 
        $(OBJS)\plotlib_dummy.obj &
        $(OBJS)\plotlib_plot.obj
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) VENDOR=$(VENDOR) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -233,7 +231,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot_w
        @%append $(OBJS)\plotdll.lbc option incremental
        @%append $(OBJS)\plotdll.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME)
        @for %i in ($(PLOTDLL_OBJECTS)) do @%append $(OBJS)\plotdll.lbc file %i
        @%append $(OBJS)\plotdll.lbc option incremental
        @%append $(OBJS)\plotdll.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME)
        @for %i in ($(PLOTDLL_OBJECTS)) do @%append $(OBJS)\plotdll.lbc file %i

-       @for %i in ( $(__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)) do @%append $(OBJS)\plotdll.lbc library %i
+       @for %i in ( $(__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)) do @%append $(OBJS)\plotdll.lbc library %i

        @%append $(OBJS)\plotdll.lbc
        @%append $(OBJS)\plotdll.lbc system nt_dll
        wlink @$(OBJS)\plotdll.lbc
        @%append $(OBJS)\plotdll.lbc
        @%append $(OBJS)\plotdll.lbc system nt_dll
        wlink @$(OBJS)\plotdll.lbc

diff --git a/contrib/build/stc/makefile.bcc b/contrib/build/stc/makefile.bcc
index bdb0e2f6c6a228c6dd87187a94805474f369a5d6..cf4590942ad536b94413509368b9668e41b776c4 100644 (file)
--- a/contrib/build/stc/makefile.bcc
+++ b/contrib/build/stc/makefile.bcc
@@ -219,6 +219,9 @@ __RUNTIME_LIBS_7 =
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !endif
 !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
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -242,8 +245,6 @@ __stclib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib
 !endif
 
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib
 !endif
 

-MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DVENDOR=$(VENDOR) -DWXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -557,7 +558,7 @@ clean:
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_bcc$(VENDORTAG).dll: $(STCDLL_OBJECTS)
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_bcc$(VENDORTAG).dll: $(STCDLL_OBJECTS)
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|

-       c0d32.obj $(STCDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
+       c0d32.obj $(STCDLL_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) import32.lib ole2w32.lib  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,

 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc $@
 !endif
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc $@
 !endif

diff --git a/contrib/build/stc/makefile.gcc b/contrib/build/stc/makefile.gcc
index f4d2af3c82e3b415d614251897464aa8b1fbec82..a3881420b6930234cc1328bf1160430799259afe 100644 (file)
--- a/contrib/build/stc/makefile.gcc
+++ b/contrib/build/stc/makefile.gcc
@@ -210,6 +210,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif

+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif

 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif


@@ -233,8 +236,6 @@ __stclib___depname = \
        $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a
 endif
 
        $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a
 endif
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) VENDOR=$(VENDOR) WXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -546,7 +547,7 @@ clean:
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_gcc$(VENDORTAG).dll: $(STCDLL_OBJECTS)
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_gcc$(VENDORTAG).dll: $(STCDLL_OBJECTS)

-       $(CXX) -shared -o $@ $(STCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
+       $(CXX) -shared -o $@ $(STCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)

 endif
 
 ifeq ($(SHARED),0)
 endif
 
 ifeq ($(SHARED),0)

diff --git a/contrib/build/stc/makefile.vc b/contrib/build/stc/makefile.vc
index 8e2c0e3fe4c240d06d699c45e639d3aeb758ecf8..7202b71dec637f63f6cfb025120a68049ecd7a0b 100644 (file)
--- a/contrib/build/stc/makefile.vc
+++ b/contrib/build/stc/makefile.vc
@@ -252,6 +252,9 @@ __RUNTIME_LIBS = T
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !endif
 !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
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -618,7 +621,7 @@ clean:
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).dll: $(STCDLL_OBJECTS)
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) @<<
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).dll: $(STCDLL_OBJECTS)
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) @<<

-       $(STCDLL_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)_stc.lib
+       $(STCDLL_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)_stc.lib

 <<
 !endif
 
 <<
 !endif
 

diff --git a/contrib/build/stc/makefile.wat b/contrib/build/stc/makefile.wat
index 888e42849382dcc828b08a8845f63b1e164c70fb..0a960b553c271c9013a5472c759048c393a394d2 100644 (file)
--- a/contrib/build/stc/makefile.wat
+++ b/contrib/build/stc/makefile.wat
@@ -289,8 +289,6 @@ STCLIB_OBJECTS =  &
        $(OBJS)\stclib_WindowAccessor.obj &
        $(OBJS)\stclib_XPM.obj
 
        $(OBJS)\stclib_WindowAccessor.obj &
        $(OBJS)\stclib_XPM.obj
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) VENDOR=$(VENDOR) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -611,7 +609,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_wa
        @%append $(OBJS)\stcdll.lbc option incremental
        @%append $(OBJS)\stcdll.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME)
        @for %i in ($(STCDLL_OBJECTS)) do @%append $(OBJS)\stcdll.lbc file %i
        @%append $(OBJS)\stcdll.lbc option incremental
        @%append $(OBJS)\stcdll.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME)
        @for %i in ($(STCDLL_OBJECTS)) do @%append $(OBJS)\stcdll.lbc file %i

-       @for %i in ( $(__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)) do @%append $(OBJS)\stcdll.lbc library %i
+       @for %i in ( $(__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)) do @%append $(OBJS)\stcdll.lbc library %i

        @%append $(OBJS)\stcdll.lbc
        @%append $(OBJS)\stcdll.lbc system nt_dll
        wlink @$(OBJS)\stcdll.lbc
        @%append $(OBJS)\stcdll.lbc
        @%append $(OBJS)\stcdll.lbc system nt_dll
        wlink @$(OBJS)\stcdll.lbc

diff --git a/contrib/build/svg/makefile.bcc b/contrib/build/svg/makefile.bcc
index bd9b315d21ae6912d18bf9cfb9a4c5a86737c1e4..d2d2c773c7eaea6785f48d3ebb680c08ef7bdefe 100644 (file)
--- a/contrib/build/svg/makefile.bcc
+++ b/contrib/build/svg/makefile.bcc
@@ -123,6 +123,9 @@ __RUNTIME_LIBS_7 =
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !endif
 !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
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -146,8 +149,6 @@ __svglib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib
 !endif
 
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib
 !endif
 

-MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DVENDOR=$(VENDOR) -DWXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -179,7 +180,7 @@ clean:
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_bcc$(VENDORTAG).dll: $(SVGDLL_OBJECTS) $(OBJS)\svgdll_dummy.obj
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_bcc$(VENDORTAG).dll: $(SVGDLL_OBJECTS) $(OBJS)\svgdll_dummy.obj
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|

-       c0d32.obj $(SVGDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
+       c0d32.obj $(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) import32.lib ole2w32.lib  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,

 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg $@
 !endif
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg $@
 !endif

diff --git a/contrib/build/svg/makefile.gcc b/contrib/build/svg/makefile.gcc
index 9308756529d7311d963d661cbc8cfc1266a3fd64..a1ea690868d3c631fc78333471effba9e2f8b8ff 100644 (file)
--- a/contrib/build/svg/makefile.gcc
+++ b/contrib/build/svg/makefile.gcc
@@ -113,6 +113,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif

+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif

 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif


@@ -136,8 +139,6 @@ __svglib___depname = \
        $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.a
 endif
 
        $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.a
 endif
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) VENDOR=$(VENDOR) WXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -167,7 +168,7 @@ clean:
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_gcc$(VENDORTAG).dll: $(SVGDLL_OBJECTS)
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_gcc$(VENDORTAG).dll: $(SVGDLL_OBJECTS)

-       $(CXX) -shared -o $@ $(SVGDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
+       $(CXX) -shared -o $@ $(SVGDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)

 endif
 
 ifeq ($(SHARED),0)
 endif
 
 ifeq ($(SHARED),0)

diff --git a/contrib/build/svg/makefile.vc b/contrib/build/svg/makefile.vc
index 508424110411b535547c87e96fdf5d1e7a419be0..a54d904d3848bb1b75e7f6d5d1f238964cb45724 100644 (file)
--- a/contrib/build/svg/makefile.vc
+++ b/contrib/build/svg/makefile.vc
@@ -157,6 +157,9 @@ __RUNTIME_LIBS = T
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !endif
 !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
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -241,7 +244,7 @@ clean:
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_vc$(VENDORTAG).dll: $(SVGDLL_OBJECTS) $(OBJS)\svgdll_dummy.obj
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) @<<
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_vc$(VENDORTAG).dll: $(SVGDLL_OBJECTS) $(OBJS)\svgdll_dummy.obj
        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
 
 <<
 !endif
 

diff --git a/contrib/build/svg/makefile.wat b/contrib/build/svg/makefile.wat
index 8bef952b4207ad677e3a12e57721640607c9c9ef..3c87e9601baf671f31772aaa052b2b1232499cba 100644 (file)
--- a/contrib/build/svg/makefile.wat
+++ b/contrib/build/svg/makefile.wat
@@ -193,8 +193,6 @@ SVGLIB_OBJECTS =  &
        $(OBJS)\svglib_dummy.obj &
        $(OBJS)\svglib_dcsvg.obj
 
        $(OBJS)\svglib_dummy.obj &
        $(OBJS)\svglib_dcsvg.obj
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) VENDOR=$(VENDOR) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -233,7 +231,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg_wa
        @%append $(OBJS)\svgdll.lbc option incremental
        @%append $(OBJS)\svgdll.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME)
        @for %i in ($(SVGDLL_OBJECTS)) do @%append $(OBJS)\svgdll.lbc file %i
        @%append $(OBJS)\svgdll.lbc option incremental
        @%append $(OBJS)\svgdll.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME)
        @for %i in ($(SVGDLL_OBJECTS)) do @%append $(OBJS)\svgdll.lbc file %i

-       @for %i in ( $(__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)) do @%append $(OBJS)\svgdll.lbc library %i
+       @for %i in ( $(__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)) do @%append $(OBJS)\svgdll.lbc library %i

        @%append $(OBJS)\svgdll.lbc
        @%append $(OBJS)\svgdll.lbc system nt_dll
        wlink @$(OBJS)\svgdll.lbc
        @%append $(OBJS)\svgdll.lbc
        @%append $(OBJS)\svgdll.lbc system nt_dll
        wlink @$(OBJS)\svgdll.lbc

diff --git a/contrib/build/xrc/makefile.bcc b/contrib/build/xrc/makefile.bcc
index 33df5c6acff585a91bb11d12fe97150f8abdf457..4472b252dafda6931ca487ec35c1abdb2f8f3ecb 100644 (file)
--- a/contrib/build/xrc/makefile.bcc
+++ b/contrib/build/xrc/makefile.bcc
@@ -196,6 +196,9 @@ __RUNTIME_LIBS_7 =
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_ADV_p = \
        wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_ADV_p = \
        wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib


@@ -230,8 +233,6 @@ __xrclib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib
 !endif
 
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib
 !endif
 

-MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DVENDOR=$(VENDOR) -DWXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -479,7 +480,7 @@ clean:
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_bcc$(VENDORTAG).dll: $(XRCDLL_OBJECTS) $(OBJS)\xrcdll_dummy.obj
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_bcc$(VENDORTAG).dll: $(XRCDLL_OBJECTS) $(OBJS)\xrcdll_dummy.obj
        ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|

-       c0d32.obj $(XRCDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
+       c0d32.obj $(XRCDLL_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) import32.lib ole2w32.lib  $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,

 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc $@
 !endif
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc $@
 !endif

diff --git a/contrib/build/xrc/makefile.gcc b/contrib/build/xrc/makefile.gcc
index eecf17b2491448aa899029f345290358a7917116..b11dea55aa0627d06eb27a5a405abbac02bf89c6 100644 (file)
--- a/contrib/build/xrc/makefile.gcc
+++ b/contrib/build/xrc/makefile.gcc
@@ -186,6 +186,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif

+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif

 ifeq ($(MONOLITHIC),0)
 __WXLIB_ADV_p = \
        -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv
 ifeq ($(MONOLITHIC),0)
 __WXLIB_ADV_p = \
        -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv


@@ -220,8 +223,6 @@ __xrclib___depname = \
        $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a
 endif
 
        $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a
 endif
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) VENDOR=$(VENDOR) WXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -467,7 +468,7 @@ clean:
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_gcc$(VENDORTAG).dll: $(XRCDLL_OBJECTS)
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_gcc$(VENDORTAG).dll: $(XRCDLL_OBJECTS)

-       $(CXX) -shared -o $@ $(XRCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p)
+       $(CXX) -shared -o $@ $(XRCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p)

 endif
 
 ifeq ($(SHARED),0)
 endif
 
 ifeq ($(SHARED),0)

diff --git a/contrib/build/xrc/makefile.vc b/contrib/build/xrc/makefile.vc
index 23c7ebd9d67ce8ac651277d4c6e545d19407f290..1c8375f3d1f869fbfee01d22560f595eb9ef590d 100644 (file)
--- a/contrib/build/xrc/makefile.vc
+++ b/contrib/build/xrc/makefile.vc
@@ -230,6 +230,9 @@ __RUNTIME_LIBS = T
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_ADV_p = \
        wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_ADV_p = \
        wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib


@@ -541,7 +544,7 @@ clean:
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_vc$(VENDORTAG).dll: $(XRCDLL_OBJECTS) $(OBJS)\xrcdll_dummy.obj
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) @<<
 !if "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_vc$(VENDORTAG).dll: $(XRCDLL_OBJECTS) $(OBJS)\xrcdll_dummy.obj
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) @<<

-       $(XRCDLL_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_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib
+       $(XRCDLL_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_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib

 <<
 !endif
 
 <<
 !endif
 

diff --git a/contrib/build/xrc/makefile.wat b/contrib/build/xrc/makefile.wat
index d7d0ca5d6053d74907132addef531a9eb77a3c7f..6657a3af00422ddbb7590ad85c8e1aa560470c01 100644 (file)
--- a/contrib/build/xrc/makefile.wat
+++ b/contrib/build/xrc/makefile.wat
@@ -280,8 +280,6 @@ XRCLIB_OBJECTS =  &
        $(OBJS)\xrclib_xh_wizrd.obj &
        $(OBJS)\xrclib_xmlrsall.obj
 
        $(OBJS)\xrclib_xh_wizrd.obj &
        $(OBJS)\xrclib_xmlrsall.obj
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) VENDOR=$(VENDOR) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -536,7 +534,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc_wa
        @%append $(OBJS)\xrcdll.lbc option incremental
        @%append $(OBJS)\xrcdll.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME)
        @for %i in ($(XRCDLL_OBJECTS)) do @%append $(OBJS)\xrcdll.lbc file %i
        @%append $(OBJS)\xrcdll.lbc option incremental
        @%append $(OBJS)\xrcdll.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME)
        @for %i in ($(XRCDLL_OBJECTS)) do @%append $(OBJS)\xrcdll.lbc file %i

-       @for %i in ( $(__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_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\xrcdll.lbc library %i
+       @for %i in ( $(__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_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\xrcdll.lbc library %i

        @%append $(OBJS)\xrcdll.lbc
        @%append $(OBJS)\xrcdll.lbc system nt_dll
        wlink @$(OBJS)\xrcdll.lbc
        @%append $(OBJS)\xrcdll.lbc
        @%append $(OBJS)\xrcdll.lbc system nt_dll
        wlink @$(OBJS)\xrcdll.lbc

diff --git a/contrib/samples/animate/Makefile.in b/contrib/samples/animate/Makefile.in
index 6b9cf76e334db71199ec0e068bce0d481780eb29..b0069ac402e24c470322fdf208284290e7df4600 100644 (file)
--- a/contrib/samples/animate/Makefile.in
+++ b/contrib/samples/animate/Makefile.in
@@ -35,7 +35,8 @@ top_srcdir = @top_srcdir@
 ANITEST_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) \
 ANITEST_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) $(__DLLFLAG_p) -I$(srcdir)/../../include $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -I../../../samples -I$(srcdir)/../../include \
+       $(CXXFLAGS)

 ANITEST_OBJECTS =  \
        anitest_anitest.o \
        $(__anitest___win32rc)
 ANITEST_OBJECTS =  \
        anitest_anitest.o \
        $(__anitest___win32rc)


@@ -104,8 +105,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \

-       $(__DLLFLAG_p_1) -i $(srcdir)/../../include -o anitest$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r
+       $(__DLLFLAG_p_1) -i ../../../samples -i $(srcdir)/../../include -o \
+       anitest$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
+       ../../../samples/sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)


@@ -136,7 +138,7 @@ anitest_anitest.o: $(srcdir)/anitest.cpp
        $(CXXC) -c -o $@ $(ANITEST_CXXFLAGS) $<
 
 anitest_anitest_rc.o: $(srcdir)/anitest.rc
        $(CXXC) -c -o $@ $(ANITEST_CXXFLAGS) $<
 
 anitest_anitest_rc.o: $(srcdir)/anitest.rc

-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../include
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples --include-dir $(srcdir)/../../include

 
 clean: 
        rm -rf ./.deps
 
 clean: 
        rm -rf ./.deps

diff --git a/contrib/samples/animate/makefile.bcc b/contrib/samples/animate/makefile.bcc
index f684051ebec2d7c287325fbb08398ba5884fa5d9..b43f3317402e21de3d132611f2e09d68a4a34c5f 100644 (file)
--- a/contrib/samples/animate/makefile.bcc
+++ b/contrib/samples/animate/makefile.bcc
@@ -25,7 +25,8 @@ ANITEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \
        -I$(LIBDIRNAME) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg \
        -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \
        -I$(LIBDIRNAME) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg \
        -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex \

-       -I.\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS)
+       -I.\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I..\..\..\samples \
+       -I.\..\..\include $(CXXFLAGS)

 ANITEST_OBJECTS =  \
        $(OBJS)\anitest_anitest.obj
 LIBDIRNAME = \
 ANITEST_OBJECTS =  \
        $(OBJS)\anitest_anitest.obj
 LIBDIRNAME = \


@@ -119,6 +120,9 @@ __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -137,8 +141,6 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
 !endif
 
 __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
 !endif
 

-MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DWXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -152,11 +154,11 @@ $(OBJS)\anitest_anitest.obj: .\anitest.cpp
        $(CXX) -q -c -P -o$@ $(ANITEST_CXXFLAGS) $**
 
 $(OBJS)\anitest_anitest.res: .\anitest.rc
        $(CXX) -q -c -P -o$@ $(ANITEST_CXXFLAGS) $**
 
 $(OBJS)\anitest_anitest.res: .\anitest.rc

-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib  -i.\..\..\..\src\regex -i.\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) -i.\..\..\include $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib  -i.\..\..\..\src\regex -i.\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) -i..\..\..\samples -i.\..\..\include $**

 
 $(OBJS)\anitest.exe: $(ANITEST_OBJECTS)  $(OBJS)\anitest_anitest.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|
 
 $(OBJS)\anitest.exe: $(ANITEST_OBJECTS)  $(OBJS)\anitest_anitest.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|

-       c0w32.obj $(ANITEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\anitest_anitest.res
+       c0w32.obj $(ANITEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\anitest_anitest.res

 |
 
 clean: 
 |
 
 clean: 

diff --git a/contrib/samples/animate/makefile.gcc b/contrib/samples/animate/makefile.gcc
index d3098805f2b774cdd7a51e3f147ceab4b44171be..0af61b13fb44eee652f0f3141d87090d762cdce2 100644 (file)
--- a/contrib/samples/animate/makefile.gcc
+++ b/contrib/samples/animate/makefile.gcc
@@ -17,7 +17,7 @@ ANITEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \

-       $(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS)
+       $(__DLLFLAG_p) -I..\..\..\samples -I.\..\..\include $(CXXFLAGS)

 ANITEST_OBJECTS =  \
        $(OBJS)\anitest_anitest.o \
        $(OBJS)\anitest_anitest_rc.o
 ANITEST_OBJECTS =  \
        $(OBJS)\anitest_anitest.o \
        $(OBJS)\anitest_anitest_rc.o


@@ -113,6 +113,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
 endif

+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif

 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif


@@ -131,8 +134,6 @@ ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
 endif
 
 __WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
 endif
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -146,10 +147,10 @@ $(OBJS)\anitest_anitest.o: .\anitest.cpp
        $(CXX) -c -o $@ $(ANITEST_CXXFLAGS) $<
 
 $(OBJS)\anitest_anitest_rc.o: .\anitest.rc
        $(CXX) -c -o $@ $(ANITEST_CXXFLAGS) $<
 
 $(OBJS)\anitest_anitest_rc.o: .\anitest.rc

-       windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../include --include-dir $(LIBDIRNAME) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib  --include-dir ./../../../src/regex --include-dir ./../../../src/expat/lib --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../include
+       windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../include --include-dir $(LIBDIRNAME) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib  --include-dir ./../../../src/regex --include-dir ./../../../src/expat/lib --include-dir . $(__DLLFLAG_p_1) --include-dir ../../../samples --include-dir ./../../include

 
 $(OBJS)\anitest.exe: $(ANITEST_OBJECTS) $(OBJS)\anitest_anitest_rc.o
 
 $(OBJS)\anitest.exe: $(ANITEST_OBJECTS) $(OBJS)\anitest_anitest_rc.o

-       $(CXX) -o $@ $(ANITEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -o $@ $(ANITEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32

 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o

diff --git a/contrib/samples/animate/makefile.vc b/contrib/samples/animate/makefile.vc
index 85621f44ddc9c660c8cac633c944469b97f9d58c..4c608e39b94fb37c0d619b506d1552927551e535 100644 (file)
--- a/contrib/samples/animate/makefile.vc
+++ b/contrib/samples/animate/makefile.vc
@@ -18,7 +18,7 @@ ANITEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \
        /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \
        /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \
        /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \
        /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \

-       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\include $(CXXFLAGS)
+       $(__DLLFLAG_p) /D_WINDOWS /I..\..\..\samples /I.\..\..\include $(CXXFLAGS)

 ANITEST_OBJECTS =  \
        $(OBJS)\anitest_anitest.obj \
        $(OBJS)\anitest_anitest.res
 ANITEST_OBJECTS =  \
        $(OBJS)\anitest_anitest.obj \
        $(OBJS)\anitest_anitest.res


@@ -140,6 +140,9 @@ __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -213,11 +216,11 @@ $(OBJS)\anitest_anitest.obj: .\anitest.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ANITEST_CXXFLAGS) $**
 
 $(OBJS)\anitest_anitest.res: .\anitest.rc
        $(CXX) /c /nologo /TP /Fo$@ $(ANITEST_CXXFLAGS) $**
 
 $(OBJS)\anitest_anitest.res: .\anitest.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\src\tiff /i .\..\..\..\src\jpeg /i .\..\..\..\src\png /i .\..\..\..\src\zlib  /i .\..\..\..\src\regex /i .\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\include $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\src\tiff /i .\..\..\..\src\jpeg /i .\..\..\..\src\png /i .\..\..\..\src\zlib  /i .\..\..\..\src\regex /i .\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS /i ..\..\..\samples /i .\..\..\include $**

 
 $(OBJS)\anitest.exe: $(ANITEST_OBJECTS) $(OBJS)\anitest_anitest.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<
 
 $(OBJS)\anitest.exe: $(ANITEST_OBJECTS) $(OBJS)\anitest_anitest.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<

-       $(ANITEST_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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
+       $(ANITEST_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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

 <<
 
 clean: 
 <<
 
 clean: 

diff --git a/contrib/samples/animate/makefile.wat b/contrib/samples/animate/makefile.wat
index fc987a843ec4ec1506dcaed3f117565308fb9b77..830213db5ff6652be64706f75833884c9c429c5a 100644 (file)
--- a/contrib/samples/animate/makefile.wat
+++ b/contrib/samples/animate/makefile.wat
@@ -158,7 +158,7 @@ ANITEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
        $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) &
        -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png &
        -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib &
        $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) &
        -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png &
        -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib &

-       -i=. $(__DLLFLAG_p) -i=.\..\..\include $(CXXFLAGS)
+       -i=. $(__DLLFLAG_p) -i=..\..\..\samples -i=.\..\..\include $(CXXFLAGS)

 ANITEST_OBJECTS =  &
        $(OBJS)\anitest_anitest.obj
 LIBDIRNAME = &
 ANITEST_OBJECTS =  &
        $(OBJS)\anitest_anitest.obj
 LIBDIRNAME = &


@@ -166,8 +166,6 @@ LIBDIRNAME = &
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -181,7 +179,7 @@ $(OBJS)\anitest_anitest.obj :  .AUTODEPEND .\anitest.cpp
        $(CXX) -zq -fo=$^@ $(ANITEST_CXXFLAGS) $<
 
 $(OBJS)\anitest_anitest.res :  .AUTODEPEND .\anitest.rc
        $(CXX) -zq -fo=$^@ $(ANITEST_CXXFLAGS) $<
 
 $(OBJS)\anitest_anitest.res :  .AUTODEPEND .\anitest.rc

-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib  -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=.\..\..\include $<
+       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib  -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=..\..\..\samples -i=.\..\..\include $<

 
 $(OBJS)\anitest.exe :  $(ANITEST_OBJECTS) $(OBJS)\anitest_anitest.res
        @%create $(OBJS)\anitest.lbc
 
 $(OBJS)\anitest.exe :  $(ANITEST_OBJECTS) $(OBJS)\anitest_anitest.res
        @%create $(OBJS)\anitest.lbc


@@ -190,7 +188,7 @@ $(OBJS)\anitest.exe :  $(ANITEST_OBJECTS) $(OBJS)\anitest_anitest.res
        @%append $(OBJS)\anitest.lbc option incremental
        @%append $(OBJS)\anitest.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(ANITEST_OBJECTS)) do @%append $(OBJS)\anitest.lbc file %i
        @%append $(OBJS)\anitest.lbc option incremental
        @%append $(OBJS)\anitest.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(ANITEST_OBJECTS)) do @%append $(OBJS)\anitest.lbc file %i

-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\anitest.lbc library %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\anitest.lbc library %i

        @%append $(OBJS)\anitest.lbc option resource=$(OBJS)\anitest_anitest.res
        wlink @$(OBJS)\anitest.lbc
 
        @%append $(OBJS)\anitest.lbc option resource=$(OBJS)\anitest_anitest.res
        wlink @$(OBJS)\anitest.lbc
 

diff --git a/contrib/samples/deprecated/proplist/Makefile.in b/contrib/samples/deprecated/proplist/Makefile.in
index 6c78740285faf97777a6ccf2382977493771abbe..881a14e3c6096894f50bc4132c7d2fdc16ea07b4 100644 (file)
--- a/contrib/samples/deprecated/proplist/Makefile.in
+++ b/contrib/samples/deprecated/proplist/Makefile.in
@@ -36,7 +36,8 @@ LIBDIRNAME = $(top_builddir)lib
 PROPLIST_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) \
 PROPLIST_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) $(__DLLFLAG_p) -I$(srcdir)/../../../include $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -I../../../../samples \
+       -I$(srcdir)/../../../include $(CXXFLAGS)

 PROPLIST_OBJECTS =  \
        proplist_proplist.o \
        $(__proplist___win32rc)
 PROPLIST_OBJECTS =  \
        proplist_proplist.o \
        $(__proplist___win32rc)


@@ -104,8 +105,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \

-       $(__DLLFLAG_p_1) -i $(srcdir)/../../../include -o proplist$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../../samples/sample.r
+       $(__DLLFLAG_p_1) -i ../../../../samples -i $(srcdir)/../../../include -o \
+       proplist$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
+       ../../../../samples/sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)


@@ -149,7 +151,7 @@ proplist_proplist.o: $(srcdir)/proplist.cpp
        $(CXXC) -c -o $@ $(PROPLIST_CXXFLAGS) $<
 
 proplist_proplist_rc.o: $(srcdir)/proplist.rc
        $(CXXC) -c -o $@ $(PROPLIST_CXXFLAGS) $<
 
 proplist_proplist_rc.o: $(srcdir)/proplist.rc

-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../include
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../../samples --include-dir $(srcdir)/../../../include

 
 uninstall: 
 
 
 uninstall: 
 

diff --git a/contrib/samples/deprecated/proplist/makefile.bcc b/contrib/samples/deprecated/proplist/makefile.bcc
index 72d999420c87c6378d88fe74e11fcb7ec98ac13e..6ac2434de747f404bc8551e889c950506d941817 100644 (file)
--- a/contrib/samples/deprecated/proplist/makefile.bcc
+++ b/contrib/samples/deprecated/proplist/makefile.bcc
@@ -29,8 +29,8 @@ PROPLIST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include \
        -I$(LIBDIRNAME) -I.\..\..\..\..\src\tiff -I.\..\..\..\..\src\jpeg \
        -I.\..\..\..\..\src\png -I.\..\..\..\..\src\zlib -I.\..\..\..\..\src\regex \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include \
        -I$(LIBDIRNAME) -I.\..\..\..\..\src\tiff -I.\..\..\..\..\src\jpeg \
        -I.\..\..\..\..\src\png -I.\..\..\..\..\src\zlib -I.\..\..\..\..\src\regex \

-       -I.\..\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I.\..\..\..\include \
-       $(CXXFLAGS)
+       -I.\..\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I..\..\..\..\samples \
+       -I.\..\..\..\include $(CXXFLAGS)

 PROPLIST_OBJECTS =  \
        $(OBJS)\proplist_proplist.obj
 
 PROPLIST_OBJECTS =  \
        $(OBJS)\proplist_proplist.obj
 


@@ -120,6 +120,9 @@ __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -138,8 +141,6 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
 !endif
 
 __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
 !endif
 

-MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DWXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -153,7 +154,7 @@ $(OBJS)\proplist_proplist.obj: .\proplist.cpp
        $(CXX) -q -c -P -o$@ $(PROPLIST_CXXFLAGS) $**
 
 $(OBJS)\proplist_proplist.res: .\proplist.rc
        $(CXX) -q -c -P -o$@ $(PROPLIST_CXXFLAGS) $**
 
 $(OBJS)\proplist_proplist.res: .\proplist.rc

-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\..\src\tiff -i.\..\..\..\..\src\jpeg -i.\..\..\..\..\src\png -i.\..\..\..\..\src\zlib  -i.\..\..\..\..\src\regex -i.\..\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) -i.\..\..\..\include $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\..\src\tiff -i.\..\..\..\..\src\jpeg -i.\..\..\..\..\src\png -i.\..\..\..\..\src\zlib  -i.\..\..\..\..\src\regex -i.\..\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) -i..\..\..\..\samples -i.\..\..\..\include $**

 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -162,5 +163,5 @@ clean:
 
 $(OBJS)\proplist.exe: $(PROPLIST_OBJECTS)  $(OBJS)\proplist_proplist.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|
 
 $(OBJS)\proplist.exe: $(PROPLIST_OBJECTS)  $(OBJS)\proplist_proplist.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|

-       c0w32.obj $(PROPLIST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\proplist_proplist.res
+       c0w32.obj $(PROPLIST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\proplist_proplist.res

 |
 |

diff --git a/contrib/samples/deprecated/proplist/makefile.gcc b/contrib/samples/deprecated/proplist/makefile.gcc
index ea5903d6a23d2beef157cd62e867bb36fc572f03..011ccfe9445d427a109bd23c907def2f629b2a5a 100644 (file)
--- a/contrib/samples/deprecated/proplist/makefile.gcc
+++ b/contrib/samples/deprecated/proplist/makefile.gcc
@@ -21,8 +21,8 @@ PROPLIST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\..\src\tiff -I.\..\..\..\..\src\jpeg -I.\..\..\..\..\src\png \
        -I.\..\..\..\..\src\zlib -I.\..\..\..\..\src\regex \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\..\src\tiff -I.\..\..\..\..\src\jpeg -I.\..\..\..\..\src\png \
        -I.\..\..\..\..\src\zlib -I.\..\..\..\..\src\regex \

-       -I.\..\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I.\..\..\..\include \
-       $(CXXFLAGS)
+       -I.\..\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I..\..\..\..\samples \
+       -I.\..\..\..\include $(CXXFLAGS)

 PROPLIST_OBJECTS =  \
        $(OBJS)\proplist_proplist.o \
        $(OBJS)\proplist_proplist_rc.o
 PROPLIST_OBJECTS =  \
        $(OBJS)\proplist_proplist.o \
        $(OBJS)\proplist_proplist_rc.o


@@ -114,6 +114,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
 endif

+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif

 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif


@@ -132,8 +135,6 @@ ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
 endif
 
 __WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
 endif
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -147,13 +148,13 @@ $(OBJS)\proplist_proplist.o: .\proplist.cpp
        $(CXX) -c -o $@ $(PROPLIST_CXXFLAGS) $<
 
 $(OBJS)\proplist_proplist_rc.o: .\proplist.rc
        $(CXX) -c -o $@ $(PROPLIST_CXXFLAGS) $<
 
 $(OBJS)\proplist_proplist_rc.o: .\proplist.rc

-       windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../../include --include-dir $(LIBDIRNAME) --include-dir ./../../../../src/tiff --include-dir ./../../../../src/jpeg --include-dir ./../../../../src/png --include-dir ./../../../../src/zlib  --include-dir ./../../../../src/regex --include-dir ./../../../../src/expat/lib --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../include
+       windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../../include --include-dir $(LIBDIRNAME) --include-dir ./../../../../src/tiff --include-dir ./../../../../src/jpeg --include-dir ./../../../../src/png --include-dir ./../../../../src/zlib  --include-dir ./../../../../src/regex --include-dir ./../../../../src/expat/lib --include-dir . $(__DLLFLAG_p_1) --include-dir ../../../../samples --include-dir ./../../../include

 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        -if exist $(OBJS)\proplist.exe del $(OBJS)\proplist.exe
 
 $(OBJS)\proplist.exe: $(PROPLIST_OBJECTS) $(OBJS)\proplist_proplist_rc.o
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        -if exist $(OBJS)\proplist.exe del $(OBJS)\proplist.exe
 
 $(OBJS)\proplist.exe: $(PROPLIST_OBJECTS) $(OBJS)\proplist_proplist_rc.o

-       $(CXX) -o $@ $(PROPLIST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -o $@ $(PROPLIST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32

 
 .PHONY: all clean
 
 .PHONY: all clean

diff --git a/contrib/samples/deprecated/proplist/makefile.vc b/contrib/samples/deprecated/proplist/makefile.vc
index 1596a248efd5052163b79c1c0076041660b220ce..b9ff31355b8c759a2fec50e5f7658d8afc9167b2 100644 (file)
--- a/contrib/samples/deprecated/proplist/makefile.vc
+++ b/contrib/samples/deprecated/proplist/makefile.vc
@@ -23,7 +23,7 @@ PROPLIST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \
        /I.\..\..\..\..\src\tiff /I.\..\..\..\..\src\jpeg /I.\..\..\..\..\src\png \
        /I.\..\..\..\..\src\zlib /I.\..\..\..\..\src\regex \
        /I.\..\..\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_WINDOWS \
        /I.\..\..\..\..\src\tiff /I.\..\..\..\..\src\jpeg /I.\..\..\..\..\src\png \
        /I.\..\..\..\..\src\zlib /I.\..\..\..\..\src\regex \
        /I.\..\..\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_WINDOWS \

-       /I.\..\..\..\include $(CXXFLAGS)
+       /I..\..\..\..\samples /I.\..\..\..\include $(CXXFLAGS)

 PROPLIST_OBJECTS =  \
        $(OBJS)\proplist_proplist.obj \
        $(OBJS)\proplist_proplist.res
 PROPLIST_OBJECTS =  \
        $(OBJS)\proplist_proplist.obj \
        $(OBJS)\proplist_proplist.res


@@ -141,6 +141,9 @@ __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -214,7 +217,7 @@ $(OBJS)\proplist_proplist.obj: .\proplist.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(PROPLIST_CXXFLAGS) $**
 
 $(OBJS)\proplist_proplist.res: .\proplist.rc
        $(CXX) /c /nologo /TP /Fo$@ $(PROPLIST_CXXFLAGS) $**
 
 $(OBJS)\proplist_proplist.res: .\proplist.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\..\src\tiff /i .\..\..\..\..\src\jpeg /i .\..\..\..\..\src\png /i .\..\..\..\..\src\zlib  /i .\..\..\..\..\src\regex /i .\..\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\include $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\..\src\tiff /i .\..\..\..\..\src\jpeg /i .\..\..\..\..\src\png /i .\..\..\..\..\src\zlib  /i .\..\..\..\..\src\regex /i .\..\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS /i ..\..\..\..\samples /i .\..\..\..\include $**

 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -223,5 +226,5 @@ clean:
 
 $(OBJS)\proplist.exe: $(PROPLIST_OBJECTS) $(OBJS)\proplist_proplist.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<
 
 $(OBJS)\proplist.exe: $(PROPLIST_OBJECTS) $(OBJS)\proplist_proplist.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<

-       $(PROPLIST_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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
+       $(PROPLIST_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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

 <<
 <<

diff --git a/contrib/samples/deprecated/proplist/makefile.wat b/contrib/samples/deprecated/proplist/makefile.wat
index 93f438cf8e3327ce76d5e8b5c105203e886f33f3..6f0ae6ebbb2fcae753531495f3da5976a339a37d 100644 (file)
--- a/contrib/samples/deprecated/proplist/makefile.wat
+++ b/contrib/samples/deprecated/proplist/makefile.wat
@@ -163,12 +163,10 @@ PROPLIST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
        -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg &
        -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib &
        -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. &
        -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg &
        -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib &
        -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. &

-       $(__DLLFLAG_p) -i=.\..\..\..\include $(CXXFLAGS)
+       $(__DLLFLAG_p) -i=..\..\..\..\samples -i=.\..\..\..\include $(CXXFLAGS)

 PROPLIST_OBJECTS =  &
        $(OBJS)\proplist_proplist.obj
 
 PROPLIST_OBJECTS =  &
        $(OBJS)\proplist_proplist.obj
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -182,7 +180,7 @@ $(OBJS)\proplist_proplist.obj :  .AUTODEPEND .\proplist.cpp
        $(CXX) -zq -fo=$^@ $(PROPLIST_CXXFLAGS) $<
 
 $(OBJS)\proplist_proplist.res :  .AUTODEPEND .\proplist.rc
        $(CXX) -zq -fo=$^@ $(PROPLIST_CXXFLAGS) $<
 
 $(OBJS)\proplist_proplist.res :  .AUTODEPEND .\proplist.rc

-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib  -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=.\..\..\..\include $<
+       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib  -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=..\..\..\..\samples -i=.\..\..\..\include $<

 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -198,6 +196,6 @@ $(OBJS)\proplist.exe :  $(PROPLIST_OBJECTS) $(OBJS)\proplist_proplist.res
        @%append $(OBJS)\proplist.lbc option incremental
        @%append $(OBJS)\proplist.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(PROPLIST_OBJECTS)) do @%append $(OBJS)\proplist.lbc file %i
        @%append $(OBJS)\proplist.lbc option incremental
        @%append $(OBJS)\proplist.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(PROPLIST_OBJECTS)) do @%append $(OBJS)\proplist.lbc file %i

-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\proplist.lbc library %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\proplist.lbc library %i

        @%append $(OBJS)\proplist.lbc option resource=$(OBJS)\proplist_proplist.res
        wlink @$(OBJS)\proplist.lbc
        @%append $(OBJS)\proplist.lbc option resource=$(OBJS)\proplist_proplist.res
        wlink @$(OBJS)\proplist.lbc

diff --git a/contrib/samples/deprecated/proplist/proplist.dsp b/contrib/samples/deprecated/proplist/proplist.dsp
index 003df8b32378c638d665ee0dc4daee62cca3ba80..4ff35a02a0732a1b51d71c3385bc0eca8b94a1a0 100644 (file)
--- a/contrib/samples/deprecated/proplist/proplist.dsp
+++ b/contrib/samples/deprecated/proplist/proplist.dsp
@@ -55,12 +55,12 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\proplist"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\proplist"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -80,12 +80,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_msw"
 # PROP Intermediate_Dir "vc_msw\proplist"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_msw"
 # PROP Intermediate_Dir "vc_msw\proplist"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_msw\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_msw\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_msw\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_msw\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -105,12 +105,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\proplist"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\proplist"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -130,12 +130,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\proplist"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\proplist"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswu\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswu\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswu\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswu\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -155,12 +155,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\proplist"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\proplist"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -180,12 +180,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\proplist"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\proplist"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -205,12 +205,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\proplist"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\proplist"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -230,12 +230,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\proplist"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\proplist"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -255,12 +255,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\proplist"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\proplist"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -280,12 +280,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\proplist"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\proplist"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswdll\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswdll\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswdll\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswdll\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -305,12 +305,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\proplist"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\proplist"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -330,12 +330,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\proplist"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\proplist"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswudll\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswudll\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswudll\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswudll\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -355,12 +355,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\proplist"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\proplist"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -380,12 +380,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\proplist"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\proplist"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -405,12 +405,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\proplist"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\proplist"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\proplist.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -430,12 +430,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\proplist"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\proplist"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\proplist.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo

diff --git a/contrib/samples/deprecated/resource/Makefile.in b/contrib/samples/deprecated/resource/Makefile.in
index 2d59edec9369e3147e7cfc751a0e2215fc35310a..856c0ff799378a5913c789d69f7e1191a70d0dcc 100644 (file)
--- a/contrib/samples/deprecated/resource/Makefile.in
+++ b/contrib/samples/deprecated/resource/Makefile.in
@@ -36,7 +36,8 @@ LIBDIRNAME = $(top_builddir)lib
 RESOURCE_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) \
 RESOURCE_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) $(__DLLFLAG_p) -I$(srcdir)/../../../include $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -I../../../../samples \
+       -I$(srcdir)/../../../include $(CXXFLAGS)

 RESOURCE_OBJECTS =  \
        resource_resource.o \
        $(__resource___win32rc)
 RESOURCE_OBJECTS =  \
        resource_resource.o \
        $(__resource___win32rc)


@@ -104,8 +105,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \

-       $(__DLLFLAG_p_1) -i $(srcdir)/../../../include -o resource$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../../samples/sample.r
+       $(__DLLFLAG_p_1) -i ../../../../samples -i $(srcdir)/../../../include -o \
+       resource$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
+       ../../../../samples/sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)


@@ -149,7 +151,7 @@ resource_resource.o: $(srcdir)/resource.cpp
        $(CXXC) -c -o $@ $(RESOURCE_CXXFLAGS) $<
 
 resource_resource_rc.o: $(srcdir)/resource.rc
        $(CXXC) -c -o $@ $(RESOURCE_CXXFLAGS) $<
 
 resource_resource_rc.o: $(srcdir)/resource.rc

-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../include
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../../samples --include-dir $(srcdir)/../../../include

 
 uninstall: 
 
 
 uninstall: 
 

diff --git a/contrib/samples/deprecated/resource/makefile.bcc b/contrib/samples/deprecated/resource/makefile.bcc
index 7f0ce938c18de66defe5f31fff7f96de60a4ce02..edb36d82b003c88fa3f47c5f3c36a067b41237a4 100644 (file)
--- a/contrib/samples/deprecated/resource/makefile.bcc
+++ b/contrib/samples/deprecated/resource/makefile.bcc
@@ -29,8 +29,8 @@ RESOURCE_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include \
        -I$(LIBDIRNAME) -I.\..\..\..\..\src\tiff -I.\..\..\..\..\src\jpeg \
        -I.\..\..\..\..\src\png -I.\..\..\..\..\src\zlib -I.\..\..\..\..\src\regex \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include \
        -I$(LIBDIRNAME) -I.\..\..\..\..\src\tiff -I.\..\..\..\..\src\jpeg \
        -I.\..\..\..\..\src\png -I.\..\..\..\..\src\zlib -I.\..\..\..\..\src\regex \

-       -I.\..\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I.\..\..\..\include \
-       $(CXXFLAGS)
+       -I.\..\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I..\..\..\..\samples \
+       -I.\..\..\..\include $(CXXFLAGS)

 RESOURCE_OBJECTS =  \
        $(OBJS)\resource_resource.obj
 
 RESOURCE_OBJECTS =  \
        $(OBJS)\resource_resource.obj
 


@@ -120,6 +120,9 @@ __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -138,8 +141,6 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
 !endif
 
 __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
 !endif
 

-MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DWXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -153,7 +154,7 @@ $(OBJS)\resource_resource.obj: .\resource.cpp
        $(CXX) -q -c -P -o$@ $(RESOURCE_CXXFLAGS) $**
 
 $(OBJS)\resource_resource.res: .\resource.rc
        $(CXX) -q -c -P -o$@ $(RESOURCE_CXXFLAGS) $**
 
 $(OBJS)\resource_resource.res: .\resource.rc

-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\..\src\tiff -i.\..\..\..\..\src\jpeg -i.\..\..\..\..\src\png -i.\..\..\..\..\src\zlib  -i.\..\..\..\..\src\regex -i.\..\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) -i.\..\..\..\include $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\..\src\tiff -i.\..\..\..\..\src\jpeg -i.\..\..\..\..\src\png -i.\..\..\..\..\src\zlib  -i.\..\..\..\..\src\regex -i.\..\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) -i..\..\..\..\samples -i.\..\..\..\include $**

 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -162,5 +163,5 @@ clean:
 
 $(OBJS)\resource.exe: $(RESOURCE_OBJECTS)  $(OBJS)\resource_resource.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|
 
 $(OBJS)\resource.exe: $(RESOURCE_OBJECTS)  $(OBJS)\resource_resource.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|

-       c0w32.obj $(RESOURCE_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\resource_resource.res
+       c0w32.obj $(RESOURCE_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\resource_resource.res

 |
 |

diff --git a/contrib/samples/deprecated/resource/makefile.gcc b/contrib/samples/deprecated/resource/makefile.gcc
index fe488b9dd28f54fb7d91585981f12999cabb2e28..95d906a8caf03ea44890636f8a966eb242f91845 100644 (file)
--- a/contrib/samples/deprecated/resource/makefile.gcc
+++ b/contrib/samples/deprecated/resource/makefile.gcc
@@ -21,8 +21,8 @@ RESOURCE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\..\src\tiff -I.\..\..\..\..\src\jpeg -I.\..\..\..\..\src\png \
        -I.\..\..\..\..\src\zlib -I.\..\..\..\..\src\regex \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\..\src\tiff -I.\..\..\..\..\src\jpeg -I.\..\..\..\..\src\png \
        -I.\..\..\..\..\src\zlib -I.\..\..\..\..\src\regex \

-       -I.\..\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I.\..\..\..\include \
-       $(CXXFLAGS)
+       -I.\..\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I..\..\..\..\samples \
+       -I.\..\..\..\include $(CXXFLAGS)

 RESOURCE_OBJECTS =  \
        $(OBJS)\resource_resource.o \
        $(OBJS)\resource_resource_rc.o
 RESOURCE_OBJECTS =  \
        $(OBJS)\resource_resource.o \
        $(OBJS)\resource_resource_rc.o


@@ -114,6 +114,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
 endif

+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif

 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif


@@ -132,8 +135,6 @@ ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
 endif
 
 __WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
 endif
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -147,13 +148,13 @@ $(OBJS)\resource_resource.o: .\resource.cpp
        $(CXX) -c -o $@ $(RESOURCE_CXXFLAGS) $<
 
 $(OBJS)\resource_resource_rc.o: .\resource.rc
        $(CXX) -c -o $@ $(RESOURCE_CXXFLAGS) $<
 
 $(OBJS)\resource_resource_rc.o: .\resource.rc

-       windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../../include --include-dir $(LIBDIRNAME) --include-dir ./../../../../src/tiff --include-dir ./../../../../src/jpeg --include-dir ./../../../../src/png --include-dir ./../../../../src/zlib  --include-dir ./../../../../src/regex --include-dir ./../../../../src/expat/lib --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../include
+       windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../../include --include-dir $(LIBDIRNAME) --include-dir ./../../../../src/tiff --include-dir ./../../../../src/jpeg --include-dir ./../../../../src/png --include-dir ./../../../../src/zlib  --include-dir ./../../../../src/regex --include-dir ./../../../../src/expat/lib --include-dir . $(__DLLFLAG_p_1) --include-dir ../../../../samples --include-dir ./../../../include

 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        -if exist $(OBJS)\resource.exe del $(OBJS)\resource.exe
 
 $(OBJS)\resource.exe: $(RESOURCE_OBJECTS) $(OBJS)\resource_resource_rc.o
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        -if exist $(OBJS)\resource.exe del $(OBJS)\resource.exe
 
 $(OBJS)\resource.exe: $(RESOURCE_OBJECTS) $(OBJS)\resource_resource_rc.o

-       $(CXX) -o $@ $(RESOURCE_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -o $@ $(RESOURCE_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32

 
 .PHONY: all clean
 
 .PHONY: all clean

diff --git a/contrib/samples/deprecated/resource/makefile.vc b/contrib/samples/deprecated/resource/makefile.vc
index 36f500cfc8c58afdab0205c521f323b5a45b7444..86f7be3530ff5c9f5234b43b3d0ba27fa199bbf7 100644 (file)
--- a/contrib/samples/deprecated/resource/makefile.vc
+++ b/contrib/samples/deprecated/resource/makefile.vc
@@ -23,7 +23,7 @@ RESOURCE_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \
        /I.\..\..\..\..\src\tiff /I.\..\..\..\..\src\jpeg /I.\..\..\..\..\src\png \
        /I.\..\..\..\..\src\zlib /I.\..\..\..\..\src\regex \
        /I.\..\..\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_WINDOWS \
        /I.\..\..\..\..\src\tiff /I.\..\..\..\..\src\jpeg /I.\..\..\..\..\src\png \
        /I.\..\..\..\..\src\zlib /I.\..\..\..\..\src\regex \
        /I.\..\..\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_WINDOWS \

-       /I.\..\..\..\include $(CXXFLAGS)
+       /I..\..\..\..\samples /I.\..\..\..\include $(CXXFLAGS)

 RESOURCE_OBJECTS =  \
        $(OBJS)\resource_resource.obj \
        $(OBJS)\resource_resource.res
 RESOURCE_OBJECTS =  \
        $(OBJS)\resource_resource.obj \
        $(OBJS)\resource_resource.res


@@ -141,6 +141,9 @@ __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -214,7 +217,7 @@ $(OBJS)\resource_resource.obj: .\resource.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(RESOURCE_CXXFLAGS) $**
 
 $(OBJS)\resource_resource.res: .\resource.rc
        $(CXX) /c /nologo /TP /Fo$@ $(RESOURCE_CXXFLAGS) $**
 
 $(OBJS)\resource_resource.res: .\resource.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\..\src\tiff /i .\..\..\..\..\src\jpeg /i .\..\..\..\..\src\png /i .\..\..\..\..\src\zlib  /i .\..\..\..\..\src\regex /i .\..\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\include $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\..\src\tiff /i .\..\..\..\..\src\jpeg /i .\..\..\..\..\src\png /i .\..\..\..\..\src\zlib  /i .\..\..\..\..\src\regex /i .\..\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS /i ..\..\..\..\samples /i .\..\..\..\include $**

 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -223,5 +226,5 @@ clean:
 
 $(OBJS)\resource.exe: $(RESOURCE_OBJECTS) $(OBJS)\resource_resource.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<
 
 $(OBJS)\resource.exe: $(RESOURCE_OBJECTS) $(OBJS)\resource_resource.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<

-       $(RESOURCE_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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
+       $(RESOURCE_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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

 <<
 <<

diff --git a/contrib/samples/deprecated/resource/makefile.wat b/contrib/samples/deprecated/resource/makefile.wat
index b9bcf0f160a70cd1abedf359c2775e3ddacc154c..4c117de331a476e2228da63f340a78e5f2a8926d 100644 (file)
--- a/contrib/samples/deprecated/resource/makefile.wat
+++ b/contrib/samples/deprecated/resource/makefile.wat
@@ -163,12 +163,10 @@ RESOURCE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
        -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg &
        -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib &
        -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. &
        -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg &
        -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib &
        -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. &

-       $(__DLLFLAG_p) -i=.\..\..\..\include $(CXXFLAGS)
+       $(__DLLFLAG_p) -i=..\..\..\..\samples -i=.\..\..\..\include $(CXXFLAGS)

 RESOURCE_OBJECTS =  &
        $(OBJS)\resource_resource.obj
 
 RESOURCE_OBJECTS =  &
        $(OBJS)\resource_resource.obj
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -182,7 +180,7 @@ $(OBJS)\resource_resource.obj :  .AUTODEPEND .\resource.cpp
        $(CXX) -zq -fo=$^@ $(RESOURCE_CXXFLAGS) $<
 
 $(OBJS)\resource_resource.res :  .AUTODEPEND .\resource.rc
        $(CXX) -zq -fo=$^@ $(RESOURCE_CXXFLAGS) $<
 
 $(OBJS)\resource_resource.res :  .AUTODEPEND .\resource.rc

-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib  -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=.\..\..\..\include $<
+       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib  -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=..\..\..\..\samples -i=.\..\..\..\include $<

 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -198,6 +196,6 @@ $(OBJS)\resource.exe :  $(RESOURCE_OBJECTS) $(OBJS)\resource_resource.res
        @%append $(OBJS)\resource.lbc option incremental
        @%append $(OBJS)\resource.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(RESOURCE_OBJECTS)) do @%append $(OBJS)\resource.lbc file %i
        @%append $(OBJS)\resource.lbc option incremental
        @%append $(OBJS)\resource.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(RESOURCE_OBJECTS)) do @%append $(OBJS)\resource.lbc file %i

-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\resource.lbc library %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\resource.lbc library %i

        @%append $(OBJS)\resource.lbc option resource=$(OBJS)\resource_resource.res
        wlink @$(OBJS)\resource.lbc
        @%append $(OBJS)\resource.lbc option resource=$(OBJS)\resource_resource.res
        wlink @$(OBJS)\resource.lbc

diff --git a/contrib/samples/deprecated/resource/resource.dsp b/contrib/samples/deprecated/resource/resource.dsp
index 3298bac49e3c753ec8cf1ba8d7ea8f0a51340763..a17e3695846d355063b3134edab1cfebab7eaa95 100644 (file)
--- a/contrib/samples/deprecated/resource/resource.dsp
+++ b/contrib/samples/deprecated/resource/resource.dsp
@@ -55,12 +55,12 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\resource"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\resource"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -80,12 +80,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_msw"
 # PROP Intermediate_Dir "vc_msw\resource"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_msw"
 # PROP Intermediate_Dir "vc_msw\resource"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_msw\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_msw\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_msw\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_msw\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -105,12 +105,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\resource"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\resource"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -130,12 +130,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\resource"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\resource"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswu\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswu\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswu\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswu\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -155,12 +155,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\resource"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\resource"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -180,12 +180,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\resource"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\resource"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -205,12 +205,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\resource"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\resource"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -230,12 +230,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\resource"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\resource"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -255,12 +255,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\resource"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\resource"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -280,12 +280,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\resource"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\resource"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswdll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswdll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswdll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswdll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -305,12 +305,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\resource"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\resource"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -330,12 +330,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\resource"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\resource"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswudll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswudll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswudll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswudll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -355,12 +355,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\resource"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\resource"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -380,12 +380,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\resource"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\resource"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -405,12 +405,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\resource"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\resource"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\resource.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -430,12 +430,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\resource"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\resource"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\resource.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo

diff --git a/contrib/samples/deprecated/treelay/Makefile.in b/contrib/samples/deprecated/treelay/Makefile.in
index d960df6571c7b9d612a2c2dd9b3e52e90ea23cd9..9ca6992a116d09b316cc3026312fe2661b1db283 100644 (file)
--- a/contrib/samples/deprecated/treelay/Makefile.in
+++ b/contrib/samples/deprecated/treelay/Makefile.in
@@ -36,7 +36,8 @@ LIBDIRNAME = $(top_builddir)lib
 TREELAY_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) \
 TREELAY_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) $(__DLLFLAG_p) -I$(srcdir)/../../../include $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -I../../../../samples \
+       -I$(srcdir)/../../../include $(CXXFLAGS)

 TREELAY_OBJECTS =  \
        treelay_treelay.o \
        $(__treelay___win32rc)
 TREELAY_OBJECTS =  \
        treelay_treelay.o \
        $(__treelay___win32rc)


@@ -104,8 +105,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \

-       $(__DLLFLAG_p_1) -i $(srcdir)/../../../include -o treelay$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../../samples/sample.r
+       $(__DLLFLAG_p_1) -i ../../../../samples -i $(srcdir)/../../../include -o \
+       treelay$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
+       ../../../../samples/sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)


@@ -149,7 +151,7 @@ treelay_treelay.o: $(srcdir)/treelay.cpp
        $(CXXC) -c -o $@ $(TREELAY_CXXFLAGS) $<
 
 treelay_treelay_rc.o: $(srcdir)/treelay.rc
        $(CXXC) -c -o $@ $(TREELAY_CXXFLAGS) $<
 
 treelay_treelay_rc.o: $(srcdir)/treelay.rc

-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../include
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../../samples --include-dir $(srcdir)/../../../include

 
 uninstall: 
 
 
 uninstall: 
 

diff --git a/contrib/samples/deprecated/treelay/makefile.bcc b/contrib/samples/deprecated/treelay/makefile.bcc
index 0787b6a20313d936f6d3dfc7563f892fe2ed840a..b90c6fb51f2370b6d01c304fbe98c4d1b86f35ec 100644 (file)
--- a/contrib/samples/deprecated/treelay/makefile.bcc
+++ b/contrib/samples/deprecated/treelay/makefile.bcc
@@ -29,8 +29,8 @@ TREELAY_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include \
        -I$(LIBDIRNAME) -I.\..\..\..\..\src\tiff -I.\..\..\..\..\src\jpeg \
        -I.\..\..\..\..\src\png -I.\..\..\..\..\src\zlib -I.\..\..\..\..\src\regex \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include \
        -I$(LIBDIRNAME) -I.\..\..\..\..\src\tiff -I.\..\..\..\..\src\jpeg \
        -I.\..\..\..\..\src\png -I.\..\..\..\..\src\zlib -I.\..\..\..\..\src\regex \

-       -I.\..\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I.\..\..\..\include \
-       $(CXXFLAGS)
+       -I.\..\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I..\..\..\..\samples \
+       -I.\..\..\..\include $(CXXFLAGS)

 TREELAY_OBJECTS =  \
        $(OBJS)\treelay_treelay.obj
 
 TREELAY_OBJECTS =  \
        $(OBJS)\treelay_treelay.obj
 


@@ -120,6 +120,9 @@ __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -138,8 +141,6 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
 !endif
 
 __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
 !endif
 

-MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DWXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -153,7 +154,7 @@ $(OBJS)\treelay_treelay.obj: .\treelay.cpp
        $(CXX) -q -c -P -o$@ $(TREELAY_CXXFLAGS) $**
 
 $(OBJS)\treelay_treelay.res: .\treelay.rc
        $(CXX) -q -c -P -o$@ $(TREELAY_CXXFLAGS) $**
 
 $(OBJS)\treelay_treelay.res: .\treelay.rc

-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\..\src\tiff -i.\..\..\..\..\src\jpeg -i.\..\..\..\..\src\png -i.\..\..\..\..\src\zlib  -i.\..\..\..\..\src\regex -i.\..\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) -i.\..\..\..\include $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\..\src\tiff -i.\..\..\..\..\src\jpeg -i.\..\..\..\..\src\png -i.\..\..\..\..\src\zlib  -i.\..\..\..\..\src\regex -i.\..\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) -i..\..\..\..\samples -i.\..\..\..\include $**

 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -162,5 +163,5 @@ clean:
 
 $(OBJS)\treelay.exe: $(TREELAY_OBJECTS)  $(OBJS)\treelay_treelay.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|
 
 $(OBJS)\treelay.exe: $(TREELAY_OBJECTS)  $(OBJS)\treelay_treelay.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|

-       c0w32.obj $(TREELAY_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\treelay_treelay.res
+       c0w32.obj $(TREELAY_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\treelay_treelay.res

 |
 |

diff --git a/contrib/samples/deprecated/treelay/makefile.gcc b/contrib/samples/deprecated/treelay/makefile.gcc
index e2a2098b150c0ebf072b86b2615d4827b62fed64..fc461011a6d4c4f1b70663bf20cfbe4a9fa10f7a 100644 (file)
--- a/contrib/samples/deprecated/treelay/makefile.gcc
+++ b/contrib/samples/deprecated/treelay/makefile.gcc
@@ -21,8 +21,8 @@ TREELAY_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\..\src\tiff -I.\..\..\..\..\src\jpeg -I.\..\..\..\..\src\png \
        -I.\..\..\..\..\src\zlib -I.\..\..\..\..\src\regex \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\..\src\tiff -I.\..\..\..\..\src\jpeg -I.\..\..\..\..\src\png \
        -I.\..\..\..\..\src\zlib -I.\..\..\..\..\src\regex \

-       -I.\..\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I.\..\..\..\include \
-       $(CXXFLAGS)
+       -I.\..\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I..\..\..\..\samples \
+       -I.\..\..\..\include $(CXXFLAGS)

 TREELAY_OBJECTS =  \
        $(OBJS)\treelay_treelay.o \
        $(OBJS)\treelay_treelay_rc.o
 TREELAY_OBJECTS =  \
        $(OBJS)\treelay_treelay.o \
        $(OBJS)\treelay_treelay_rc.o


@@ -114,6 +114,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
 endif

+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif

 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif


@@ -132,8 +135,6 @@ ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
 endif
 
 __WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
 endif
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -147,13 +148,13 @@ $(OBJS)\treelay_treelay.o: .\treelay.cpp
        $(CXX) -c -o $@ $(TREELAY_CXXFLAGS) $<
 
 $(OBJS)\treelay_treelay_rc.o: .\treelay.rc
        $(CXX) -c -o $@ $(TREELAY_CXXFLAGS) $<
 
 $(OBJS)\treelay_treelay_rc.o: .\treelay.rc

-       windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../../include --include-dir $(LIBDIRNAME) --include-dir ./../../../../src/tiff --include-dir ./../../../../src/jpeg --include-dir ./../../../../src/png --include-dir ./../../../../src/zlib  --include-dir ./../../../../src/regex --include-dir ./../../../../src/expat/lib --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../include
+       windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../../include --include-dir $(LIBDIRNAME) --include-dir ./../../../../src/tiff --include-dir ./../../../../src/jpeg --include-dir ./../../../../src/png --include-dir ./../../../../src/zlib  --include-dir ./../../../../src/regex --include-dir ./../../../../src/expat/lib --include-dir . $(__DLLFLAG_p_1) --include-dir ../../../../samples --include-dir ./../../../include

 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        -if exist $(OBJS)\treelay.exe del $(OBJS)\treelay.exe
 
 $(OBJS)\treelay.exe: $(TREELAY_OBJECTS) $(OBJS)\treelay_treelay_rc.o
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        -if exist $(OBJS)\treelay.exe del $(OBJS)\treelay.exe
 
 $(OBJS)\treelay.exe: $(TREELAY_OBJECTS) $(OBJS)\treelay_treelay_rc.o

-       $(CXX) -o $@ $(TREELAY_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -o $@ $(TREELAY_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32

 
 .PHONY: all clean
 
 .PHONY: all clean

diff --git a/contrib/samples/deprecated/treelay/makefile.vc b/contrib/samples/deprecated/treelay/makefile.vc
index 81d897e0342e70ebe1e9d59c2f159483eb76bba7..8f8cd3f5a79d903b232f346df03382086c8373b3 100644 (file)
--- a/contrib/samples/deprecated/treelay/makefile.vc
+++ b/contrib/samples/deprecated/treelay/makefile.vc
@@ -23,7 +23,7 @@ TREELAY_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \
        /I.\..\..\..\..\src\tiff /I.\..\..\..\..\src\jpeg /I.\..\..\..\..\src\png \
        /I.\..\..\..\..\src\zlib /I.\..\..\..\..\src\regex \
        /I.\..\..\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_WINDOWS \
        /I.\..\..\..\..\src\tiff /I.\..\..\..\..\src\jpeg /I.\..\..\..\..\src\png \
        /I.\..\..\..\..\src\zlib /I.\..\..\..\..\src\regex \
        /I.\..\..\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_WINDOWS \

-       /I.\..\..\..\include $(CXXFLAGS)
+       /I..\..\..\..\samples /I.\..\..\..\include $(CXXFLAGS)

 TREELAY_OBJECTS =  \
        $(OBJS)\treelay_treelay.obj \
        $(OBJS)\treelay_treelay.res
 TREELAY_OBJECTS =  \
        $(OBJS)\treelay_treelay.obj \
        $(OBJS)\treelay_treelay.res


@@ -141,6 +141,9 @@ __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -214,7 +217,7 @@ $(OBJS)\treelay_treelay.obj: .\treelay.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TREELAY_CXXFLAGS) $**
 
 $(OBJS)\treelay_treelay.res: .\treelay.rc
        $(CXX) /c /nologo /TP /Fo$@ $(TREELAY_CXXFLAGS) $**
 
 $(OBJS)\treelay_treelay.res: .\treelay.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\..\src\tiff /i .\..\..\..\..\src\jpeg /i .\..\..\..\..\src\png /i .\..\..\..\..\src\zlib  /i .\..\..\..\..\src\regex /i .\..\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\include $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\..\src\tiff /i .\..\..\..\..\src\jpeg /i .\..\..\..\..\src\png /i .\..\..\..\..\src\zlib  /i .\..\..\..\..\src\regex /i .\..\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS /i ..\..\..\..\samples /i .\..\..\..\include $**

 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -223,5 +226,5 @@ clean:
 
 $(OBJS)\treelay.exe: $(TREELAY_OBJECTS) $(OBJS)\treelay_treelay.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<
 
 $(OBJS)\treelay.exe: $(TREELAY_OBJECTS) $(OBJS)\treelay_treelay.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<

-       $(TREELAY_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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
+       $(TREELAY_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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

 <<
 <<

diff --git a/contrib/samples/deprecated/treelay/makefile.wat b/contrib/samples/deprecated/treelay/makefile.wat
index 3230b835bbe38e806afbb3128bf7655bd3fec419..8f8749cf4ca1541c759aaa99baa831dd75b3561a 100644 (file)
--- a/contrib/samples/deprecated/treelay/makefile.wat
+++ b/contrib/samples/deprecated/treelay/makefile.wat
@@ -163,12 +163,10 @@ TREELAY_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
        -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg &
        -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib &
        -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. &
        -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg &
        -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib &
        -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. &

-       $(__DLLFLAG_p) -i=.\..\..\..\include $(CXXFLAGS)
+       $(__DLLFLAG_p) -i=..\..\..\..\samples -i=.\..\..\..\include $(CXXFLAGS)

 TREELAY_OBJECTS =  &
        $(OBJS)\treelay_treelay.obj
 
 TREELAY_OBJECTS =  &
        $(OBJS)\treelay_treelay.obj
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -182,7 +180,7 @@ $(OBJS)\treelay_treelay.obj :  .AUTODEPEND .\treelay.cpp
        $(CXX) -zq -fo=$^@ $(TREELAY_CXXFLAGS) $<
 
 $(OBJS)\treelay_treelay.res :  .AUTODEPEND .\treelay.rc
        $(CXX) -zq -fo=$^@ $(TREELAY_CXXFLAGS) $<
 
 $(OBJS)\treelay_treelay.res :  .AUTODEPEND .\treelay.rc

-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib  -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=.\..\..\..\include $<
+       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib  -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=..\..\..\..\samples -i=.\..\..\..\include $<

 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -198,6 +196,6 @@ $(OBJS)\treelay.exe :  $(TREELAY_OBJECTS) $(OBJS)\treelay_treelay.res
        @%append $(OBJS)\treelay.lbc option incremental
        @%append $(OBJS)\treelay.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(TREELAY_OBJECTS)) do @%append $(OBJS)\treelay.lbc file %i
        @%append $(OBJS)\treelay.lbc option incremental
        @%append $(OBJS)\treelay.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(TREELAY_OBJECTS)) do @%append $(OBJS)\treelay.lbc file %i

-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\treelay.lbc library %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\treelay.lbc library %i

        @%append $(OBJS)\treelay.lbc option resource=$(OBJS)\treelay_treelay.res
        wlink @$(OBJS)\treelay.lbc
        @%append $(OBJS)\treelay.lbc option resource=$(OBJS)\treelay_treelay.res
        wlink @$(OBJS)\treelay.lbc

diff --git a/contrib/samples/deprecated/treelay/treelay.dsp b/contrib/samples/deprecated/treelay/treelay.dsp
index 297b4b1eb07c76e7ac0184a620ddf82b5425259c..d76228e552aaab65aa946da36cead13f314c7714 100644 (file)
--- a/contrib/samples/deprecated/treelay/treelay.dsp
+++ b/contrib/samples/deprecated/treelay/treelay.dsp
@@ -55,12 +55,12 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\treelay"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\treelay"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -80,12 +80,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_msw"
 # PROP Intermediate_Dir "vc_msw\treelay"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_msw"
 # PROP Intermediate_Dir "vc_msw\treelay"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_msw\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_msw\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_msw\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_msw\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -105,12 +105,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\treelay"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\treelay"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -130,12 +130,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\treelay"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\treelay"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswu\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswu\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswu\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswu\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -155,12 +155,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\treelay"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\treelay"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -180,12 +180,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\treelay"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\treelay"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -205,12 +205,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\treelay"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\treelay"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -230,12 +230,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\treelay"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\treelay"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -255,12 +255,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\treelay"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\treelay"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -280,12 +280,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\treelay"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\treelay"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswdll\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswdll\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswdll\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswdll\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -305,12 +305,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\treelay"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\treelay"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -330,12 +330,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\treelay"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\treelay"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswudll\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswudll\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswudll\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswudll\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -355,12 +355,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\treelay"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\treelay"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -380,12 +380,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\treelay"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\treelay"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -405,12 +405,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\treelay"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\treelay"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\treelay.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -430,12 +430,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\treelay"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\treelay"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\treelay.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo

diff --git a/contrib/samples/fl/Makefile.in b/contrib/samples/fl/Makefile.in
index 93fae255b69862694e363eab3de7f6c9593b672c..7d5c6833eb9d0db38f33166a1f71693843003b90 100644 (file)
--- a/contrib/samples/fl/Makefile.in
+++ b/contrib/samples/fl/Makefile.in
@@ -35,40 +35,40 @@ top_srcdir = @top_srcdir@
 FL_DEMO1_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) \
 FL_DEMO1_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) $(__DLLFLAG_p) -I$(srcdir)/../../include -DBMP_DIR=\"bitmaps/\" \
-       $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -I../../../samples -I$(srcdir)/../../include \
+       -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)

 FL_DEMO1_OBJECTS =  \
        fl_demo1_fl_demo1.o \
        $(__fl_demo1___win32rc)
 FL_DEMO2_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) \
 FL_DEMO1_OBJECTS =  \
        fl_demo1_fl_demo1.o \
        $(__fl_demo1___win32rc)
 FL_DEMO2_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) $(__DLLFLAG_p) -I$(srcdir)/../../include -DBMP_DIR=\"bitmaps/\" \
-       $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -I../../../samples -I$(srcdir)/../../include \
+       -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)

 FL_DEMO2_OBJECTS =  \
        fl_demo2_fl_demo2.o \
        $(__fl_demo2___win32rc)
 FL_SAMPLE1_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) \
 FL_DEMO2_OBJECTS =  \
        fl_demo2_fl_demo2.o \
        $(__fl_demo2___win32rc)
 FL_SAMPLE1_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) $(__DLLFLAG_p) -I$(srcdir)/../../include -DBMP_DIR=\"bitmaps/\" \
-       $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -I../../../samples -I$(srcdir)/../../include \
+       -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)

 FL_SAMPLE1_OBJECTS =  \
        fl_sample1_fl_sample1.o \
        $(__fl_sample1___win32rc)
 FL_SAMPLE2_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) \
 FL_SAMPLE1_OBJECTS =  \
        fl_sample1_fl_sample1.o \
        $(__fl_sample1___win32rc)
 FL_SAMPLE2_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) $(__DLLFLAG_p) -I$(srcdir)/../../include -DBMP_DIR=\"bitmaps/\" \
-       $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -I../../../samples -I$(srcdir)/../../include \
+       -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)

 FL_SAMPLE2_OBJECTS =  \
        fl_sample2_fl_sample2.o \
        $(__fl_sample2___win32rc)
 FL_SAMPLE3_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) \
 FL_SAMPLE2_OBJECTS =  \
        fl_sample2_fl_sample2.o \
        $(__fl_sample2___win32rc)
 FL_SAMPLE3_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) $(__DLLFLAG_p) -I$(srcdir)/../../include -DBMP_DIR=\"bitmaps/\" \
-       $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -I../../../samples -I$(srcdir)/../../include \
+       -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)

 FL_SAMPLE3_OBJECTS =  \
        fl_sample3_fl_sample3.o \
        $(__fl_sample3___win32rc)
 FL_SAMPLE3_OBJECTS =  \
        fl_sample3_fl_sample3.o \
        $(__fl_sample3___win32rc)


@@ -137,41 +137,41 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_5 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_18) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1_2) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1_1) $(__INC_EXPAT_p_20) -i $(srcdir) \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_18) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1_2) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1_1) $(__INC_EXPAT_p_20) -i $(srcdir) \

-       $(__DLLFLAG_p_1) -i $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o \
-       fl_demo2$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
-       ../../../samples/sample.r
+       $(__DLLFLAG_p_1) -i ../../../samples -i $(srcdir)/../../include -d \
+       BMP_DIR="bitmaps/" -o fl_demo2$(EXEEXT) Carbon.r \
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_5 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_5)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_6 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_18) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1_2) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1_1) $(__INC_EXPAT_p_20) -i $(srcdir) \
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_5 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_5)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_6 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_18) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1_2) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1_1) $(__INC_EXPAT_p_20) -i $(srcdir) \

-       $(__DLLFLAG_p_1) -i $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o \
-       fl_sample3$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
-       ../../../samples/sample.r
+       $(__DLLFLAG_p_1) -i ../../../samples -i $(srcdir)/../../include -d \
+       BMP_DIR="bitmaps/" -o fl_sample3$(EXEEXT) Carbon.r \
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_6 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_6)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_7 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_18) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1_2) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1_1) $(__INC_EXPAT_p_20) -i $(srcdir) \
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_6 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_6)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_7 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_18) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1_2) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1_1) $(__INC_EXPAT_p_20) -i $(srcdir) \

-       $(__DLLFLAG_p_1) -i $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o \
-       fl_sample2$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
-       ../../../samples/sample.r
+       $(__DLLFLAG_p_1) -i ../../../samples -i $(srcdir)/../../include -d \
+       BMP_DIR="bitmaps/" -o fl_sample2$(EXEEXT) Carbon.r \
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_7 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_7)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_8 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_18) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1_2) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1_1) $(__INC_EXPAT_p_20) -i $(srcdir) \
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_7 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_7)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_8 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_18) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1_2) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1_1) $(__INC_EXPAT_p_20) -i $(srcdir) \

-       $(__DLLFLAG_p_1) -i $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o \
-       fl_sample1$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
-       ../../../samples/sample.r
+       $(__DLLFLAG_p_1) -i ../../../samples -i $(srcdir)/../../include -d \
+       BMP_DIR="bitmaps/" -o fl_sample1$(EXEEXT) Carbon.r \
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_8 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_8)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_9 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_18) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1_2) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1_1) $(__INC_EXPAT_p_20) -i $(srcdir) \
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_8 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_8)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_9 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_18) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1_2) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1_1) $(__INC_EXPAT_p_20) -i $(srcdir) \

-       $(__DLLFLAG_p_1) -i $(srcdir)/../../include -d BMP_DIR="bitmaps/" -o \
-       fl_demo1$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
-       ../../../samples/sample.r
+       $(__DLLFLAG_p_1) -i ../../../samples -i $(srcdir)/../../include -d \
+       BMP_DIR="bitmaps/" -o fl_demo1$(EXEEXT) Carbon.r \
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_9 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_9)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_9 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_9)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)


@@ -231,7 +231,7 @@ fl_demo1_fl_demo1.o: $(srcdir)/fl_demo1.cpp
        $(CXXC) -c -o $@ $(FL_DEMO1_CXXFLAGS) $<
 
 fl_demo1_fl_demo1_rc.o: $(srcdir)/fl_demo1.rc
        $(CXXC) -c -o $@ $(FL_DEMO1_CXXFLAGS) $<
 
 fl_demo1_fl_demo1_rc.o: $(srcdir)/fl_demo1.rc

-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_22)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_1_2) $(__INC_JPEG_p_1_1) $(__INC_PNG_p_18) $(__INC_ZLIB_p_1_3) $(__INC_ODBC_p_1_1) $(__INC_REGEX_p_1_3) $(__INC_EXPAT_p_19) --include-dir $(srcdir) $(__DLLFLAG_p_18) --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_22)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_1_2) $(__INC_JPEG_p_1_1) $(__INC_PNG_p_18) $(__INC_ZLIB_p_1_3) $(__INC_ODBC_p_1_1) $(__INC_REGEX_p_1_3) $(__INC_EXPAT_p_19) --include-dir $(srcdir) $(__DLLFLAG_p_18) --include-dir ../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"

 
 fl_demo2$(EXEEXT): $(FL_DEMO2_OBJECTS) $(__fl_demo2___win32rc)
        $(CXX) -o $@ $(FL_DEMO2_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
 
 fl_demo2$(EXEEXT): $(FL_DEMO2_OBJECTS) $(__fl_demo2___win32rc)
        $(CXX) -o $@ $(FL_DEMO2_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)


@@ -242,7 +242,7 @@ fl_demo2_fl_demo2.o: $(srcdir)/fl_demo2.cpp
        $(CXXC) -c -o $@ $(FL_DEMO2_CXXFLAGS) $<
 
 fl_demo2_fl_demo2_rc.o: $(srcdir)/fl_demo2.rc
        $(CXXC) -c -o $@ $(FL_DEMO2_CXXFLAGS) $<
 
 fl_demo2_fl_demo2_rc.o: $(srcdir)/fl_demo2.rc

-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_22)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_1_2) $(__INC_JPEG_p_1_1) $(__INC_PNG_p_18) $(__INC_ZLIB_p_1_3) $(__INC_ODBC_p_1_1) $(__INC_REGEX_p_1_3) $(__INC_EXPAT_p_19) --include-dir $(srcdir) $(__DLLFLAG_p_18) --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_22)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_1_2) $(__INC_JPEG_p_1_1) $(__INC_PNG_p_18) $(__INC_ZLIB_p_1_3) $(__INC_ODBC_p_1_1) $(__INC_REGEX_p_1_3) $(__INC_EXPAT_p_19) --include-dir $(srcdir) $(__DLLFLAG_p_18) --include-dir ../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"

 
 fl_sample1$(EXEEXT): $(FL_SAMPLE1_OBJECTS) $(__fl_sample1___win32rc)
        $(CXX) -o $@ $(FL_SAMPLE1_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
 
 fl_sample1$(EXEEXT): $(FL_SAMPLE1_OBJECTS) $(__fl_sample1___win32rc)
        $(CXX) -o $@ $(FL_SAMPLE1_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)


@@ -253,7 +253,7 @@ fl_sample1_fl_sample1.o: $(srcdir)/fl_sample1.cpp
        $(CXXC) -c -o $@ $(FL_SAMPLE1_CXXFLAGS) $<
 
 fl_sample1_fl_sample1_rc.o: $(srcdir)/fl_sample1.rc
        $(CXXC) -c -o $@ $(FL_SAMPLE1_CXXFLAGS) $<
 
 fl_sample1_fl_sample1_rc.o: $(srcdir)/fl_sample1.rc

-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_22)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_1_2) $(__INC_JPEG_p_1_1) $(__INC_PNG_p_18) $(__INC_ZLIB_p_1_3) $(__INC_ODBC_p_1_1) $(__INC_REGEX_p_1_3) $(__INC_EXPAT_p_19) --include-dir $(srcdir) $(__DLLFLAG_p_18) --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_22)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_1_2) $(__INC_JPEG_p_1_1) $(__INC_PNG_p_18) $(__INC_ZLIB_p_1_3) $(__INC_ODBC_p_1_1) $(__INC_REGEX_p_1_3) $(__INC_EXPAT_p_19) --include-dir $(srcdir) $(__DLLFLAG_p_18) --include-dir ../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"

 
 fl_sample2$(EXEEXT): $(FL_SAMPLE2_OBJECTS) $(__fl_sample2___win32rc)
        $(CXX) -o $@ $(FL_SAMPLE2_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
 
 fl_sample2$(EXEEXT): $(FL_SAMPLE2_OBJECTS) $(__fl_sample2___win32rc)
        $(CXX) -o $@ $(FL_SAMPLE2_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)


@@ -264,7 +264,7 @@ fl_sample2_fl_sample2.o: $(srcdir)/fl_sample2.cpp
        $(CXXC) -c -o $@ $(FL_SAMPLE2_CXXFLAGS) $<
 
 fl_sample2_fl_sample2_rc.o: $(srcdir)/fl_sample2.rc
        $(CXXC) -c -o $@ $(FL_SAMPLE2_CXXFLAGS) $<
 
 fl_sample2_fl_sample2_rc.o: $(srcdir)/fl_sample2.rc

-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_22)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_1_2) $(__INC_JPEG_p_1_1) $(__INC_PNG_p_18) $(__INC_ZLIB_p_1_3) $(__INC_ODBC_p_1_1) $(__INC_REGEX_p_1_3) $(__INC_EXPAT_p_19) --include-dir $(srcdir) $(__DLLFLAG_p_18) --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_22)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_1_2) $(__INC_JPEG_p_1_1) $(__INC_PNG_p_18) $(__INC_ZLIB_p_1_3) $(__INC_ODBC_p_1_1) $(__INC_REGEX_p_1_3) $(__INC_EXPAT_p_19) --include-dir $(srcdir) $(__DLLFLAG_p_18) --include-dir ../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"

 
 fl_sample3$(EXEEXT): $(FL_SAMPLE3_OBJECTS) $(__fl_sample3___win32rc)
        $(CXX) -o $@ $(FL_SAMPLE3_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
 
 fl_sample3$(EXEEXT): $(FL_SAMPLE3_OBJECTS) $(__fl_sample3___win32rc)
        $(CXX) -o $@ $(FL_SAMPLE3_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)


@@ -275,7 +275,7 @@ fl_sample3_fl_sample3.o: $(srcdir)/fl_sample3.cpp
        $(CXXC) -c -o $@ $(FL_SAMPLE3_CXXFLAGS) $<
 
 fl_sample3_fl_sample3_rc.o: $(srcdir)/fl_sample3.rc
        $(CXXC) -c -o $@ $(FL_SAMPLE3_CXXFLAGS) $<
 
 fl_sample3_fl_sample3_rc.o: $(srcdir)/fl_sample3.rc

-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_22)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_1_2) $(__INC_JPEG_p_1_1) $(__INC_PNG_p_18) $(__INC_ZLIB_p_1_3) $(__INC_ODBC_p_1_1) $(__INC_REGEX_p_1_3) $(__INC_EXPAT_p_19) --include-dir $(srcdir) $(__DLLFLAG_p_18) --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_22)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_1_2) $(__INC_JPEG_p_1_1) $(__INC_PNG_p_18) $(__INC_ZLIB_p_1_3) $(__INC_ODBC_p_1_1) $(__INC_REGEX_p_1_3) $(__INC_EXPAT_p_19) --include-dir $(srcdir) $(__DLLFLAG_p_18) --include-dir ../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/"

 
 install: all
 
 
 install: all
 

diff --git a/contrib/samples/fl/fl_fl_demo1.dsp b/contrib/samples/fl/fl_fl_demo1.dsp
index 11462ff06c7e7c47ba9ca7d04cc5bdc7e95833fc..f2197579ce052db9a2fd2a19a9e7636c252c2e4d 100644 (file)
--- a/contrib/samples/fl/fl_fl_demo1.dsp
+++ b/contrib/samples/fl/fl_fl_demo1.dsp
@@ -55,12 +55,12 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\fl_demo1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\fl_demo1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -80,12 +80,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_msw"
 # PROP Intermediate_Dir "vc_msw\fl_demo1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_msw"
 # PROP Intermediate_Dir "vc_msw\fl_demo1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_msw\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_msw" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_msw\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_msw" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_msw\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_msw" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_msw\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_msw" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_msw" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_msw" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_msw" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_msw" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -105,12 +105,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\fl_demo1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\fl_demo1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -130,12 +130,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\fl_demo1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\fl_demo1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswu\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswu\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswu\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswu\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -155,12 +155,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\fl_demo1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\fl_demo1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -180,12 +180,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\fl_demo1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\fl_demo1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -205,12 +205,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\fl_demo1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\fl_demo1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -230,12 +230,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\fl_demo1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\fl_demo1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -255,12 +255,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\fl_demo1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\fl_demo1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -280,12 +280,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\fl_demo1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\fl_demo1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswdll\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswdll\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswdll\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswdll\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -305,12 +305,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\fl_demo1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\fl_demo1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -330,12 +330,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\fl_demo1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\fl_demo1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswudll\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswudll\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswudll\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswudll\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -355,12 +355,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\fl_demo1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\fl_demo1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -380,12 +380,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\fl_demo1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\fl_demo1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -405,12 +405,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\fl_demo1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\fl_demo1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\fl_demo1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -430,12 +430,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\fl_demo1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\fl_demo1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\fl_demo1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo

diff --git a/contrib/samples/fl/fl_fl_demo2.dsp b/contrib/samples/fl/fl_fl_demo2.dsp
index e2505276f1707a3444f56905ca0001daf319ffdb..34fd71053e1e7a7bef5306d5d23e06ba89fa6f4f 100644 (file)
--- a/contrib/samples/fl/fl_fl_demo2.dsp
+++ b/contrib/samples/fl/fl_fl_demo2.dsp
@@ -55,12 +55,12 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\fl_demo2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\fl_demo2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -80,12 +80,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_msw"
 # PROP Intermediate_Dir "vc_msw\fl_demo2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_msw"
 # PROP Intermediate_Dir "vc_msw\fl_demo2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_msw\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_msw" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_msw\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_msw" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_msw\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_msw" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_msw\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_msw" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_msw" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_msw" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_msw" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_msw" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -105,12 +105,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\fl_demo2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\fl_demo2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -130,12 +130,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\fl_demo2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\fl_demo2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswu\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswu\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswu\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswu\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -155,12 +155,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\fl_demo2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\fl_demo2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -180,12 +180,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\fl_demo2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\fl_demo2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -205,12 +205,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\fl_demo2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\fl_demo2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -230,12 +230,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\fl_demo2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\fl_demo2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -255,12 +255,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\fl_demo2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\fl_demo2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -280,12 +280,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\fl_demo2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\fl_demo2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswdll\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswdll\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswdll\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswdll\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -305,12 +305,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\fl_demo2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\fl_demo2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -330,12 +330,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\fl_demo2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\fl_demo2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswudll\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswudll\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswudll\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswudll\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -355,12 +355,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\fl_demo2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\fl_demo2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -380,12 +380,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\fl_demo2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\fl_demo2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -405,12 +405,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\fl_demo2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\fl_demo2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\fl_demo2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -430,12 +430,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\fl_demo2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\fl_demo2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\fl_demo2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo

diff --git a/contrib/samples/fl/fl_fl_sample1.dsp b/contrib/samples/fl/fl_fl_sample1.dsp
index ae9969b0bf30a4b2baaa93dcfd78b23f8025738a..9767d8f7b925a92549e2ee7600a96451f685b382 100644 (file)
--- a/contrib/samples/fl/fl_fl_sample1.dsp
+++ b/contrib/samples/fl/fl_fl_sample1.dsp
@@ -55,12 +55,12 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\fl_sample1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\fl_sample1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -80,12 +80,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_msw"
 # PROP Intermediate_Dir "vc_msw\fl_sample1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_msw"
 # PROP Intermediate_Dir "vc_msw\fl_sample1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_msw\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_msw" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_msw\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_msw" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_msw\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_msw" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_msw\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_msw" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_msw" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_msw" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_msw" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_msw" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -105,12 +105,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\fl_sample1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\fl_sample1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -130,12 +130,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\fl_sample1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\fl_sample1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswu\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswu\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswu\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswu\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -155,12 +155,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\fl_sample1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\fl_sample1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -180,12 +180,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\fl_sample1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\fl_sample1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -205,12 +205,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\fl_sample1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\fl_sample1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -230,12 +230,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\fl_sample1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\fl_sample1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -255,12 +255,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\fl_sample1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\fl_sample1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -280,12 +280,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\fl_sample1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\fl_sample1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswdll\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswdll\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswdll\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswdll\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -305,12 +305,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\fl_sample1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\fl_sample1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -330,12 +330,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\fl_sample1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\fl_sample1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswudll\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswudll\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswudll\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswudll\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -355,12 +355,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\fl_sample1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\fl_sample1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -380,12 +380,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\fl_sample1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\fl_sample1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -405,12 +405,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\fl_sample1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\fl_sample1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\fl_sample1.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -430,12 +430,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\fl_sample1"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\fl_sample1"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\fl_sample1.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo

diff --git a/contrib/samples/fl/fl_fl_sample2.dsp b/contrib/samples/fl/fl_fl_sample2.dsp
index 8593d711de384d66a10db0985e2f266324510a96..af51ef063d3a6ad595d7f6299100f2219f43f346 100644 (file)
--- a/contrib/samples/fl/fl_fl_sample2.dsp
+++ b/contrib/samples/fl/fl_fl_sample2.dsp
@@ -55,12 +55,12 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\fl_sample2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\fl_sample2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -80,12 +80,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_msw"
 # PROP Intermediate_Dir "vc_msw\fl_sample2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_msw"
 # PROP Intermediate_Dir "vc_msw\fl_sample2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_msw\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_msw" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_msw\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_msw" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_msw\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_msw" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_msw\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_msw" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_msw" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_msw" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_msw" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_msw" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -105,12 +105,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\fl_sample2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\fl_sample2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -130,12 +130,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\fl_sample2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\fl_sample2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswu\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswu\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswu\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswu\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -155,12 +155,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\fl_sample2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\fl_sample2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -180,12 +180,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\fl_sample2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\fl_sample2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -205,12 +205,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\fl_sample2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\fl_sample2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -230,12 +230,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\fl_sample2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\fl_sample2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -255,12 +255,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\fl_sample2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\fl_sample2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -280,12 +280,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\fl_sample2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\fl_sample2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswdll\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswdll\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswdll\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswdll\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -305,12 +305,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\fl_sample2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\fl_sample2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -330,12 +330,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\fl_sample2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\fl_sample2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswudll\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswudll\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswudll\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswudll\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -355,12 +355,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\fl_sample2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\fl_sample2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -380,12 +380,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\fl_sample2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\fl_sample2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -405,12 +405,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\fl_sample2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\fl_sample2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\fl_sample2.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -430,12 +430,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\fl_sample2"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\fl_sample2"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\fl_sample2.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo

diff --git a/contrib/samples/fl/fl_fl_sample3.dsp b/contrib/samples/fl/fl_fl_sample3.dsp
index c317a306cd063b9ecd096d35882cdb1d75d28aeb..c6f7f7cbe5cd1f0cc71669d29c12482b7e546166 100644 (file)
--- a/contrib/samples/fl/fl_fl_sample3.dsp
+++ b/contrib/samples/fl/fl_fl_sample3.dsp
@@ -55,12 +55,12 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\fl_sample3"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\fl_sample3"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -80,12 +80,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_msw"
 # PROP Intermediate_Dir "vc_msw\fl_sample3"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_msw"
 # PROP Intermediate_Dir "vc_msw\fl_sample3"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_msw\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_msw" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_msw\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_msw" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_msw\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_msw" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_msw\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_msw" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_msw" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_msw" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_msw" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_msw" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -105,12 +105,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\fl_sample3"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\fl_sample3"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -130,12 +130,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\fl_sample3"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\fl_sample3"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswu\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswu\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswu\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswu\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -155,12 +155,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\fl_sample3"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\fl_sample3"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -180,12 +180,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\fl_sample3"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\fl_sample3"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -205,12 +205,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\fl_sample3"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\fl_sample3"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -230,12 +230,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\fl_sample3"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\fl_sample3"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -255,12 +255,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\fl_sample3"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\fl_sample3"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -280,12 +280,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\fl_sample3"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\fl_sample3"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswdll\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswdll\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswdll\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswdll\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -305,12 +305,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\fl_sample3"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\fl_sample3"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -330,12 +330,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\fl_sample3"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\fl_sample3"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswudll\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswudll\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswudll\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswudll\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -355,12 +355,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\fl_sample3"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\fl_sample3"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -380,12 +380,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\fl_sample3"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\fl_sample3"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -405,12 +405,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\fl_sample3"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\fl_sample3"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\fl_sample3.pdb /Od /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -430,12 +430,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\fl_sample3"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\fl_sample3"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\fl_sample3.pdb /O1 /I ".\..\..\..\include" /I ".\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\src\tiff" /I ".\..\..\..\src\jpeg" /I ".\..\..\..\src\png" /I ".\..\..\..\src\zlib" /I ".\..\..\..\src\regex" /I ".\..\..\..\src\expat\lib" /I "." /I "..\..\..\samples" /I ".\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /D BMP_DIR=\"bitmaps/\" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\include" /i ".\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\src\tiff" /i ".\..\..\..\src\jpeg" /i ".\..\..\..\src\png" /i ".\..\..\..\src\zlib" /i ".\..\..\..\src\regex" /i ".\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\samples" /i ".\..\..\include" /d BMP_DIR="bitmaps/"

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo

diff --git a/contrib/samples/fl/makefile.bcc b/contrib/samples/fl/makefile.bcc
index c9784c1cba64ba93c7230dadd03dde3dd8088285..1bc29d2162fb630bfe7c635ddf51f139899f1430 100644 (file)
--- a/contrib/samples/fl/makefile.bcc
+++ b/contrib/samples/fl/makefile.bcc
@@ -25,7 +25,8 @@ FL_DEMO1_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \

-       $(__DLLFLAG_p) -I.\..\..\include -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
+       $(__DLLFLAG_p) -I..\..\..\samples -I.\..\..\include -DBMP_DIR=\"bitmaps/\" \
+       $(CXXFLAGS)

 FL_DEMO1_OBJECTS =  \
        $(OBJS)\fl_demo1_fl_demo1.obj
 FL_DEMO2_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
 FL_DEMO1_OBJECTS =  \
        $(OBJS)\fl_demo1_fl_demo1.obj
 FL_DEMO2_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \


@@ -33,7 +34,8 @@ FL_DEMO2_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \

-       $(__DLLFLAG_p) -I.\..\..\include -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
+       $(__DLLFLAG_p) -I..\..\..\samples -I.\..\..\include -DBMP_DIR=\"bitmaps/\" \
+       $(CXXFLAGS)

 FL_DEMO2_OBJECTS =  \
        $(OBJS)\fl_demo2_fl_demo2.obj
 FL_SAMPLE1_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
 FL_DEMO2_OBJECTS =  \
        $(OBJS)\fl_demo2_fl_demo2.obj
 FL_SAMPLE1_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \


@@ -41,7 +43,8 @@ FL_SAMPLE1_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \

-       $(__DLLFLAG_p) -I.\..\..\include -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
+       $(__DLLFLAG_p) -I..\..\..\samples -I.\..\..\include -DBMP_DIR=\"bitmaps/\" \
+       $(CXXFLAGS)

 FL_SAMPLE1_OBJECTS =  \
        $(OBJS)\fl_sample1_fl_sample1.obj
 FL_SAMPLE2_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
 FL_SAMPLE1_OBJECTS =  \
        $(OBJS)\fl_sample1_fl_sample1.obj
 FL_SAMPLE2_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \


@@ -49,7 +52,8 @@ FL_SAMPLE2_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \

-       $(__DLLFLAG_p) -I.\..\..\include -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
+       $(__DLLFLAG_p) -I..\..\..\samples -I.\..\..\include -DBMP_DIR=\"bitmaps/\" \
+       $(CXXFLAGS)

 FL_SAMPLE2_OBJECTS =  \
        $(OBJS)\fl_sample2_fl_sample2.obj
 FL_SAMPLE3_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
 FL_SAMPLE2_OBJECTS =  \
        $(OBJS)\fl_sample2_fl_sample2.obj
 FL_SAMPLE3_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \


@@ -57,7 +61,8 @@ FL_SAMPLE3_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \

-       $(__DLLFLAG_p) -I.\..\..\include -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
+       $(__DLLFLAG_p) -I..\..\..\samples -I.\..\..\include -DBMP_DIR=\"bitmaps/\" \
+       $(CXXFLAGS)

 FL_SAMPLE3_OBJECTS =  \
        $(OBJS)\fl_sample3_fl_sample3.obj
 LIBDIRNAME = \
 FL_SAMPLE3_OBJECTS =  \
        $(OBJS)\fl_sample3_fl_sample3.obj
 LIBDIRNAME = \


@@ -151,6 +156,9 @@ __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_15 = -dwxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_15 = -dwxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -169,8 +177,6 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 __WXUNIV_DEFINE_p_11 = -d__WXUNIVERSAL__
 !endif
 
 __WXUNIV_DEFINE_p_11 = -d__WXUNIVERSAL__
 !endif
 

-MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DWXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -184,31 +190,31 @@ $(OBJS)\fl_demo1_fl_demo1.obj: .\fl_demo1.cpp
        $(CXX) -q -c -P -o$@ $(FL_DEMO1_CXXFLAGS) $**
 
 $(OBJS)\fl_demo1_fl_demo1.res: .\fl_demo1.rc
        $(CXX) -q -c -P -o$@ $(FL_DEMO1_CXXFLAGS) $**
 
 $(OBJS)\fl_demo1_fl_demo1.res: .\fl_demo1.rc

-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_11) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_15) -i.\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib  -i.\..\..\..\src\regex -i.\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_12) -i.\..\..\include -dBMP_DIR="bitmaps/" $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_11) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_15) -i.\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib  -i.\..\..\..\src\regex -i.\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_12) -i..\..\..\samples -i.\..\..\include -dBMP_DIR="bitmaps/" $**

 
 $(OBJS)\fl_demo2_fl_demo2.obj: .\fl_demo2.cpp
        $(CXX) -q -c -P -o$@ $(FL_DEMO2_CXXFLAGS) $**
 
 $(OBJS)\fl_demo2_fl_demo2.res: .\fl_demo2.rc
 
 $(OBJS)\fl_demo2_fl_demo2.obj: .\fl_demo2.cpp
        $(CXX) -q -c -P -o$@ $(FL_DEMO2_CXXFLAGS) $**
 
 $(OBJS)\fl_demo2_fl_demo2.res: .\fl_demo2.rc

-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_11) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_15) -i.\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib  -i.\..\..\..\src\regex -i.\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_12) -i.\..\..\include -dBMP_DIR="bitmaps/" $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_11) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_15) -i.\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib  -i.\..\..\..\src\regex -i.\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_12) -i..\..\..\samples -i.\..\..\include -dBMP_DIR="bitmaps/" $**

 
 $(OBJS)\fl_sample1_fl_sample1.obj: .\fl_sample1.cpp
        $(CXX) -q -c -P -o$@ $(FL_SAMPLE1_CXXFLAGS) $**
 
 $(OBJS)\fl_sample1_fl_sample1.res: .\fl_sample1.rc
 
 $(OBJS)\fl_sample1_fl_sample1.obj: .\fl_sample1.cpp
        $(CXX) -q -c -P -o$@ $(FL_SAMPLE1_CXXFLAGS) $**
 
 $(OBJS)\fl_sample1_fl_sample1.res: .\fl_sample1.rc

-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_11) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_15) -i.\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib  -i.\..\..\..\src\regex -i.\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_12) -i.\..\..\include -dBMP_DIR="bitmaps/" $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_11) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_15) -i.\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib  -i.\..\..\..\src\regex -i.\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_12) -i..\..\..\samples -i.\..\..\include -dBMP_DIR="bitmaps/" $**

 
 $(OBJS)\fl_sample2_fl_sample2.obj: .\fl_sample2.cpp
        $(CXX) -q -c -P -o$@ $(FL_SAMPLE2_CXXFLAGS) $**
 
 $(OBJS)\fl_sample2_fl_sample2.res: .\fl_sample2.rc
 
 $(OBJS)\fl_sample2_fl_sample2.obj: .\fl_sample2.cpp
        $(CXX) -q -c -P -o$@ $(FL_SAMPLE2_CXXFLAGS) $**
 
 $(OBJS)\fl_sample2_fl_sample2.res: .\fl_sample2.rc

-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_11) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_15) -i.\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib  -i.\..\..\..\src\regex -i.\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_12) -i.\..\..\include -dBMP_DIR="bitmaps/" $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_11) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_15) -i.\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib  -i.\..\..\..\src\regex -i.\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_12) -i..\..\..\samples -i.\..\..\include -dBMP_DIR="bitmaps/" $**

 
 $(OBJS)\fl_sample3_fl_sample3.obj: .\fl_sample3.cpp
        $(CXX) -q -c -P -o$@ $(FL_SAMPLE3_CXXFLAGS) $**
 
 $(OBJS)\fl_sample3_fl_sample3.res: .\fl_sample3.rc
 
 $(OBJS)\fl_sample3_fl_sample3.obj: .\fl_sample3.cpp
        $(CXX) -q -c -P -o$@ $(FL_SAMPLE3_CXXFLAGS) $**
 
 $(OBJS)\fl_sample3_fl_sample3.res: .\fl_sample3.rc

-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_11) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_15) -i.\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib  -i.\..\..\..\src\regex -i.\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_12) -i.\..\..\include -dBMP_DIR="bitmaps/" $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_11) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_15) -i.\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib  -i.\..\..\..\src\regex -i.\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_12) -i..\..\..\samples -i.\..\..\include -dBMP_DIR="bitmaps/" $**

 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -221,25 +227,25 @@ clean:
 
 $(OBJS)\fl_demo1.exe: $(FL_DEMO1_OBJECTS)  $(OBJS)\fl_demo1_fl_demo1.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|
 
 $(OBJS)\fl_demo1.exe: $(FL_DEMO1_OBJECTS)  $(OBJS)\fl_demo1_fl_demo1.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|

-       c0w32.obj $(FL_DEMO1_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_3).lib,, $(OBJS)\fl_demo1_fl_demo1.res
+       c0w32.obj $(FL_DEMO1_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_3).lib,, $(OBJS)\fl_demo1_fl_demo1.res

 |
 
 $(OBJS)\fl_demo2.exe: $(FL_DEMO2_OBJECTS)  $(OBJS)\fl_demo2_fl_demo2.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|
 |
 
 $(OBJS)\fl_demo2.exe: $(FL_DEMO2_OBJECTS)  $(OBJS)\fl_demo2_fl_demo2.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|

-       c0w32.obj $(FL_DEMO2_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_3).lib,, $(OBJS)\fl_demo2_fl_demo2.res
+       c0w32.obj $(FL_DEMO2_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_3).lib,, $(OBJS)\fl_demo2_fl_demo2.res

 |
 
 $(OBJS)\fl_sample1.exe: $(FL_SAMPLE1_OBJECTS)  $(OBJS)\fl_sample1_fl_sample1.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|
 |
 
 $(OBJS)\fl_sample1.exe: $(FL_SAMPLE1_OBJECTS)  $(OBJS)\fl_sample1_fl_sample1.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|

-       c0w32.obj $(FL_SAMPLE1_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_3).lib,, $(OBJS)\fl_sample1_fl_sample1.res
+       c0w32.obj $(FL_SAMPLE1_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_3).lib,, $(OBJS)\fl_sample1_fl_sample1.res

 |
 
 $(OBJS)\fl_sample2.exe: $(FL_SAMPLE2_OBJECTS)  $(OBJS)\fl_sample2_fl_sample2.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|
 |
 
 $(OBJS)\fl_sample2.exe: $(FL_SAMPLE2_OBJECTS)  $(OBJS)\fl_sample2_fl_sample2.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|

-       c0w32.obj $(FL_SAMPLE2_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_3).lib,, $(OBJS)\fl_sample2_fl_sample2.res
+       c0w32.obj $(FL_SAMPLE2_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_3).lib,, $(OBJS)\fl_sample2_fl_sample2.res

 |
 
 $(OBJS)\fl_sample3.exe: $(FL_SAMPLE3_OBJECTS)  $(OBJS)\fl_sample3_fl_sample3.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|
 |
 
 $(OBJS)\fl_sample3.exe: $(FL_SAMPLE3_OBJECTS)  $(OBJS)\fl_sample3_fl_sample3.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|

-       c0w32.obj $(FL_SAMPLE3_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_3).lib,, $(OBJS)\fl_sample3_fl_sample3.res
+       c0w32.obj $(FL_SAMPLE3_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_3).lib,, $(OBJS)\fl_sample3_fl_sample3.res

 |
 |

diff --git a/contrib/samples/fl/makefile.gcc b/contrib/samples/fl/makefile.gcc
index 7db12acf352627ac17c9cc8a7500e3f4c4139361..2d6bf43ccd60626338d30ea6bf62abd0a69205df 100644 (file)
--- a/contrib/samples/fl/makefile.gcc
+++ b/contrib/samples/fl/makefile.gcc
@@ -17,7 +17,8 @@ FL_DEMO1_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \

-       $(__DLLFLAG_p) -I.\..\..\include -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
+       $(__DLLFLAG_p) -I..\..\..\samples -I.\..\..\include -DBMP_DIR=\"bitmaps/\" \
+       $(CXXFLAGS)

 FL_DEMO1_OBJECTS =  \
        $(OBJS)\fl_demo1_fl_demo1.o \
        $(OBJS)\fl_demo1_fl_demo1_rc.o
 FL_DEMO1_OBJECTS =  \
        $(OBJS)\fl_demo1_fl_demo1.o \
        $(OBJS)\fl_demo1_fl_demo1_rc.o


@@ -26,7 +27,8 @@ FL_DEMO2_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \

-       $(__DLLFLAG_p) -I.\..\..\include -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
+       $(__DLLFLAG_p) -I..\..\..\samples -I.\..\..\include -DBMP_DIR=\"bitmaps/\" \
+       $(CXXFLAGS)

 FL_DEMO2_OBJECTS =  \
        $(OBJS)\fl_demo2_fl_demo2.o \
        $(OBJS)\fl_demo2_fl_demo2_rc.o
 FL_DEMO2_OBJECTS =  \
        $(OBJS)\fl_demo2_fl_demo2.o \
        $(OBJS)\fl_demo2_fl_demo2_rc.o


@@ -35,7 +37,8 @@ FL_SAMPLE1_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \

-       $(__DLLFLAG_p) -I.\..\..\include -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
+       $(__DLLFLAG_p) -I..\..\..\samples -I.\..\..\include -DBMP_DIR=\"bitmaps/\" \
+       $(CXXFLAGS)

 FL_SAMPLE1_OBJECTS =  \
        $(OBJS)\fl_sample1_fl_sample1.o \
        $(OBJS)\fl_sample1_fl_sample1_rc.o
 FL_SAMPLE1_OBJECTS =  \
        $(OBJS)\fl_sample1_fl_sample1.o \
        $(OBJS)\fl_sample1_fl_sample1_rc.o


@@ -44,7 +47,8 @@ FL_SAMPLE2_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \

-       $(__DLLFLAG_p) -I.\..\..\include -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
+       $(__DLLFLAG_p) -I..\..\..\samples -I.\..\..\include -DBMP_DIR=\"bitmaps/\" \
+       $(CXXFLAGS)

 FL_SAMPLE2_OBJECTS =  \
        $(OBJS)\fl_sample2_fl_sample2.o \
        $(OBJS)\fl_sample2_fl_sample2_rc.o
 FL_SAMPLE2_OBJECTS =  \
        $(OBJS)\fl_sample2_fl_sample2.o \
        $(OBJS)\fl_sample2_fl_sample2_rc.o


@@ -53,7 +57,8 @@ FL_SAMPLE3_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \

-       $(__DLLFLAG_p) -I.\..\..\include -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
+       $(__DLLFLAG_p) -I..\..\..\samples -I.\..\..\include -DBMP_DIR=\"bitmaps/\" \
+       $(CXXFLAGS)

 FL_SAMPLE3_OBJECTS =  \
        $(OBJS)\fl_sample3_fl_sample3.o \
        $(OBJS)\fl_sample3_fl_sample3_rc.o
 FL_SAMPLE3_OBJECTS =  \
        $(OBJS)\fl_sample3_fl_sample3.o \
        $(OBJS)\fl_sample3_fl_sample3_rc.o


@@ -149,6 +154,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_14 = --define wxUSE_UNICODE=1
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_14 = --define wxUSE_UNICODE=1
 endif

+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif

 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif


@@ -167,8 +175,6 @@ ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p_11 = --define __WXUNIVERSAL__
 endif
 
 __WXUNIV_DEFINE_p_11 = --define __WXUNIVERSAL__
 endif
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -182,31 +188,31 @@ $(OBJS)\fl_demo1_fl_demo1.o: .\fl_demo1.cpp
        $(CXX) -c -o $@ $(FL_DEMO1_CXXFLAGS) $<
 
 $(OBJS)\fl_demo1_fl_demo1_rc.o: .\fl_demo1.rc
        $(CXX) -c -o $@ $(FL_DEMO1_CXXFLAGS) $<
 
 $(OBJS)\fl_demo1_fl_demo1_rc.o: .\fl_demo1.rc

-       windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_11) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_14) --include-dir ./../../../include --include-dir $(LIBDIRNAME) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib  --include-dir ./../../../src/regex --include-dir ./../../../src/expat/lib --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../include --define BMP_DIR="bitmaps/"
+       windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_11) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_14) --include-dir ./../../../include --include-dir $(LIBDIRNAME) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib  --include-dir ./../../../src/regex --include-dir ./../../../src/expat/lib --include-dir . $(__DLLFLAG_p_12) --include-dir ../../../samples --include-dir ./../../include --define BMP_DIR="bitmaps/"

 
 $(OBJS)\fl_demo2_fl_demo2.o: .\fl_demo2.cpp
        $(CXX) -c -o $@ $(FL_DEMO2_CXXFLAGS) $<
 
 $(OBJS)\fl_demo2_fl_demo2_rc.o: .\fl_demo2.rc
 
 $(OBJS)\fl_demo2_fl_demo2.o: .\fl_demo2.cpp
        $(CXX) -c -o $@ $(FL_DEMO2_CXXFLAGS) $<
 
 $(OBJS)\fl_demo2_fl_demo2_rc.o: .\fl_demo2.rc

-       windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_11) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_14) --include-dir ./../../../include --include-dir $(LIBDIRNAME) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib  --include-dir ./../../../src/regex --include-dir ./../../../src/expat/lib --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../include --define BMP_DIR="bitmaps/"
+       windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_11) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_14) --include-dir ./../../../include --include-dir $(LIBDIRNAME) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib  --include-dir ./../../../src/regex --include-dir ./../../../src/expat/lib --include-dir . $(__DLLFLAG_p_12) --include-dir ../../../samples --include-dir ./../../include --define BMP_DIR="bitmaps/"

 
 $(OBJS)\fl_sample1_fl_sample1.o: .\fl_sample1.cpp
        $(CXX) -c -o $@ $(FL_SAMPLE1_CXXFLAGS) $<
 
 $(OBJS)\fl_sample1_fl_sample1_rc.o: .\fl_sample1.rc
 
 $(OBJS)\fl_sample1_fl_sample1.o: .\fl_sample1.cpp
        $(CXX) -c -o $@ $(FL_SAMPLE1_CXXFLAGS) $<
 
 $(OBJS)\fl_sample1_fl_sample1_rc.o: .\fl_sample1.rc

-       windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_11) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_14) --include-dir ./../../../include --include-dir $(LIBDIRNAME) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib  --include-dir ./../../../src/regex --include-dir ./../../../src/expat/lib --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../include --define BMP_DIR="bitmaps/"
+       windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_11) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_14) --include-dir ./../../../include --include-dir $(LIBDIRNAME) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib  --include-dir ./../../../src/regex --include-dir ./../../../src/expat/lib --include-dir . $(__DLLFLAG_p_12) --include-dir ../../../samples --include-dir ./../../include --define BMP_DIR="bitmaps/"

 
 $(OBJS)\fl_sample2_fl_sample2.o: .\fl_sample2.cpp
        $(CXX) -c -o $@ $(FL_SAMPLE2_CXXFLAGS) $<
 
 $(OBJS)\fl_sample2_fl_sample2_rc.o: .\fl_sample2.rc
 
 $(OBJS)\fl_sample2_fl_sample2.o: .\fl_sample2.cpp
        $(CXX) -c -o $@ $(FL_SAMPLE2_CXXFLAGS) $<
 
 $(OBJS)\fl_sample2_fl_sample2_rc.o: .\fl_sample2.rc

-       windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_11) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_14) --include-dir ./../../../include --include-dir $(LIBDIRNAME) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib  --include-dir ./../../../src/regex --include-dir ./../../../src/expat/lib --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../include --define BMP_DIR="bitmaps/"
+       windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_11) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_14) --include-dir ./../../../include --include-dir $(LIBDIRNAME) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib  --include-dir ./../../../src/regex --include-dir ./../../../src/expat/lib --include-dir . $(__DLLFLAG_p_12) --include-dir ../../../samples --include-dir ./../../include --define BMP_DIR="bitmaps/"

 
 $(OBJS)\fl_sample3_fl_sample3.o: .\fl_sample3.cpp
        $(CXX) -c -o $@ $(FL_SAMPLE3_CXXFLAGS) $<
 
 $(OBJS)\fl_sample3_fl_sample3_rc.o: .\fl_sample3.rc
 
 $(OBJS)\fl_sample3_fl_sample3.o: .\fl_sample3.cpp
        $(CXX) -c -o $@ $(FL_SAMPLE3_CXXFLAGS) $<
 
 $(OBJS)\fl_sample3_fl_sample3_rc.o: .\fl_sample3.rc

-       windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_11) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_14) --include-dir ./../../../include --include-dir $(LIBDIRNAME) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib  --include-dir ./../../../src/regex --include-dir ./../../../src/expat/lib --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../include --define BMP_DIR="bitmaps/"
+       windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_11) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_14) --include-dir ./../../../include --include-dir $(LIBDIRNAME) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib  --include-dir ./../../../src/regex --include-dir ./../../../src/expat/lib --include-dir . $(__DLLFLAG_p_12) --include-dir ../../../samples --include-dir ./../../include --define BMP_DIR="bitmaps/"

 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o


@@ -217,18 +223,18 @@ clean:
        -if exist $(OBJS)\fl_sample3.exe del $(OBJS)\fl_sample3.exe
 
 $(OBJS)\fl_demo1.exe: $(FL_DEMO1_OBJECTS) $(OBJS)\fl_demo1_fl_demo1_rc.o
        -if exist $(OBJS)\fl_sample3.exe del $(OBJS)\fl_sample3.exe
 
 $(OBJS)\fl_demo1.exe: $(FL_DEMO1_OBJECTS) $(OBJS)\fl_demo1_fl_demo1_rc.o

-       $(CXX) -o $@ $(FL_DEMO1_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -o $@ $(FL_DEMO1_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32

 
 $(OBJS)\fl_demo2.exe: $(FL_DEMO2_OBJECTS) $(OBJS)\fl_demo2_fl_demo2_rc.o
 
 $(OBJS)\fl_demo2.exe: $(FL_DEMO2_OBJECTS) $(OBJS)\fl_demo2_fl_demo2_rc.o

-       $(CXX) -o $@ $(FL_DEMO2_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -o $@ $(FL_DEMO2_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32

 
 $(OBJS)\fl_sample1.exe: $(FL_SAMPLE1_OBJECTS) $(OBJS)\fl_sample1_fl_sample1_rc.o
 
 $(OBJS)\fl_sample1.exe: $(FL_SAMPLE1_OBJECTS) $(OBJS)\fl_sample1_fl_sample1_rc.o

-       $(CXX) -o $@ $(FL_SAMPLE1_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -o $@ $(FL_SAMPLE1_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32

 
 $(OBJS)\fl_sample2.exe: $(FL_SAMPLE2_OBJECTS) $(OBJS)\fl_sample2_fl_sample2_rc.o
 
 $(OBJS)\fl_sample2.exe: $(FL_SAMPLE2_OBJECTS) $(OBJS)\fl_sample2_fl_sample2_rc.o

-       $(CXX) -o $@ $(FL_SAMPLE2_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -o $@ $(FL_SAMPLE2_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32

 
 $(OBJS)\fl_sample3.exe: $(FL_SAMPLE3_OBJECTS) $(OBJS)\fl_sample3_fl_sample3_rc.o
 
 $(OBJS)\fl_sample3.exe: $(FL_SAMPLE3_OBJECTS) $(OBJS)\fl_sample3_fl_sample3_rc.o

-       $(CXX) -o $@ $(FL_SAMPLE3_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -o $@ $(FL_SAMPLE3_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32

 
 .PHONY: all clean
 
 .PHONY: all clean

diff --git a/contrib/samples/fl/makefile.vc b/contrib/samples/fl/makefile.vc
index 433a694697e1bee186e10ca7d40f556807d47d28..d9d4c2bc4b3665d064400dfdb7dd324a8a510dca 100644 (file)
--- a/contrib/samples/fl/makefile.vc
+++ b/contrib/samples/fl/makefile.vc
@@ -18,8 +18,8 @@ FL_DEMO1_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \
        /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \
        /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \
        /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \
        /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \

-       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\include /DBMP_DIR=\"bitmaps/\" \
-       $(CXXFLAGS)
+       $(__DLLFLAG_p) /D_WINDOWS /I..\..\..\samples /I.\..\..\include \
+       /DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)

 FL_DEMO1_OBJECTS =  \
        $(OBJS)\fl_demo1_fl_demo1.obj \
        $(OBJS)\fl_demo1_fl_demo1.res
 FL_DEMO1_OBJECTS =  \
        $(OBJS)\fl_demo1_fl_demo1.obj \
        $(OBJS)\fl_demo1_fl_demo1.res


@@ -29,8 +29,8 @@ FL_DEMO2_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_13) \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \
        /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \
        /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \
        /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \
        /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \

-       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\include /DBMP_DIR=\"bitmaps/\" \
-       $(CXXFLAGS)
+       $(__DLLFLAG_p) /D_WINDOWS /I..\..\..\samples /I.\..\..\include \
+       /DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)

 FL_DEMO2_OBJECTS =  \
        $(OBJS)\fl_demo2_fl_demo2.obj \
        $(OBJS)\fl_demo2_fl_demo2.res
 FL_DEMO2_OBJECTS =  \
        $(OBJS)\fl_demo2_fl_demo2.obj \
        $(OBJS)\fl_demo2_fl_demo2.res


@@ -40,8 +40,8 @@ FL_SAMPLE1_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_23) \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \
        /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \
        /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \
        /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \
        /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \

-       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\include /DBMP_DIR=\"bitmaps/\" \
-       $(CXXFLAGS)
+       $(__DLLFLAG_p) /D_WINDOWS /I..\..\..\samples /I.\..\..\include \
+       /DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)

 FL_SAMPLE1_OBJECTS =  \
        $(OBJS)\fl_sample1_fl_sample1.obj \
        $(OBJS)\fl_sample1_fl_sample1.res
 FL_SAMPLE1_OBJECTS =  \
        $(OBJS)\fl_sample1_fl_sample1.obj \
        $(OBJS)\fl_sample1_fl_sample1.res


@@ -51,8 +51,8 @@ FL_SAMPLE2_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_33) \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \
        /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \
        /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \
        /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \
        /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \

-       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\include /DBMP_DIR=\"bitmaps/\" \
-       $(CXXFLAGS)
+       $(__DLLFLAG_p) /D_WINDOWS /I..\..\..\samples /I.\..\..\include \
+       /DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)

 FL_SAMPLE2_OBJECTS =  \
        $(OBJS)\fl_sample2_fl_sample2.obj \
        $(OBJS)\fl_sample2_fl_sample2.res
 FL_SAMPLE2_OBJECTS =  \
        $(OBJS)\fl_sample2_fl_sample2.obj \
        $(OBJS)\fl_sample2_fl_sample2.res


@@ -62,8 +62,8 @@ FL_SAMPLE3_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_43) \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \
        /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \
        /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \
        /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \
        /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \

-       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\include /DBMP_DIR=\"bitmaps/\" \
-       $(CXXFLAGS)
+       $(__DLLFLAG_p) /D_WINDOWS /I..\..\..\samples /I.\..\..\include \
+       /DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)

 FL_SAMPLE3_OBJECTS =  \
        $(OBJS)\fl_sample3_fl_sample3.obj \
        $(OBJS)\fl_sample3_fl_sample3.res
 FL_SAMPLE3_OBJECTS =  \
        $(OBJS)\fl_sample3_fl_sample3.obj \
        $(OBJS)\fl_sample3_fl_sample3.res


@@ -221,6 +221,9 @@ __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_15 = /d wxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_15 = /d wxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -366,31 +369,31 @@ $(OBJS)\fl_demo1_fl_demo1.obj: .\fl_demo1.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(FL_DEMO1_CXXFLAGS) $**
 
 $(OBJS)\fl_demo1_fl_demo1.res: .\fl_demo1.rc
        $(CXX) /c /nologo /TP /Fo$@ $(FL_DEMO1_CXXFLAGS) $**
 
 $(OBJS)\fl_demo1_fl_demo1.res: .\fl_demo1.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_15) /i .\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\src\tiff /i .\..\..\..\src\jpeg /i .\..\..\..\src\png /i .\..\..\..\src\zlib  /i .\..\..\..\src\regex /i .\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_11) /d _WINDOWS /i .\..\..\include /d BMP_DIR="bitmaps/" $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_15) /i .\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\src\tiff /i .\..\..\..\src\jpeg /i .\..\..\..\src\png /i .\..\..\..\src\zlib  /i .\..\..\..\src\regex /i .\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_11) /d _WINDOWS /i ..\..\..\samples /i .\..\..\include /d BMP_DIR="bitmaps/" $**

 
 $(OBJS)\fl_demo2_fl_demo2.obj: .\fl_demo2.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(FL_DEMO2_CXXFLAGS) $**
 
 $(OBJS)\fl_demo2_fl_demo2.res: .\fl_demo2.rc
 
 $(OBJS)\fl_demo2_fl_demo2.obj: .\fl_demo2.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(FL_DEMO2_CXXFLAGS) $**
 
 $(OBJS)\fl_demo2_fl_demo2.res: .\fl_demo2.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_12_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_15) /i .\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\src\tiff /i .\..\..\..\src\jpeg /i .\..\..\..\src\png /i .\..\..\..\src\zlib  /i .\..\..\..\src\regex /i .\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_11) /d _WINDOWS /i .\..\..\include /d BMP_DIR="bitmaps/" $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_12_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_15) /i .\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\src\tiff /i .\..\..\..\src\jpeg /i .\..\..\..\src\png /i .\..\..\..\src\zlib  /i .\..\..\..\src\regex /i .\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_11) /d _WINDOWS /i ..\..\..\samples /i .\..\..\include /d BMP_DIR="bitmaps/" $**

 
 $(OBJS)\fl_sample1_fl_sample1.obj: .\fl_sample1.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(FL_SAMPLE1_CXXFLAGS) $**
 
 $(OBJS)\fl_sample1_fl_sample1.res: .\fl_sample1.rc
 
 $(OBJS)\fl_sample1_fl_sample1.obj: .\fl_sample1.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(FL_SAMPLE1_CXXFLAGS) $**
 
 $(OBJS)\fl_sample1_fl_sample1.res: .\fl_sample1.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_22_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_15) /i .\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\src\tiff /i .\..\..\..\src\jpeg /i .\..\..\..\src\png /i .\..\..\..\src\zlib  /i .\..\..\..\src\regex /i .\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_11) /d _WINDOWS /i .\..\..\include /d BMP_DIR="bitmaps/" $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_22_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_15) /i .\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\src\tiff /i .\..\..\..\src\jpeg /i .\..\..\..\src\png /i .\..\..\..\src\zlib  /i .\..\..\..\src\regex /i .\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_11) /d _WINDOWS /i ..\..\..\samples /i .\..\..\include /d BMP_DIR="bitmaps/" $**

 
 $(OBJS)\fl_sample2_fl_sample2.obj: .\fl_sample2.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(FL_SAMPLE2_CXXFLAGS) $**
 
 $(OBJS)\fl_sample2_fl_sample2.res: .\fl_sample2.rc
 
 $(OBJS)\fl_sample2_fl_sample2.obj: .\fl_sample2.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(FL_SAMPLE2_CXXFLAGS) $**
 
 $(OBJS)\fl_sample2_fl_sample2.res: .\fl_sample2.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_32_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_15) /i .\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\src\tiff /i .\..\..\..\src\jpeg /i .\..\..\..\src\png /i .\..\..\..\src\zlib  /i .\..\..\..\src\regex /i .\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_11) /d _WINDOWS /i .\..\..\include /d BMP_DIR="bitmaps/" $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_32_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_15) /i .\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\src\tiff /i .\..\..\..\src\jpeg /i .\..\..\..\src\png /i .\..\..\..\src\zlib  /i .\..\..\..\src\regex /i .\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_11) /d _WINDOWS /i ..\..\..\samples /i .\..\..\include /d BMP_DIR="bitmaps/" $**

 
 $(OBJS)\fl_sample3_fl_sample3.obj: .\fl_sample3.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(FL_SAMPLE3_CXXFLAGS) $**
 
 $(OBJS)\fl_sample3_fl_sample3.res: .\fl_sample3.rc
 
 $(OBJS)\fl_sample3_fl_sample3.obj: .\fl_sample3.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(FL_SAMPLE3_CXXFLAGS) $**
 
 $(OBJS)\fl_sample3_fl_sample3.res: .\fl_sample3.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_42_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_15) /i .\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\src\tiff /i .\..\..\..\src\jpeg /i .\..\..\..\src\png /i .\..\..\..\src\zlib  /i .\..\..\..\src\regex /i .\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_11) /d _WINDOWS /i .\..\..\include /d BMP_DIR="bitmaps/" $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_42_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_14) $(__UNICODE_DEFINE_p_15) /i .\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\src\tiff /i .\..\..\..\src\jpeg /i .\..\..\..\src\png /i .\..\..\..\src\zlib  /i .\..\..\..\src\regex /i .\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_11) /d _WINDOWS /i ..\..\..\samples /i .\..\..\include /d BMP_DIR="bitmaps/" $**

 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -403,25 +406,25 @@ clean:
 
 $(OBJS)\fl_demo1.exe: $(FL_DEMO1_OBJECTS) $(OBJS)\fl_demo1_fl_demo1.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_7)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<
 
 $(OBJS)\fl_demo1.exe: $(FL_DEMO1_OBJECTS) $(OBJS)\fl_demo1_fl_demo1.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_7)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<

-       $(FL_DEMO1_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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
+       $(FL_DEMO1_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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

 <<
 
 $(OBJS)\fl_demo2.exe: $(FL_DEMO2_OBJECTS) $(OBJS)\fl_demo2_fl_demo2.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_7)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<
 <<
 
 $(OBJS)\fl_demo2.exe: $(FL_DEMO2_OBJECTS) $(OBJS)\fl_demo2_fl_demo2.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_7)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<

-       $(FL_DEMO2_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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
+       $(FL_DEMO2_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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

 <<
 
 $(OBJS)\fl_sample1.exe: $(FL_SAMPLE1_OBJECTS) $(OBJS)\fl_sample1_fl_sample1.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_7)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<
 <<
 
 $(OBJS)\fl_sample1.exe: $(FL_SAMPLE1_OBJECTS) $(OBJS)\fl_sample1_fl_sample1.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_7)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<

-       $(FL_SAMPLE1_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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
+       $(FL_SAMPLE1_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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

 <<
 
 $(OBJS)\fl_sample2.exe: $(FL_SAMPLE2_OBJECTS) $(OBJS)\fl_sample2_fl_sample2.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_7)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<
 <<
 
 $(OBJS)\fl_sample2.exe: $(FL_SAMPLE2_OBJECTS) $(OBJS)\fl_sample2_fl_sample2.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_7)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<

-       $(FL_SAMPLE2_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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
+       $(FL_SAMPLE2_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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

 <<
 
 $(OBJS)\fl_sample3.exe: $(FL_SAMPLE3_OBJECTS) $(OBJS)\fl_sample3_fl_sample3.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_7)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<
 <<
 
 $(OBJS)\fl_sample3.exe: $(FL_SAMPLE3_OBJECTS) $(OBJS)\fl_sample3_fl_sample3.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_7)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<

-       $(FL_SAMPLE3_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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
+       $(FL_SAMPLE3_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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

 <<
 <<

diff --git a/contrib/samples/fl/makefile.wat b/contrib/samples/fl/makefile.wat
index d83f5410633a6193ba738d8aa4c95202a1506e16..ad474daa9c5ed4fed249de260d1b034d8ec52bda 100644 (file)
--- a/contrib/samples/fl/makefile.wat
+++ b/contrib/samples/fl/makefile.wat
@@ -158,7 +158,8 @@ FL_DEMO1_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_5) $(__OPTIMIZEFLAG) -bm &
        $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) &
        -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png &
        -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib &
        $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) &
        -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png &
        -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib &

-       -i=. $(__DLLFLAG_p) -i=.\..\..\include -dBMP_DIR="bitmaps/" $(CXXFLAGS)
+       -i=. $(__DLLFLAG_p) -i=..\..\..\samples -i=.\..\..\include &
+       -dBMP_DIR="bitmaps/" $(CXXFLAGS)

 FL_DEMO1_OBJECTS =  &
        $(OBJS)\fl_demo1_fl_demo1.obj
 FL_DEMO2_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_5) $(__OPTIMIZEFLAG) -bm &
 FL_DEMO1_OBJECTS =  &
        $(OBJS)\fl_demo1_fl_demo1.obj
 FL_DEMO2_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_5) $(__OPTIMIZEFLAG) -bm &


@@ -166,7 +167,8 @@ FL_DEMO2_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_5) $(__OPTIMIZEFLAG) -bm &
        $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) &
        -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png &
        -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib &
        $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) &
        -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png &
        -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib &

-       -i=. $(__DLLFLAG_p) -i=.\..\..\include -dBMP_DIR="bitmaps/" $(CXXFLAGS)
+       -i=. $(__DLLFLAG_p) -i=..\..\..\samples -i=.\..\..\include &
+       -dBMP_DIR="bitmaps/" $(CXXFLAGS)

 FL_DEMO2_OBJECTS =  &
        $(OBJS)\fl_demo2_fl_demo2.obj
 FL_SAMPLE1_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_5) $(__OPTIMIZEFLAG) -bm &
 FL_DEMO2_OBJECTS =  &
        $(OBJS)\fl_demo2_fl_demo2.obj
 FL_SAMPLE1_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_5) $(__OPTIMIZEFLAG) -bm &


@@ -174,7 +176,8 @@ FL_SAMPLE1_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_5) $(__OPTIMIZEFLAG) -bm &
        $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) &
        -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png &
        -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib &
        $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) &
        -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png &
        -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib &

-       -i=. $(__DLLFLAG_p) -i=.\..\..\include -dBMP_DIR="bitmaps/" $(CXXFLAGS)
+       -i=. $(__DLLFLAG_p) -i=..\..\..\samples -i=.\..\..\include &
+       -dBMP_DIR="bitmaps/" $(CXXFLAGS)

 FL_SAMPLE1_OBJECTS =  &
        $(OBJS)\fl_sample1_fl_sample1.obj
 FL_SAMPLE2_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_5) $(__OPTIMIZEFLAG) -bm &
 FL_SAMPLE1_OBJECTS =  &
        $(OBJS)\fl_sample1_fl_sample1.obj
 FL_SAMPLE2_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_5) $(__OPTIMIZEFLAG) -bm &


@@ -182,7 +185,8 @@ FL_SAMPLE2_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_5) $(__OPTIMIZEFLAG) -bm &
        $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) &
        -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png &
        -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib &
        $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) &
        -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png &
        -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib &

-       -i=. $(__DLLFLAG_p) -i=.\..\..\include -dBMP_DIR="bitmaps/" $(CXXFLAGS)
+       -i=. $(__DLLFLAG_p) -i=..\..\..\samples -i=.\..\..\include &
+       -dBMP_DIR="bitmaps/" $(CXXFLAGS)

 FL_SAMPLE2_OBJECTS =  &
        $(OBJS)\fl_sample2_fl_sample2.obj
 FL_SAMPLE3_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_5) $(__OPTIMIZEFLAG) -bm &
 FL_SAMPLE2_OBJECTS =  &
        $(OBJS)\fl_sample2_fl_sample2.obj
 FL_SAMPLE3_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_5) $(__OPTIMIZEFLAG) -bm &


@@ -190,7 +194,8 @@ FL_SAMPLE3_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_5) $(__OPTIMIZEFLAG) -bm &
        $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) &
        -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png &
        -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib &
        $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) &
        -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png &
        -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib &

-       -i=. $(__DLLFLAG_p) -i=.\..\..\include -dBMP_DIR="bitmaps/" $(CXXFLAGS)
+       -i=. $(__DLLFLAG_p) -i=..\..\..\samples -i=.\..\..\include &
+       -dBMP_DIR="bitmaps/" $(CXXFLAGS)

 FL_SAMPLE3_OBJECTS =  &
        $(OBJS)\fl_sample3_fl_sample3.obj
 LIBDIRNAME = &
 FL_SAMPLE3_OBJECTS =  &
        $(OBJS)\fl_sample3_fl_sample3.obj
 LIBDIRNAME = &


@@ -198,8 +203,6 @@ LIBDIRNAME = &
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -213,31 +216,31 @@ $(OBJS)\fl_demo1_fl_demo1.obj :  .AUTODEPEND .\fl_demo1.cpp
        $(CXX) -zq -fo=$^@ $(FL_DEMO1_CXXFLAGS) $<
 
 $(OBJS)\fl_demo1_fl_demo1.res :  .AUTODEPEND .\fl_demo1.rc
        $(CXX) -zq -fo=$^@ $(FL_DEMO1_CXXFLAGS) $<
 
 $(OBJS)\fl_demo1_fl_demo1.res :  .AUTODEPEND .\fl_demo1.rc

-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib  -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=.\..\..\include -dBMP_DIR="bitmaps/" $<
+       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib  -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=..\..\..\samples -i=.\..\..\include -dBMP_DIR="bitmaps/" $<

 
 $(OBJS)\fl_demo2_fl_demo2.obj :  .AUTODEPEND .\fl_demo2.cpp
        $(CXX) -zq -fo=$^@ $(FL_DEMO2_CXXFLAGS) $<
 
 $(OBJS)\fl_demo2_fl_demo2.res :  .AUTODEPEND .\fl_demo2.rc
 
 $(OBJS)\fl_demo2_fl_demo2.obj :  .AUTODEPEND .\fl_demo2.cpp
        $(CXX) -zq -fo=$^@ $(FL_DEMO2_CXXFLAGS) $<
 
 $(OBJS)\fl_demo2_fl_demo2.res :  .AUTODEPEND .\fl_demo2.rc

-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib  -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=.\..\..\include -dBMP_DIR="bitmaps/" $<
+       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib  -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=..\..\..\samples -i=.\..\..\include -dBMP_DIR="bitmaps/" $<

 
 $(OBJS)\fl_sample1_fl_sample1.obj :  .AUTODEPEND .\fl_sample1.cpp
        $(CXX) -zq -fo=$^@ $(FL_SAMPLE1_CXXFLAGS) $<
 
 $(OBJS)\fl_sample1_fl_sample1.res :  .AUTODEPEND .\fl_sample1.rc
 
 $(OBJS)\fl_sample1_fl_sample1.obj :  .AUTODEPEND .\fl_sample1.cpp
        $(CXX) -zq -fo=$^@ $(FL_SAMPLE1_CXXFLAGS) $<
 
 $(OBJS)\fl_sample1_fl_sample1.res :  .AUTODEPEND .\fl_sample1.rc

-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib  -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=.\..\..\include -dBMP_DIR="bitmaps/" $<
+       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib  -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=..\..\..\samples -i=.\..\..\include -dBMP_DIR="bitmaps/" $<

 
 $(OBJS)\fl_sample2_fl_sample2.obj :  .AUTODEPEND .\fl_sample2.cpp
        $(CXX) -zq -fo=$^@ $(FL_SAMPLE2_CXXFLAGS) $<
 
 $(OBJS)\fl_sample2_fl_sample2.res :  .AUTODEPEND .\fl_sample2.rc
 
 $(OBJS)\fl_sample2_fl_sample2.obj :  .AUTODEPEND .\fl_sample2.cpp
        $(CXX) -zq -fo=$^@ $(FL_SAMPLE2_CXXFLAGS) $<
 
 $(OBJS)\fl_sample2_fl_sample2.res :  .AUTODEPEND .\fl_sample2.rc

-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib  -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=.\..\..\include -dBMP_DIR="bitmaps/" $<
+       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib  -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=..\..\..\samples -i=.\..\..\include -dBMP_DIR="bitmaps/" $<

 
 $(OBJS)\fl_sample3_fl_sample3.obj :  .AUTODEPEND .\fl_sample3.cpp
        $(CXX) -zq -fo=$^@ $(FL_SAMPLE3_CXXFLAGS) $<
 
 $(OBJS)\fl_sample3_fl_sample3.res :  .AUTODEPEND .\fl_sample3.rc
 
 $(OBJS)\fl_sample3_fl_sample3.obj :  .AUTODEPEND .\fl_sample3.cpp
        $(CXX) -zq -fo=$^@ $(FL_SAMPLE3_CXXFLAGS) $<
 
 $(OBJS)\fl_sample3_fl_sample3.res :  .AUTODEPEND .\fl_sample3.rc

-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib  -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=.\..\..\include -dBMP_DIR="bitmaps/" $<
+       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib  -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=..\..\..\samples -i=.\..\..\include -dBMP_DIR="bitmaps/" $<

 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -257,7 +260,7 @@ $(OBJS)\fl_demo1.exe :  $(FL_DEMO1_OBJECTS) $(OBJS)\fl_demo1_fl_demo1.res
        @%append $(OBJS)\fl_demo1.lbc option incremental
        @%append $(OBJS)\fl_demo1.lbc $(LDFLAGS) $(__DEBUGINFO)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(FL_DEMO1_OBJECTS)) do @%append $(OBJS)\fl_demo1.lbc file %i
        @%append $(OBJS)\fl_demo1.lbc option incremental
        @%append $(OBJS)\fl_demo1.lbc $(LDFLAGS) $(__DEBUGINFO)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(FL_DEMO1_OBJECTS)) do @%append $(OBJS)\fl_demo1.lbc file %i

-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\fl_demo1.lbc library %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\fl_demo1.lbc library %i

        @%append $(OBJS)\fl_demo1.lbc option resource=$(OBJS)\fl_demo1_fl_demo1.res
        wlink @$(OBJS)\fl_demo1.lbc
 
        @%append $(OBJS)\fl_demo1.lbc option resource=$(OBJS)\fl_demo1_fl_demo1.res
        wlink @$(OBJS)\fl_demo1.lbc
 


@@ -268,7 +271,7 @@ $(OBJS)\fl_demo2.exe :  $(FL_DEMO2_OBJECTS) $(OBJS)\fl_demo2_fl_demo2.res
        @%append $(OBJS)\fl_demo2.lbc option incremental
        @%append $(OBJS)\fl_demo2.lbc $(LDFLAGS) $(__DEBUGINFO)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(FL_DEMO2_OBJECTS)) do @%append $(OBJS)\fl_demo2.lbc file %i
        @%append $(OBJS)\fl_demo2.lbc option incremental
        @%append $(OBJS)\fl_demo2.lbc $(LDFLAGS) $(__DEBUGINFO)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(FL_DEMO2_OBJECTS)) do @%append $(OBJS)\fl_demo2.lbc file %i

-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\fl_demo2.lbc library %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\fl_demo2.lbc library %i

        @%append $(OBJS)\fl_demo2.lbc option resource=$(OBJS)\fl_demo2_fl_demo2.res
        wlink @$(OBJS)\fl_demo2.lbc
 
        @%append $(OBJS)\fl_demo2.lbc option resource=$(OBJS)\fl_demo2_fl_demo2.res
        wlink @$(OBJS)\fl_demo2.lbc
 


@@ -279,7 +282,7 @@ $(OBJS)\fl_sample1.exe :  $(FL_SAMPLE1_OBJECTS) $(OBJS)\fl_sample1_fl_sample1.re
        @%append $(OBJS)\fl_sample1.lbc option incremental
        @%append $(OBJS)\fl_sample1.lbc $(LDFLAGS) $(__DEBUGINFO)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(FL_SAMPLE1_OBJECTS)) do @%append $(OBJS)\fl_sample1.lbc file %i
        @%append $(OBJS)\fl_sample1.lbc option incremental
        @%append $(OBJS)\fl_sample1.lbc $(LDFLAGS) $(__DEBUGINFO)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(FL_SAMPLE1_OBJECTS)) do @%append $(OBJS)\fl_sample1.lbc file %i

-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\fl_sample1.lbc library %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\fl_sample1.lbc library %i

        @%append $(OBJS)\fl_sample1.lbc option resource=$(OBJS)\fl_sample1_fl_sample1.res
        wlink @$(OBJS)\fl_sample1.lbc
 
        @%append $(OBJS)\fl_sample1.lbc option resource=$(OBJS)\fl_sample1_fl_sample1.res
        wlink @$(OBJS)\fl_sample1.lbc
 


@@ -290,7 +293,7 @@ $(OBJS)\fl_sample2.exe :  $(FL_SAMPLE2_OBJECTS) $(OBJS)\fl_sample2_fl_sample2.re
        @%append $(OBJS)\fl_sample2.lbc option incremental
        @%append $(OBJS)\fl_sample2.lbc $(LDFLAGS) $(__DEBUGINFO)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(FL_SAMPLE2_OBJECTS)) do @%append $(OBJS)\fl_sample2.lbc file %i
        @%append $(OBJS)\fl_sample2.lbc option incremental
        @%append $(OBJS)\fl_sample2.lbc $(LDFLAGS) $(__DEBUGINFO)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(FL_SAMPLE2_OBJECTS)) do @%append $(OBJS)\fl_sample2.lbc file %i

-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\fl_sample2.lbc library %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\fl_sample2.lbc library %i

        @%append $(OBJS)\fl_sample2.lbc option resource=$(OBJS)\fl_sample2_fl_sample2.res
        wlink @$(OBJS)\fl_sample2.lbc
 
        @%append $(OBJS)\fl_sample2.lbc option resource=$(OBJS)\fl_sample2_fl_sample2.res
        wlink @$(OBJS)\fl_sample2.lbc
 


@@ -301,6 +304,6 @@ $(OBJS)\fl_sample3.exe :  $(FL_SAMPLE3_OBJECTS) $(OBJS)\fl_sample3_fl_sample3.re
        @%append $(OBJS)\fl_sample3.lbc option incremental
        @%append $(OBJS)\fl_sample3.lbc $(LDFLAGS) $(__DEBUGINFO)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(FL_SAMPLE3_OBJECTS)) do @%append $(OBJS)\fl_sample3.lbc file %i
        @%append $(OBJS)\fl_sample3.lbc option incremental
        @%append $(OBJS)\fl_sample3.lbc $(LDFLAGS) $(__DEBUGINFO)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(FL_SAMPLE3_OBJECTS)) do @%append $(OBJS)\fl_sample3.lbc file %i

-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\fl_sample3.lbc library %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\fl_sample3.lbc library %i

        @%append $(OBJS)\fl_sample3.lbc option resource=$(OBJS)\fl_sample3_fl_sample3.res
        wlink @$(OBJS)\fl_sample3.lbc
        @%append $(OBJS)\fl_sample3.lbc option resource=$(OBJS)\fl_sample3_fl_sample3.res
        wlink @$(OBJS)\fl_sample3.lbc

diff --git a/contrib/samples/gizmos/dynsash/Makefile.in b/contrib/samples/gizmos/dynsash/Makefile.in
index 25ee1832227949111a7d91e787e9b460424108ec..633d49450de885dfcb0c68158946ce8c34e0b679 100644 (file)
--- a/contrib/samples/gizmos/dynsash/Makefile.in
+++ b/contrib/samples/gizmos/dynsash/Makefile.in
@@ -35,7 +35,8 @@ top_srcdir = @top_srcdir@
 DYNSASH_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) \
 DYNSASH_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) $(__DLLFLAG_p) -I$(srcdir)/../../../include $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -I../../../../samples \
+       -I$(srcdir)/../../../include $(CXXFLAGS)

 DYNSASH_OBJECTS =  \
        $(__dynsash___win32rc) \
        dynsash_dynsash.o
 DYNSASH_OBJECTS =  \
        $(__dynsash___win32rc) \
        dynsash_dynsash.o


@@ -104,8 +105,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \

-       $(__DLLFLAG_p_1) -i $(srcdir)/../../../include -o dynsash$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../../samples/sample.r
+       $(__DLLFLAG_p_1) -i ../../../../samples -i $(srcdir)/../../../include -o \
+       dynsash$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
+       ../../../../samples/sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)


@@ -148,7 +150,7 @@ dynsash_dynsash.o: $(srcdir)/dynsash.cpp
        $(CXXC) -c -o $@ $(DYNSASH_CXXFLAGS) $<
 
 dynsash_sample_rc.o: $(srcdir)/../../../../samples/sample.rc
        $(CXXC) -c -o $@ $(DYNSASH_CXXFLAGS) $<
 
 dynsash_sample_rc.o: $(srcdir)/../../../../samples/sample.rc

-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2)
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../../samples

 
 install: all
 
 
 install: all
 

diff --git a/contrib/samples/gizmos/dynsash/dynsash.dsp b/contrib/samples/gizmos/dynsash/dynsash.dsp
index 5c7c2b1ea6fa42e639d43eede3d5bd43d43b28da..2a441b6a32d5c507fb11367a7a92d9669ce1f91a 100644 (file)
--- a/contrib/samples/gizmos/dynsash/dynsash.dsp
+++ b/contrib/samples/gizmos/dynsash/dynsash.dsp
@@ -55,12 +55,12 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\dynsash"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\dynsash"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -80,12 +80,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_msw"
 # PROP Intermediate_Dir "vc_msw\dynsash"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_msw"
 # PROP Intermediate_Dir "vc_msw\dynsash"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_msw\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_msw\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_msw\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_msw\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -105,12 +105,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\dynsash"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\dynsash"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -130,12 +130,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\dynsash"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\dynsash"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswu\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswu\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswu\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswu\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -155,12 +155,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\dynsash"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\dynsash"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -180,12 +180,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\dynsash"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\dynsash"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -205,12 +205,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\dynsash"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\dynsash"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -230,12 +230,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\dynsash"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\dynsash"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -255,12 +255,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\dynsash"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\dynsash"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -280,12 +280,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\dynsash"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\dynsash"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswdll\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswdll\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswdll\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswdll\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -305,12 +305,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\dynsash"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\dynsash"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -330,12 +330,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\dynsash"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\dynsash"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswudll\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswudll\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswudll\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswudll\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -355,12 +355,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\dynsash"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\dynsash"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -380,12 +380,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\dynsash"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\dynsash"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -405,12 +405,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\dynsash"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\dynsash"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\dynsash.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -430,12 +430,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\dynsash"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\dynsash"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\dynsash.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -468,11 +468,11 @@ LINK32=link.exe
 # PROP Default_Filter ""
 # Begin Source File
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=.\..\..\..\..\samples\sample.rc
+SOURCE=.\dynsash.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\dynsash.cpp
+SOURCE=.\..\..\..\..\samples\sample.rc

 # End Source File
 # End Group
 # End Target
 # End Source File
 # End Group
 # End Target

diff --git a/contrib/samples/gizmos/dynsash/makefile.wat b/contrib/samples/gizmos/dynsash/makefile.wat
index 02d7001ee1d8594bbebc80baee2e7fb6c2c28a44..563aa4e0c09edc38b47239648d99b44f904cf312 100644 (file)
--- a/contrib/samples/gizmos/dynsash/makefile.wat
+++ b/contrib/samples/gizmos/dynsash/makefile.wat
@@ -164,7 +164,7 @@ DYNSASH_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
        -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg &
        -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib &
        -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. &
        -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg &
        -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib &
        -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. &

-       $(__DLLFLAG_p) -i=.\..\..\..\include $(CXXFLAGS)
+       $(__DLLFLAG_p) -i=..\..\..\..\samples -i=.\..\..\..\include $(CXXFLAGS)

 DYNSASH_OBJECTS =  &
        $(OBJS)\dynsash_dynsash.obj
 LIBDIRNAME = &
 DYNSASH_OBJECTS =  &
        $(OBJS)\dynsash_dynsash.obj
 LIBDIRNAME = &


@@ -172,8 +172,6 @@ LIBDIRNAME = &
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -187,7 +185,7 @@ $(OBJS)\dynsash_dynsash.obj :  .AUTODEPEND .\dynsash.cpp
        $(CXX) -zq -fo=$^@ $(DYNSASH_CXXFLAGS) $<
 
 $(OBJS)\dynsash_sample.res :  .AUTODEPEND .\..\..\..\..\samples\sample.rc
        $(CXX) -zq -fo=$^@ $(DYNSASH_CXXFLAGS) $<
 
 $(OBJS)\dynsash_sample.res :  .AUTODEPEND .\..\..\..\..\samples\sample.rc

-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib  -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) $<
+       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib  -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=..\..\..\..\samples $<

 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -203,6 +201,6 @@ $(OBJS)\dynsash.exe :  $(DYNSASH_OBJECTS) $(OBJS)\dynsash_sample.res
        @%append $(OBJS)\dynsash.lbc option incremental
        @%append $(OBJS)\dynsash.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(DYNSASH_OBJECTS)) do @%append $(OBJS)\dynsash.lbc file %i
        @%append $(OBJS)\dynsash.lbc option incremental
        @%append $(OBJS)\dynsash.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(DYNSASH_OBJECTS)) do @%append $(OBJS)\dynsash.lbc file %i

-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\dynsash.lbc library %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\dynsash.lbc library %i

        @%append $(OBJS)\dynsash.lbc option resource=$(OBJS)\dynsash_sample.res
        wlink @$(OBJS)\dynsash.lbc
        @%append $(OBJS)\dynsash.lbc option resource=$(OBJS)\dynsash_sample.res
        wlink @$(OBJS)\dynsash.lbc

diff --git a/contrib/samples/gizmos/dynsash_switch/Makefile.in b/contrib/samples/gizmos/dynsash_switch/Makefile.in
index fc34945cda12e71e28ce4c84ff1a4005d2fe6cdf..4bfc1ecd8c89d5ca1013393f5b2301ea183aadec 100644 (file)
--- a/contrib/samples/gizmos/dynsash_switch/Makefile.in
+++ b/contrib/samples/gizmos/dynsash_switch/Makefile.in
@@ -35,7 +35,8 @@ top_srcdir = @top_srcdir@
 DYNSASH_SWITCH_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) \
 DYNSASH_SWITCH_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) $(__DLLFLAG_p) -I$(srcdir)/../../../include $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -I../../../../samples \
+       -I$(srcdir)/../../../include $(CXXFLAGS)

 DYNSASH_SWITCH_OBJECTS =  \
        $(__dynsash_switch___win32rc) \
        dynsash_switch_dynsash_switch.o
 DYNSASH_SWITCH_OBJECTS =  \
        $(__dynsash_switch___win32rc) \
        dynsash_switch_dynsash_switch.o


@@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \

-       $(__DLLFLAG_p_1) -i $(srcdir)/../../../include -o dynsash_switch$(EXEEXT) \
-       Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
+       $(__DLLFLAG_p_1) -i ../../../../samples -i $(srcdir)/../../../include -o \
+       dynsash_switch$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \

        ../../../../samples/sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
        ../../../../samples/sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \


@@ -148,7 +149,7 @@ dynsash_switch_dynsash_switch.o: $(srcdir)/dynsash_switch.cpp
        $(CXXC) -c -o $@ $(DYNSASH_SWITCH_CXXFLAGS) $<
 
 dynsash_switch_sample_rc.o: $(srcdir)/../../../../samples/sample.rc
        $(CXXC) -c -o $@ $(DYNSASH_SWITCH_CXXFLAGS) $<
 
 dynsash_switch_sample_rc.o: $(srcdir)/../../../../samples/sample.rc

-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2)
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../../samples

 
 install: all
 
 
 install: all
 

diff --git a/contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsp b/contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsp
index acb3c706c86e65bd1ac96976d06ab1a616428eff..5234de266b8b3c78f46d2fa46873ba30d8ec15de 100644 (file)
--- a/contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsp
+++ b/contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsp
@@ -55,12 +55,12 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\dynsash_switch"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\dynsash_switch"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -80,12 +80,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_msw"
 # PROP Intermediate_Dir "vc_msw\dynsash_switch"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_msw"
 # PROP Intermediate_Dir "vc_msw\dynsash_switch"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_msw\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_msw\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_msw\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_msw\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -105,12 +105,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\dynsash_switch"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\dynsash_switch"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -130,12 +130,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\dynsash_switch"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\dynsash_switch"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswu\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswu\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswu\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswu\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -155,12 +155,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\dynsash_switch"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\dynsash_switch"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -180,12 +180,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\dynsash_switch"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\dynsash_switch"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -205,12 +205,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\dynsash_switch"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\dynsash_switch"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -230,12 +230,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\dynsash_switch"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\dynsash_switch"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -255,12 +255,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\dynsash_switch"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\dynsash_switch"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -280,12 +280,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\dynsash_switch"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\dynsash_switch"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswdll\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswdll\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswdll\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswdll\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -305,12 +305,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\dynsash_switch"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\dynsash_switch"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -330,12 +330,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\dynsash_switch"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\dynsash_switch"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswudll\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswudll\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswudll\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswudll\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -355,12 +355,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\dynsash_switch"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\dynsash_switch"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -380,12 +380,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\dynsash_switch"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\dynsash_switch"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -405,12 +405,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\dynsash_switch"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\dynsash_switch"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\dynsash_switch.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -430,12 +430,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\dynsash_switch"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\dynsash_switch"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\dynsash_switch.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -468,11 +468,11 @@ LINK32=link.exe
 # PROP Default_Filter ""
 # Begin Source File
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=.\..\..\..\..\samples\sample.rc
+SOURCE=.\dynsash_switch.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\dynsash_switch.cpp
+SOURCE=.\..\..\..\..\samples\sample.rc

 # End Source File
 # End Group
 # End Target
 # End Source File
 # End Group
 # End Target

diff --git a/contrib/samples/gizmos/dynsash_switch/makefile.wat b/contrib/samples/gizmos/dynsash_switch/makefile.wat
index 2e3f0bc318e9142fb63902504c651b29f33880c0..6e150168e246a3bf27eb321002b789e086c6266f 100644 (file)
--- a/contrib/samples/gizmos/dynsash_switch/makefile.wat
+++ b/contrib/samples/gizmos/dynsash_switch/makefile.wat
@@ -159,7 +159,7 @@ DYNSASH_SWITCH_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
        -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg &
        -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib &
        -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. &
        -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg &
        -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib &
        -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. &

-       $(__DLLFLAG_p) -i=.\..\..\..\include $(CXXFLAGS)
+       $(__DLLFLAG_p) -i=..\..\..\..\samples -i=.\..\..\..\include $(CXXFLAGS)

 DYNSASH_SWITCH_OBJECTS =  &
        $(OBJS)\dynsash_switch_dynsash_switch.obj
 LIBDIRNAME = &
 DYNSASH_SWITCH_OBJECTS =  &
        $(OBJS)\dynsash_switch_dynsash_switch.obj
 LIBDIRNAME = &


@@ -167,8 +167,6 @@ LIBDIRNAME = &
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -182,7 +180,7 @@ $(OBJS)\dynsash_switch_dynsash_switch.obj :  .AUTODEPEND .\dynsash_switch.cpp
        $(CXX) -zq -fo=$^@ $(DYNSASH_SWITCH_CXXFLAGS) $<
 
 $(OBJS)\dynsash_switch_sample.res :  .AUTODEPEND .\..\..\..\..\samples\sample.rc
        $(CXX) -zq -fo=$^@ $(DYNSASH_SWITCH_CXXFLAGS) $<
 
 $(OBJS)\dynsash_switch_sample.res :  .AUTODEPEND .\..\..\..\..\samples\sample.rc

-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib  -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) $<
+       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib  -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=..\..\..\..\samples $<

 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -198,6 +196,6 @@ $(OBJS)\dynsash_switch.exe :  $(DYNSASH_SWITCH_OBJECTS) $(OBJS)\dynsash_switch_s
        @%append $(OBJS)\dynsash_switch.lbc option incremental
        @%append $(OBJS)\dynsash_switch.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(DYNSASH_SWITCH_OBJECTS)) do @%append $(OBJS)\dynsash_switch.lbc file %i
        @%append $(OBJS)\dynsash_switch.lbc option incremental
        @%append $(OBJS)\dynsash_switch.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(DYNSASH_SWITCH_OBJECTS)) do @%append $(OBJS)\dynsash_switch.lbc file %i

-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\dynsash_switch.lbc library %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\dynsash_switch.lbc library %i

        @%append $(OBJS)\dynsash_switch.lbc option resource=$(OBJS)\dynsash_switch_sample.res
        wlink @$(OBJS)\dynsash_switch.lbc
        @%append $(OBJS)\dynsash_switch.lbc option resource=$(OBJS)\dynsash_switch_sample.res
        wlink @$(OBJS)\dynsash_switch.lbc

diff --git a/contrib/samples/gizmos/editlbox/Makefile.in b/contrib/samples/gizmos/editlbox/Makefile.in
index 8b1ec728c0d40d585a51d2ce698e7dcb8d8663ee..8672af5e9af35a71d257724ef499bf5dadb073b5 100644 (file)
--- a/contrib/samples/gizmos/editlbox/Makefile.in
+++ b/contrib/samples/gizmos/editlbox/Makefile.in
@@ -36,7 +36,8 @@ LIBDIRNAME = $(top_builddir)lib
 TEST_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) \
 TEST_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) $(__DLLFLAG_p) -I$(srcdir)/../../../include $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -I../../../../samples \
+       -I$(srcdir)/../../../include $(CXXFLAGS)

 TEST_OBJECTS =  \
        $(__test___win32rc) \
        test_test.o
 TEST_OBJECTS =  \
        $(__test___win32rc) \
        test_test.o


@@ -104,8 +105,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \

-       $(__DLLFLAG_p_1) -i $(srcdir)/../../../include -o test$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../../samples/sample.r
+       $(__DLLFLAG_p_1) -i ../../../../samples -i $(srcdir)/../../../include -o \
+       test$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
+       ../../../../samples/sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)


@@ -146,7 +148,7 @@ test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc)
        $(__test___mac_setfilecmd)
 
 test_sample_rc.o: $(srcdir)/../../../../samples/sample.rc
        $(__test___mac_setfilecmd)
 
 test_sample_rc.o: $(srcdir)/../../../../samples/sample.rc

-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2)
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../../samples

 
 test_test.o: $(srcdir)/test.cpp
        $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<
 
 test_test.o: $(srcdir)/test.cpp
        $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $<

diff --git a/contrib/samples/gizmos/editlbox/editlbox.dsp b/contrib/samples/gizmos/editlbox/editlbox.dsp
index 0f2af98d0e73bad0a55fc1f409948bafd933b853..c4ac4a660e21e433b1eb09d015216ae2fcb6a408 100644 (file)
--- a/contrib/samples/gizmos/editlbox/editlbox.dsp
+++ b/contrib/samples/gizmos/editlbox/editlbox.dsp
@@ -55,12 +55,12 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\test"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\test"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -80,12 +80,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_msw"
 # PROP Intermediate_Dir "vc_msw\test"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_msw"
 # PROP Intermediate_Dir "vc_msw\test"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_msw\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_msw\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_msw\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_msw\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -105,12 +105,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\test"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\test"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -130,12 +130,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\test"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\test"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswu\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswu\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswu\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswu\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -155,12 +155,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\test"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\test"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -180,12 +180,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\test"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\test"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -205,12 +205,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\test"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\test"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -230,12 +230,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\test"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\test"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -255,12 +255,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\test"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\test"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -280,12 +280,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\test"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\test"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswdll\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswdll\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswdll\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswdll\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -305,12 +305,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\test"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\test"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -330,12 +330,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\test"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\test"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswudll\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswudll\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswudll\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswudll\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -355,12 +355,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\test"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\test"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -380,12 +380,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\test"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\test"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -405,12 +405,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\test"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\test"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\test.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -430,12 +430,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\test"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\test"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\test.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo

diff --git a/contrib/samples/gizmos/editlbox/makefile.vc b/contrib/samples/gizmos/editlbox/makefile.vc
index 477487a80f2009d4903d9b574484ab99de35e8f2..e5126db1adb8f70546f171225e4fb9c4d041b2f1 100644 (file)
--- a/contrib/samples/gizmos/editlbox/makefile.vc
+++ b/contrib/samples/gizmos/editlbox/makefile.vc
@@ -23,7 +23,7 @@ TEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \
        /I.\..\..\..\..\src\tiff /I.\..\..\..\..\src\jpeg /I.\..\..\..\..\src\png \
        /I.\..\..\..\..\src\zlib /I.\..\..\..\..\src\regex \
        /I.\..\..\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_WINDOWS \
        /I.\..\..\..\..\src\tiff /I.\..\..\..\..\src\jpeg /I.\..\..\..\..\src\png \
        /I.\..\..\..\..\src\zlib /I.\..\..\..\..\src\regex \
        /I.\..\..\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_WINDOWS \

-       /I.\..\..\..\include $(CXXFLAGS)
+       /I..\..\..\..\samples /I.\..\..\..\include $(CXXFLAGS)

 TEST_OBJECTS =  \
        $(OBJS)\test_sample.res \
        $(OBJS)\test_test.obj
 TEST_OBJECTS =  \
        $(OBJS)\test_sample.res \
        $(OBJS)\test_test.obj


@@ -141,6 +141,9 @@ __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -211,7 +214,7 @@ $(OBJS):
 all: $(OBJS)\test.exe
 
 $(OBJS)\test_sample.res: .\..\..\..\..\samples\sample.rc
 all: $(OBJS)\test.exe
 
 $(OBJS)\test_sample.res: .\..\..\..\..\samples\sample.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\..\src\tiff /i .\..\..\..\..\src\jpeg /i .\..\..\..\..\src\png /i .\..\..\..\..\src\zlib  /i .\..\..\..\..\src\regex /i .\..\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\..\src\tiff /i .\..\..\..\..\src\jpeg /i .\..\..\..\..\src\png /i .\..\..\..\..\src\zlib  /i .\..\..\..\..\src\regex /i .\..\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS /i ..\..\..\..\samples $**

 
 $(OBJS)\test_test.obj: .\test.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
 
 $(OBJS)\test_test.obj: .\test.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**


@@ -223,5 +226,5 @@ clean:
 
 $(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_sample.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<
 
 $(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_sample.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<

-       $(TEST_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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
+       $(TEST_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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

 <<
 <<

diff --git a/contrib/samples/gizmos/editlbox/makefile.wat b/contrib/samples/gizmos/editlbox/makefile.wat
index 4ab00f5979c341c20c5baf37b41dcd67c9782937..4eaade2ef8b980c31bdfb478f27235419aed3201 100644 (file)
--- a/contrib/samples/gizmos/editlbox/makefile.wat
+++ b/contrib/samples/gizmos/editlbox/makefile.wat
@@ -163,12 +163,10 @@ TEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
        -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg &
        -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib &
        -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. &
        -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg &
        -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib &
        -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. &

-       $(__DLLFLAG_p) -i=.\..\..\..\include $(CXXFLAGS)
+       $(__DLLFLAG_p) -i=..\..\..\..\samples -i=.\..\..\..\include $(CXXFLAGS)

 TEST_OBJECTS =  &
        $(OBJS)\test_test.obj
 
 TEST_OBJECTS =  &
        $(OBJS)\test_test.obj
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -179,7 +177,7 @@ $(OBJS) :
 all : .SYMBOLIC $(OBJS)\test.exe
 
 $(OBJS)\test_sample.res :  .AUTODEPEND .\..\..\..\..\samples\sample.rc
 all : .SYMBOLIC $(OBJS)\test.exe
 
 $(OBJS)\test_sample.res :  .AUTODEPEND .\..\..\..\..\samples\sample.rc

-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib  -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) $<
+       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib  -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=..\..\..\..\samples $<

 
 $(OBJS)\test_test.obj :  .AUTODEPEND .\test.cpp
        $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_test.obj :  .AUTODEPEND .\test.cpp
        $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<


@@ -198,6 +196,6 @@ $(OBJS)\test.exe :  $(TEST_OBJECTS) $(OBJS)\test_sample.res
        @%append $(OBJS)\test.lbc option incremental
        @%append $(OBJS)\test.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(TEST_OBJECTS)) do @%append $(OBJS)\test.lbc file %i
        @%append $(OBJS)\test.lbc option incremental
        @%append $(OBJS)\test.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(TEST_OBJECTS)) do @%append $(OBJS)\test.lbc file %i

-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\test.lbc library %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\test.lbc library %i

        @%append $(OBJS)\test.lbc option resource=$(OBJS)\test_sample.res
        wlink @$(OBJS)\test.lbc
        @%append $(OBJS)\test.lbc option resource=$(OBJS)\test_sample.res
        wlink @$(OBJS)\test.lbc

diff --git a/contrib/samples/gizmos/led/Makefile.in b/contrib/samples/gizmos/led/Makefile.in
index 2f962a79320ef26217524a3663b9d3fe0af71a97..4001517b384b1bede7a04f1c5dd11f3c30a51109 100644 (file)
--- a/contrib/samples/gizmos/led/Makefile.in
+++ b/contrib/samples/gizmos/led/Makefile.in
@@ -35,7 +35,8 @@ top_srcdir = @top_srcdir@
 LED_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) \
 LED_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) $(__DLLFLAG_p) -I$(srcdir)/../../../include $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -I../../../../samples \
+       -I$(srcdir)/../../../include $(CXXFLAGS)

 LED_OBJECTS =  \
        $(__led___win32rc) \
        led_led.o
 LED_OBJECTS =  \
        $(__led___win32rc) \
        led_led.o


@@ -104,8 +105,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \

-       $(__DLLFLAG_p_1) -i $(srcdir)/../../../include -o led$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../../samples/sample.r
+       $(__DLLFLAG_p_1) -i ../../../../samples -i $(srcdir)/../../../include -o \
+       led$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
+       ../../../../samples/sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)


@@ -148,7 +150,7 @@ led_led.o: $(srcdir)/led.cpp
        $(CXXC) -c -o $@ $(LED_CXXFLAGS) $<
 
 led_sample_rc.o: $(srcdir)/../../../../samples/sample.rc
        $(CXXC) -c -o $@ $(LED_CXXFLAGS) $<
 
 led_sample_rc.o: $(srcdir)/../../../../samples/sample.rc

-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2)
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../../samples

 
 uninstall: 
 
 
 uninstall: 
 

diff --git a/contrib/samples/gizmos/led/led.dsp b/contrib/samples/gizmos/led/led.dsp
index 6a429d21f98e768eee2c90e6cb736b83fc7af894..70ce1c858fa5913082b5e13d9aecd63478d2711d 100644 (file)
--- a/contrib/samples/gizmos/led/led.dsp
+++ b/contrib/samples/gizmos/led/led.dsp
@@ -55,12 +55,12 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\led"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\led"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -80,12 +80,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_msw"
 # PROP Intermediate_Dir "vc_msw\led"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_msw"
 # PROP Intermediate_Dir "vc_msw\led"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_msw\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_msw\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_msw\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_msw\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -105,12 +105,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\led"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\led"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -130,12 +130,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\led"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\led"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswu\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswu\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswu\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswu\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -155,12 +155,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\led"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\led"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -180,12 +180,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\led"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\led"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -205,12 +205,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\led"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\led"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -230,12 +230,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\led"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\led"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -255,12 +255,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\led"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\led"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -280,12 +280,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\led"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\led"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswdll\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswdll\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswdll\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswdll\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -305,12 +305,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\led"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\led"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -330,12 +330,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\led"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\led"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswudll\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswudll\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswudll\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswudll\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -355,12 +355,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\led"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\led"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -380,12 +380,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\led"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\led"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -405,12 +405,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\led"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\led"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\led.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -430,12 +430,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\led"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\led"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\led.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -468,11 +468,11 @@ LINK32=link.exe
 # PROP Default_Filter ""
 # Begin Source File
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=.\..\..\..\..\samples\sample.rc
+SOURCE=.\led.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\led.cpp
+SOURCE=.\..\..\..\..\samples\sample.rc

 # End Source File
 # End Group
 # End Target
 # End Source File
 # End Group
 # End Target

diff --git a/contrib/samples/gizmos/led/makefile.wat b/contrib/samples/gizmos/led/makefile.wat
index 70453ae0fdb2b1f9c02e0d4a2a8668aa025f1403..87def297ea3ffe73912501f3e3862eb61181a6f1 100644 (file)
--- a/contrib/samples/gizmos/led/makefile.wat
+++ b/contrib/samples/gizmos/led/makefile.wat
@@ -159,7 +159,7 @@ LED_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
        -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg &
        -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib &
        -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. &
        -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg &
        -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib &
        -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. &

-       $(__DLLFLAG_p) -i=.\..\..\..\include $(CXXFLAGS)
+       $(__DLLFLAG_p) -i=..\..\..\..\samples -i=.\..\..\..\include $(CXXFLAGS)

 LED_OBJECTS =  &
        $(OBJS)\led_led.obj
 LIBDIRNAME = &
 LED_OBJECTS =  &
        $(OBJS)\led_led.obj
 LIBDIRNAME = &


@@ -167,8 +167,6 @@ LIBDIRNAME = &
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -182,7 +180,7 @@ $(OBJS)\led_led.obj :  .AUTODEPEND .\led.cpp
        $(CXX) -zq -fo=$^@ $(LED_CXXFLAGS) $<
 
 $(OBJS)\led_sample.res :  .AUTODEPEND .\..\..\..\..\samples\sample.rc
        $(CXX) -zq -fo=$^@ $(LED_CXXFLAGS) $<
 
 $(OBJS)\led_sample.res :  .AUTODEPEND .\..\..\..\..\samples\sample.rc

-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib  -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) $<
+       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib  -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=..\..\..\..\samples $<

 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -198,6 +196,6 @@ $(OBJS)\led.exe :  $(LED_OBJECTS) $(OBJS)\led_sample.res
        @%append $(OBJS)\led.lbc option incremental
        @%append $(OBJS)\led.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(LED_OBJECTS)) do @%append $(OBJS)\led.lbc file %i
        @%append $(OBJS)\led.lbc option incremental
        @%append $(OBJS)\led.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(LED_OBJECTS)) do @%append $(OBJS)\led.lbc file %i

-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\led.lbc library %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\led.lbc library %i

        @%append $(OBJS)\led.lbc option resource=$(OBJS)\led_sample.res
        wlink @$(OBJS)\led.lbc
        @%append $(OBJS)\led.lbc option resource=$(OBJS)\led_sample.res
        wlink @$(OBJS)\led.lbc

diff --git a/contrib/samples/gizmos/multicell/Makefile.in b/contrib/samples/gizmos/multicell/Makefile.in
index fa55135062d49ef6131a5a58d9cda17a37f94d77..e22c9fbfc6eecf569b263b81092d5060df4bd88d 100644 (file)
--- a/contrib/samples/gizmos/multicell/Makefile.in
+++ b/contrib/samples/gizmos/multicell/Makefile.in
@@ -36,7 +36,8 @@ LIBDIRNAME = $(top_builddir)lib
 MTEST_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) \
 MTEST_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) $(__DLLFLAG_p) -I$(srcdir)/../../../include $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -I../../../../samples \
+       -I$(srcdir)/../../../include $(CXXFLAGS)

 MTEST_OBJECTS =  \
        $(__mtest___win32rc) \
        mtest_mtest.o
 MTEST_OBJECTS =  \
        $(__mtest___win32rc) \
        mtest_mtest.o


@@ -104,8 +105,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \

-       $(__DLLFLAG_p_1) -i $(srcdir)/../../../include -o mtest$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../../samples/sample.r
+       $(__DLLFLAG_p_1) -i ../../../../samples -i $(srcdir)/../../../include -o \
+       mtest$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
+       ../../../../samples/sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)


@@ -149,7 +151,7 @@ mtest_mtest.o: $(srcdir)/mtest.cpp
        $(CXXC) -c -o $@ $(MTEST_CXXFLAGS) $<
 
 mtest_sample_rc.o: $(srcdir)/../../../../samples/sample.rc
        $(CXXC) -c -o $@ $(MTEST_CXXFLAGS) $<
 
 mtest_sample_rc.o: $(srcdir)/../../../../samples/sample.rc

-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2)
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../../samples

 
 uninstall: 
 
 
 uninstall: 
 

diff --git a/contrib/samples/gizmos/multicell/makefile.bcc b/contrib/samples/gizmos/multicell/makefile.bcc
index 4a7a6f2dedc0ee5775ec03a68ac8a4557c958d24..852d2c20f29fecb4886c2c1e7ed912734882e36f 100644 (file)
--- a/contrib/samples/gizmos/multicell/makefile.bcc
+++ b/contrib/samples/gizmos/multicell/makefile.bcc
@@ -27,8 +27,8 @@ MTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include \
        -I$(LIBDIRNAME) -I.\..\..\..\..\src\tiff -I.\..\..\..\..\src\jpeg \
        -I.\..\..\..\..\src\png -I.\..\..\..\..\src\zlib -I.\..\..\..\..\src\regex \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include \
        -I$(LIBDIRNAME) -I.\..\..\..\..\src\tiff -I.\..\..\..\..\src\jpeg \
        -I.\..\..\..\..\src\png -I.\..\..\..\..\src\zlib -I.\..\..\..\..\src\regex \

-       -I.\..\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I.\..\..\..\include \
-       $(CXXFLAGS)
+       -I.\..\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I..\..\..\..\samples \
+       -I.\..\..\..\include $(CXXFLAGS)

 MTEST_OBJECTS =  \
        $(OBJS)\mtest_mtest.obj
 OBJS = \
 MTEST_OBJECTS =  \
        $(OBJS)\mtest_mtest.obj
 OBJS = \


@@ -120,6 +120,9 @@ __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -138,8 +141,6 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
 !endif
 
 __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
 !endif
 

-MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DWXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -153,7 +154,7 @@ $(OBJS)\mtest_mtest.obj: .\mtest.cpp
        $(CXX) -q -c -P -o$@ $(MTEST_CXXFLAGS) $**
 
 $(OBJS)\mtest_sample.res: .\..\..\..\..\samples\sample.rc
        $(CXX) -q -c -P -o$@ $(MTEST_CXXFLAGS) $**
 
 $(OBJS)\mtest_sample.res: .\..\..\..\..\samples\sample.rc

-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\..\src\tiff -i.\..\..\..\..\src\jpeg -i.\..\..\..\..\src\png -i.\..\..\..\..\src\zlib  -i.\..\..\..\..\src\regex -i.\..\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\..\src\tiff -i.\..\..\..\..\src\jpeg -i.\..\..\..\..\src\png -i.\..\..\..\..\src\zlib  -i.\..\..\..\..\src\regex -i.\..\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) -i..\..\..\..\samples $**

 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -162,5 +163,5 @@ clean:
 
 $(OBJS)\mtest.exe: $(MTEST_OBJECTS)  $(OBJS)\mtest_sample.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|
 
 $(OBJS)\mtest.exe: $(MTEST_OBJECTS)  $(OBJS)\mtest_sample.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|

-       c0w32.obj $(MTEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\mtest_sample.res
+       c0w32.obj $(MTEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\mtest_sample.res

 |
 |

diff --git a/contrib/samples/gizmos/multicell/makefile.vc b/contrib/samples/gizmos/multicell/makefile.vc
index b8b954e0be342a85af3b1ba697d9990f40bca4e2..731b7eae0adb3ec50c1d83da756d75d5dcf1b77d 100644 (file)
--- a/contrib/samples/gizmos/multicell/makefile.vc
+++ b/contrib/samples/gizmos/multicell/makefile.vc
@@ -21,7 +21,7 @@ MTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \
        /I.\..\..\..\..\src\tiff /I.\..\..\..\..\src\jpeg /I.\..\..\..\..\src\png \
        /I.\..\..\..\..\src\zlib /I.\..\..\..\..\src\regex \
        /I.\..\..\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_WINDOWS \
        /I.\..\..\..\..\src\tiff /I.\..\..\..\..\src\jpeg /I.\..\..\..\..\src\png \
        /I.\..\..\..\..\src\zlib /I.\..\..\..\..\src\regex \
        /I.\..\..\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_WINDOWS \

-       /I.\..\..\..\include $(CXXFLAGS)
+       /I..\..\..\..\samples /I.\..\..\..\include $(CXXFLAGS)

 MTEST_OBJECTS =  \
        $(OBJS)\mtest_sample.res \
        $(OBJS)\mtest_mtest.obj
 MTEST_OBJECTS =  \
        $(OBJS)\mtest_sample.res \
        $(OBJS)\mtest_mtest.obj


@@ -141,6 +141,9 @@ __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -214,7 +217,7 @@ $(OBJS)\mtest_mtest.obj: .\mtest.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MTEST_CXXFLAGS) $**
 
 $(OBJS)\mtest_sample.res: .\..\..\..\..\samples\sample.rc
        $(CXX) /c /nologo /TP /Fo$@ $(MTEST_CXXFLAGS) $**
 
 $(OBJS)\mtest_sample.res: .\..\..\..\..\samples\sample.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\..\src\tiff /i .\..\..\..\..\src\jpeg /i .\..\..\..\..\src\png /i .\..\..\..\..\src\zlib  /i .\..\..\..\..\src\regex /i .\..\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\..\src\tiff /i .\..\..\..\..\src\jpeg /i .\..\..\..\..\src\png /i .\..\..\..\..\src\zlib  /i .\..\..\..\..\src\regex /i .\..\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS /i ..\..\..\..\samples $**

 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -223,5 +226,5 @@ clean:
 
 $(OBJS)\mtest.exe: $(MTEST_OBJECTS) $(OBJS)\mtest_sample.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<
 
 $(OBJS)\mtest.exe: $(MTEST_OBJECTS) $(OBJS)\mtest_sample.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<

-       $(MTEST_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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
+       $(MTEST_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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

 <<
 <<

diff --git a/contrib/samples/gizmos/multicell/makefile.wat b/contrib/samples/gizmos/multicell/makefile.wat
index 1a9e2494be918b77f5fa8208cae026412160bbde..f52c5e734987aabc73e4f2f72a3e474d9c4bdcc7 100644 (file)
--- a/contrib/samples/gizmos/multicell/makefile.wat
+++ b/contrib/samples/gizmos/multicell/makefile.wat
@@ -161,14 +161,12 @@ MTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
        -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg &
        -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib &
        -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. &
        -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg &
        -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib &
        -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. &

-       $(__DLLFLAG_p) -i=.\..\..\..\include $(CXXFLAGS)
+       $(__DLLFLAG_p) -i=..\..\..\..\samples -i=.\..\..\..\include $(CXXFLAGS)

 MTEST_OBJECTS =  &
        $(OBJS)\mtest_mtest.obj
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 
 MTEST_OBJECTS =  &
        $(OBJS)\mtest_mtest.obj
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -182,7 +180,7 @@ $(OBJS)\mtest_mtest.obj :  .AUTODEPEND .\mtest.cpp
        $(CXX) -zq -fo=$^@ $(MTEST_CXXFLAGS) $<
 
 $(OBJS)\mtest_sample.res :  .AUTODEPEND .\..\..\..\..\samples\sample.rc
        $(CXX) -zq -fo=$^@ $(MTEST_CXXFLAGS) $<
 
 $(OBJS)\mtest_sample.res :  .AUTODEPEND .\..\..\..\..\samples\sample.rc

-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib  -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) $<
+       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib  -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=..\..\..\..\samples $<

 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -198,6 +196,6 @@ $(OBJS)\mtest.exe :  $(MTEST_OBJECTS) $(OBJS)\mtest_sample.res
        @%append $(OBJS)\mtest.lbc option incremental
        @%append $(OBJS)\mtest.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(MTEST_OBJECTS)) do @%append $(OBJS)\mtest.lbc file %i
        @%append $(OBJS)\mtest.lbc option incremental
        @%append $(OBJS)\mtest.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(MTEST_OBJECTS)) do @%append $(OBJS)\mtest.lbc file %i

-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\mtest.lbc library %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\mtest.lbc library %i

        @%append $(OBJS)\mtest.lbc option resource=$(OBJS)\mtest_sample.res
        wlink @$(OBJS)\mtest.lbc
        @%append $(OBJS)\mtest.lbc option resource=$(OBJS)\mtest_sample.res
        wlink @$(OBJS)\mtest.lbc

diff --git a/contrib/samples/gizmos/multicell/multicell.dsp b/contrib/samples/gizmos/multicell/multicell.dsp
index ab45281e90bd28f9129c19c93a76433e82598eb1..6ceaba25d3e3df92c4ff77bc381c0651fb2dee88 100644 (file)
--- a/contrib/samples/gizmos/multicell/multicell.dsp
+++ b/contrib/samples/gizmos/multicell/multicell.dsp
@@ -55,12 +55,12 @@ RSC=rc.exe
 # PROP Output_Dir "vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\mtest"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswd"
 # PROP Intermediate_Dir "vc_mswd\mtest"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -80,12 +80,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_msw"
 # PROP Intermediate_Dir "vc_msw\mtest"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_msw"
 # PROP Intermediate_Dir "vc_msw\mtest"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_msw\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_msw\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_msw\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_msw\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_msw" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_msw" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -105,12 +105,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\mtest"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswud"
 # PROP Intermediate_Dir "vc_mswud\mtest"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -130,12 +130,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\mtest"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswu"
 # PROP Intermediate_Dir "vc_mswu\mtest"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswu\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswu\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswu\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswu\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -155,12 +155,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\mtest"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivd"
 # PROP Intermediate_Dir "vc_mswunivd\mtest"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivd" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivd" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -180,12 +180,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\mtest"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswuniv"
 # PROP Intermediate_Dir "vc_mswuniv\mtest"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuniv" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuniv" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -205,12 +205,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\mtest"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivud"
 # PROP Intermediate_Dir "vc_mswunivud\mtest"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivud" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivud" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -230,12 +230,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\mtest"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivu"
 # PROP Intermediate_Dir "vc_mswunivu\mtest"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivu" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivu" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -255,12 +255,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\mtest"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswddll"
 # PROP Intermediate_Dir "vc_mswddll\mtest"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -280,12 +280,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\mtest"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswdll"
 # PROP Intermediate_Dir "vc_mswdll\mtest"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswdll\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswdll\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswdll\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswdll\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -305,12 +305,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\mtest"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswuddll"
 # PROP Intermediate_Dir "vc_mswuddll\mtest"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -330,12 +330,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\mtest"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswudll"
 # PROP Intermediate_Dir "vc_mswudll\mtest"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswudll\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswudll\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswudll\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswudll\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -355,12 +355,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\mtest"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivddll"
 # PROP Intermediate_Dir "vc_mswunivddll\mtest"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -380,12 +380,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\mtest"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivdll"
 # PROP Intermediate_Dir "vc_mswunivdll\mtest"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivdll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivdll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -405,12 +405,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\mtest"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivuddll"
 # PROP Intermediate_Dir "vc_mswunivuddll\mtest"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\mtest.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivuddll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivuddll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -430,12 +430,12 @@ LINK32=link.exe
 # PROP Output_Dir "vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\mtest"
 # PROP Target_Dir ""
 # PROP Output_Dir "vc_mswunivudll"
 # PROP Intermediate_Dir "vc_mswunivudll\mtest"
 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
-# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c
+# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\mtest.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_mswunivudll" /I ".\..\..\..\..\src\tiff" /I ".\..\..\..\..\src\jpeg" /I ".\..\..\..\..\src\png" /I ".\..\..\..\..\src\zlib" /I ".\..\..\..\..\src\regex" /I ".\..\..\..\..\src\expat\lib" /I "." /I "..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c

 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32

-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i .\..\..\..\include
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_mswunivudll" /i ".\..\..\..\..\src\tiff" /i ".\..\..\..\..\src\jpeg" /i ".\..\..\..\..\src\png" /i ".\..\..\..\..\src\zlib" /i ".\..\..\..\..\src\regex" /i ".\..\..\..\..\src\expat\lib" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i "..\..\..\..\samples" /i .\..\..\..\include

 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo


@@ -468,11 +468,11 @@ LINK32=link.exe
 # PROP Default_Filter ""
 # Begin Source File
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=.\..\..\..\..\samples\sample.rc
+SOURCE=.\mtest.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\mtest.cpp
+SOURCE=.\..\..\..\..\samples\sample.rc

 # End Source File
 # End Group
 # End Target
 # End Source File
 # End Group
 # End Target

diff --git a/contrib/samples/gizmos/splittree/Makefile.in b/contrib/samples/gizmos/splittree/Makefile.in
index c4eee9071a1cbe44aed8694ce552bda1463bebe4..47ecf176cef78a506fb6f9e28d1c08e2302204c2 100644 (file)
--- a/contrib/samples/gizmos/splittree/Makefile.in
+++ b/contrib/samples/gizmos/splittree/Makefile.in
@@ -36,7 +36,8 @@ LIBDIRNAME = $(top_builddir)lib
 SPLITTREE_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) \
 SPLITTREE_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) $(__DLLFLAG_p) -I$(srcdir)/../../../include $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -I../../../../samples \
+       -I$(srcdir)/../../../include $(CXXFLAGS)

 SPLITTREE_OBJECTS =  \
        $(__splittree___win32rc) \
        splittree_tree.o
 SPLITTREE_OBJECTS =  \
        $(__splittree___win32rc) \
        splittree_tree.o


@@ -104,8 +105,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \

-       $(__DLLFLAG_p_1) -i $(srcdir)/../../../include -o splittree$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../../samples/sample.r
+       $(__DLLFLAG_p_1) -i ../../../../samples -i $(srcdir)/../../../include -o \
+       splittree$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
+       ../../../../samples/sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)


@@ -146,7 +148,7 @@ splittree$(EXEEXT): $(SPLITTREE_OBJECTS) $(__splittree___win32rc)
        $(__splittree___mac_setfilecmd)
 
 splittree_sample_rc.o: $(srcdir)/../../../../samples/sample.rc
        $(__splittree___mac_setfilecmd)
 
 splittree_sample_rc.o: $(srcdir)/../../../../samples/sample.rc

-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2)
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../../samples

 
 splittree_tree.o: $(srcdir)/tree.cpp
        $(CXXC) -c -o $@ $(SPLITTREE_CXXFLAGS) $<
 
 splittree_tree.o: $(srcdir)/tree.cpp
        $(CXXC) -c -o $@ $(SPLITTREE_CXXFLAGS) $<

diff --git a/contrib/samples/gizmos/splittree/makefile.bcc b/contrib/samples/gizmos/splittree/makefile.bcc
index c285109ce95dbf3b5c8c52b35827081f82c93e02..747ec3d20ecd6d094b23fa76980742d62b44f1ce 100644 (file)
--- a/contrib/samples/gizmos/splittree/makefile.bcc
+++ b/contrib/samples/gizmos/splittree/makefile.bcc
@@ -29,8 +29,8 @@ SPLITTREE_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include \
        -I$(LIBDIRNAME) -I.\..\..\..\..\src\tiff -I.\..\..\..\..\src\jpeg \
        -I.\..\..\..\..\src\png -I.\..\..\..\..\src\zlib -I.\..\..\..\..\src\regex \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include \
        -I$(LIBDIRNAME) -I.\..\..\..\..\src\tiff -I.\..\..\..\..\src\jpeg \
        -I.\..\..\..\..\src\png -I.\..\..\..\..\src\zlib -I.\..\..\..\..\src\regex \

-       -I.\..\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I.\..\..\..\include \
-       $(CXXFLAGS)
+       -I.\..\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I..\..\..\..\samples \
+       -I.\..\..\..\include $(CXXFLAGS)

 SPLITTREE_OBJECTS =  \
        $(OBJS)\splittree_tree.obj
 
 SPLITTREE_OBJECTS =  \
        $(OBJS)\splittree_tree.obj
 


@@ -120,6 +120,9 @@ __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -138,8 +141,6 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
 !endif
 
 __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
 !endif
 

-MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DWXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -150,7 +151,7 @@ $(OBJS):
 all: $(OBJS)\splittree.exe
 
 $(OBJS)\splittree_sample.res: .\..\..\..\..\samples\sample.rc
 all: $(OBJS)\splittree.exe
 
 $(OBJS)\splittree_sample.res: .\..\..\..\..\samples\sample.rc

-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\..\src\tiff -i.\..\..\..\..\src\jpeg -i.\..\..\..\..\src\png -i.\..\..\..\..\src\zlib  -i.\..\..\..\..\src\regex -i.\..\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\..\src\tiff -i.\..\..\..\..\src\jpeg -i.\..\..\..\..\src\png -i.\..\..\..\..\src\zlib  -i.\..\..\..\..\src\regex -i.\..\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) -i..\..\..\..\samples $**

 
 $(OBJS)\splittree_tree.obj: .\tree.cpp
        $(CXX) -q -c -P -o$@ $(SPLITTREE_CXXFLAGS) $**
 
 $(OBJS)\splittree_tree.obj: .\tree.cpp
        $(CXX) -q -c -P -o$@ $(SPLITTREE_CXXFLAGS) $**


@@ -162,5 +163,5 @@ clean:
 
 $(OBJS)\splittree.exe: $(SPLITTREE_OBJECTS)  $(OBJS)\splittree_sample.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|
 
 $(OBJS)\splittree.exe: $(SPLITTREE_OBJECTS)  $(OBJS)\splittree_sample.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|

-       c0w32.obj $(SPLITTREE_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\splittree_sample.res
+       c0w32.obj $(SPLITTREE_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\splittree_sample.res

 |
 |

diff --git a/contrib/samples/gizmos/splittree/makefile.vc b/contrib/samples/gizmos/splittree/makefile.vc
index 33fb4c3392de4205337fc4b1d58c21b98bc6b588..5848785d90c03d28463f51a56803868a8c0b6c58 100644 (file)
--- a/contrib/samples/gizmos/splittree/makefile.vc
+++ b/contrib/samples/gizmos/splittree/makefile.vc
@@ -23,7 +23,7 @@ SPLITTREE_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \
        /I.\..\..\..\..\src\tiff /I.\..\..\..\..\src\jpeg /I.\..\..\..\..\src\png \
        /I.\..\..\..\..\src\zlib /I.\..\..\..\..\src\regex \
        /I.\..\..\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_WINDOWS \
        /I.\..\..\..\..\src\tiff /I.\..\..\..\..\src\jpeg /I.\..\..\..\..\src\png \
        /I.\..\..\..\..\src\zlib /I.\..\..\..\..\src\regex \
        /I.\..\..\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_WINDOWS \

-       /I.\..\..\..\include $(CXXFLAGS)
+       /I..\..\..\..\samples /I.\..\..\..\include $(CXXFLAGS)

 SPLITTREE_OBJECTS =  \
        $(OBJS)\splittree_sample.res \
        $(OBJS)\splittree_tree.obj
 SPLITTREE_OBJECTS =  \
        $(OBJS)\splittree_sample.res \
        $(OBJS)\splittree_tree.obj


@@ -141,6 +141,9 @@ __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -211,7 +214,7 @@ $(OBJS):
 all: $(OBJS)\splittree.exe
 
 $(OBJS)\splittree_sample.res: .\..\..\..\..\samples\sample.rc
 all: $(OBJS)\splittree.exe
 
 $(OBJS)\splittree_sample.res: .\..\..\..\..\samples\sample.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\..\src\tiff /i .\..\..\..\..\src\jpeg /i .\..\..\..\..\src\png /i .\..\..\..\..\src\zlib  /i .\..\..\..\..\src\regex /i .\..\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\..\src\tiff /i .\..\..\..\..\src\jpeg /i .\..\..\..\..\src\png /i .\..\..\..\..\src\zlib  /i .\..\..\..\..\src\regex /i .\..\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS /i ..\..\..\..\samples $**

 
 $(OBJS)\splittree_tree.obj: .\tree.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(SPLITTREE_CXXFLAGS) $**
 
 $(OBJS)\splittree_tree.obj: .\tree.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(SPLITTREE_CXXFLAGS) $**


@@ -223,5 +226,5 @@ clean:
 
 $(OBJS)\splittree.exe: $(SPLITTREE_OBJECTS) $(OBJS)\splittree_sample.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<
 
 $(OBJS)\splittree.exe: $(SPLITTREE_OBJECTS) $(OBJS)\splittree_sample.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<

-       $(SPLITTREE_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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
+       $(SPLITTREE_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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

 <<
 <<

diff --git a/contrib/samples/gizmos/splittree/makefile.wat b/contrib/samples/gizmos/splittree/makefile.wat
index bc628cf166028d7c781d28fa4ff795ee500f41c6..663e2ee82c73afa0355124f7573278e2747da317 100644 (file)
--- a/contrib/samples/gizmos/splittree/makefile.wat
+++ b/contrib/samples/gizmos/splittree/makefile.wat
@@ -163,12 +163,10 @@ SPLITTREE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
        -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg &
        -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib &
        -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. &
        -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg &
        -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib &
        -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. &

-       $(__DLLFLAG_p) -i=.\..\..\..\include $(CXXFLAGS)
+       $(__DLLFLAG_p) -i=..\..\..\..\samples -i=.\..\..\..\include $(CXXFLAGS)

 SPLITTREE_OBJECTS =  &
        $(OBJS)\splittree_tree.obj
 
 SPLITTREE_OBJECTS =  &
        $(OBJS)\splittree_tree.obj
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -179,7 +177,7 @@ $(OBJS) :
 all : .SYMBOLIC $(OBJS)\splittree.exe
 
 $(OBJS)\splittree_sample.res :  .AUTODEPEND .\..\..\..\..\samples\sample.rc
 all : .SYMBOLIC $(OBJS)\splittree.exe
 
 $(OBJS)\splittree_sample.res :  .AUTODEPEND .\..\..\..\..\samples\sample.rc

-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib  -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) $<
+       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib  -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=..\..\..\..\samples $<

 
 $(OBJS)\splittree_tree.obj :  .AUTODEPEND .\tree.cpp
        $(CXX) -zq -fo=$^@ $(SPLITTREE_CXXFLAGS) $<
 
 $(OBJS)\splittree_tree.obj :  .AUTODEPEND .\tree.cpp
        $(CXX) -zq -fo=$^@ $(SPLITTREE_CXXFLAGS) $<


@@ -198,6 +196,6 @@ $(OBJS)\splittree.exe :  $(SPLITTREE_OBJECTS) $(OBJS)\splittree_sample.res
        @%append $(OBJS)\splittree.lbc option incremental
        @%append $(OBJS)\splittree.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(SPLITTREE_OBJECTS)) do @%append $(OBJS)\splittree.lbc file %i
        @%append $(OBJS)\splittree.lbc option incremental
        @%append $(OBJS)\splittree.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(SPLITTREE_OBJECTS)) do @%append $(OBJS)\splittree.lbc file %i

-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\splittree.lbc library %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\splittree.lbc library %i

        @%append $(OBJS)\splittree.lbc option resource=$(OBJS)\splittree_sample.res
        wlink @$(OBJS)\splittree.lbc
        @%append $(OBJS)\splittree.lbc option resource=$(OBJS)\splittree_sample.res
        wlink @$(OBJS)\splittree.lbc

diff --git a/contrib/samples/mmedia/Makefile.in b/contrib/samples/mmedia/Makefile.in
index 429e33663b3219dd19ddf01e5e582e74da39645f..432dccfed2a304471e78caaf642e11a47a8714ee 100644 (file)
--- a/contrib/samples/mmedia/Makefile.in
+++ b/contrib/samples/mmedia/Makefile.in
@@ -36,7 +36,8 @@ LIBDIRNAME = $(top_builddir)lib
 MMBOARD_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) \
 MMBOARD_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) $(__DLLFLAG_p) -I$(srcdir)/../../include $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -I../../../samples -I$(srcdir)/../../include \
+       $(CXXFLAGS)

 MMBOARD_OBJECTS =  \
        mmboard_mmboard.o \
        mmboard_mmbman.o \
 MMBOARD_OBJECTS =  \
        mmboard_mmboard.o \
        mmboard_mmbman.o \


@@ -105,8 +106,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \

-       $(__DLLFLAG_p_1) -i $(srcdir)/../../include -o mmboard$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r
+       $(__DLLFLAG_p_1) -i ../../../samples -i $(srcdir)/../../include -o \
+       mmboard$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
+       ../../../samples/sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)


@@ -153,7 +155,7 @@ mmboard_mmboard.o: $(srcdir)/mmboard.cpp
        $(CXXC) -c -o $@ $(MMBOARD_CXXFLAGS) $<
 
 mmboard_mmboard_rc.o: $(srcdir)/mmboard.rc
        $(CXXC) -c -o $@ $(MMBOARD_CXXFLAGS) $<
 
 mmboard_mmboard_rc.o: $(srcdir)/mmboard.rc

-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../include
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples --include-dir $(srcdir)/../../include

 
 uninstall: 
 
 
 uninstall: 
 

diff --git a/contrib/samples/mmedia/makefile.bcc b/contrib/samples/mmedia/makefile.bcc
index 481535d2932ccb25af4e843e5302f8bcfdde38d1..00ffb409340d97c82753c10a85fbd4f4694c8feb 100644 (file)
--- a/contrib/samples/mmedia/makefile.bcc
+++ b/contrib/samples/mmedia/makefile.bcc
@@ -27,7 +27,8 @@ MMBOARD_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \
        -I$(LIBDIRNAME) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg \
        -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \
        -I$(LIBDIRNAME) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg \
        -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex \

-       -I.\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS)
+       -I.\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I..\..\..\samples \
+       -I.\..\..\include $(CXXFLAGS)

 MMBOARD_OBJECTS =  \
        $(OBJS)\mmboard_mmboard.obj \
        $(OBJS)\mmboard_mmbman.obj
 MMBOARD_OBJECTS =  \
        $(OBJS)\mmboard_mmboard.obj \
        $(OBJS)\mmboard_mmbman.obj


@@ -120,6 +121,9 @@ __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -138,8 +142,6 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
 !endif
 
 __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
 !endif
 

-MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DWXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -156,7 +158,7 @@ $(OBJS)\mmboard_mmboard.obj: .\mmboard.cpp
        $(CXX) -q -c -P -o$@ $(MMBOARD_CXXFLAGS) $**
 
 $(OBJS)\mmboard_mmboard.res: .\mmboard.rc
        $(CXX) -q -c -P -o$@ $(MMBOARD_CXXFLAGS) $**
 
 $(OBJS)\mmboard_mmboard.res: .\mmboard.rc

-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib  -i.\..\..\..\src\regex -i.\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) -i.\..\..\include $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib  -i.\..\..\..\src\regex -i.\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) -i..\..\..\samples -i.\..\..\include $**

 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -165,5 +167,5 @@ clean:
 
 $(OBJS)\mmboard.exe: $(MMBOARD_OBJECTS)  $(OBJS)\mmboard_mmboard.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|
 
 $(OBJS)\mmboard.exe: $(MMBOARD_OBJECTS)  $(OBJS)\mmboard_mmboard.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|

-       c0w32.obj $(MMBOARD_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\mmboard_mmboard.res
+       c0w32.obj $(MMBOARD_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\mmboard_mmboard.res

 |
 |

diff --git a/contrib/samples/mmedia/makefile.vc b/contrib/samples/mmedia/makefile.vc
index 434b948823d748b9d5eb05e6983afafb19e55f8b..8d8755c2149480ad433879bef795c78e903e7c89 100644 (file)
--- a/contrib/samples/mmedia/makefile.vc
+++ b/contrib/samples/mmedia/makefile.vc
@@ -20,7 +20,7 @@ MMBOARD_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \
        /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \
        /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \
        /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \
        /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \

-       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\include $(CXXFLAGS)
+       $(__DLLFLAG_p) /D_WINDOWS /I..\..\..\samples /I.\..\..\include $(CXXFLAGS)

 MMBOARD_OBJECTS =  \
        $(OBJS)\mmboard_mmboard.obj \
        $(OBJS)\mmboard_mmbman.obj \
 MMBOARD_OBJECTS =  \
        $(OBJS)\mmboard_mmboard.obj \
        $(OBJS)\mmboard_mmbman.obj \


@@ -141,6 +141,9 @@ __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -217,7 +220,7 @@ $(OBJS)\mmboard_mmboard.obj: .\mmboard.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MMBOARD_CXXFLAGS) $**
 
 $(OBJS)\mmboard_mmboard.res: .\mmboard.rc
        $(CXX) /c /nologo /TP /Fo$@ $(MMBOARD_CXXFLAGS) $**
 
 $(OBJS)\mmboard_mmboard.res: .\mmboard.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\src\tiff /i .\..\..\..\src\jpeg /i .\..\..\..\src\png /i .\..\..\..\src\zlib  /i .\..\..\..\src\regex /i .\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\include $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\src\tiff /i .\..\..\..\src\jpeg /i .\..\..\..\src\png /i .\..\..\..\src\zlib  /i .\..\..\..\src\regex /i .\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS /i ..\..\..\samples /i .\..\..\include $**

 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -226,5 +229,5 @@ clean:
 
 $(OBJS)\mmboard.exe: $(MMBOARD_OBJECTS) $(OBJS)\mmboard_mmboard.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<
 
 $(OBJS)\mmboard.exe: $(MMBOARD_OBJECTS) $(OBJS)\mmboard_mmboard.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<

-       $(MMBOARD_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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
+       $(MMBOARD_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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

 <<
 <<

diff --git a/contrib/samples/mmedia/makefile.wat b/contrib/samples/mmedia/makefile.wat
index 7d7b63f2b5d71409a666c2417bbb303491c80a00..dc256bf65c05a4b87d40d66ac6d556ab594f8e85 100644 (file)
--- a/contrib/samples/mmedia/makefile.wat
+++ b/contrib/samples/mmedia/makefile.wat
@@ -160,15 +160,13 @@ MMBOARD_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
        $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) &
        -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png &
        -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib &
        $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) &
        -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png &
        -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib &

-       -i=. $(__DLLFLAG_p) -i=.\..\..\include $(CXXFLAGS)
+       -i=. $(__DLLFLAG_p) -i=..\..\..\samples -i=.\..\..\include $(CXXFLAGS)

 MMBOARD_OBJECTS =  &
        $(OBJS)\mmboard_mmboard.obj &
        $(OBJS)\mmboard_mmbman.obj
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 
 MMBOARD_OBJECTS =  &
        $(OBJS)\mmboard_mmboard.obj &
        $(OBJS)\mmboard_mmbman.obj
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -185,7 +183,7 @@ $(OBJS)\mmboard_mmboard.obj :  .AUTODEPEND .\mmboard.cpp
        $(CXX) -zq -fo=$^@ $(MMBOARD_CXXFLAGS) $<
 
 $(OBJS)\mmboard_mmboard.res :  .AUTODEPEND .\mmboard.rc
        $(CXX) -zq -fo=$^@ $(MMBOARD_CXXFLAGS) $<
 
 $(OBJS)\mmboard_mmboard.res :  .AUTODEPEND .\mmboard.rc

-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib  -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=.\..\..\include $<
+       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib  -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=..\..\..\samples -i=.\..\..\include $<

 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -201,6 +199,6 @@ $(OBJS)\mmboard.exe :  $(MMBOARD_OBJECTS) $(OBJS)\mmboard_mmboard.res
        @%append $(OBJS)\mmboard.lbc option incremental
        @%append $(OBJS)\mmboard.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(MMBOARD_OBJECTS)) do @%append $(OBJS)\mmboard.lbc file %i
        @%append $(OBJS)\mmboard.lbc option incremental
        @%append $(OBJS)\mmboard.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(MMBOARD_OBJECTS)) do @%append $(OBJS)\mmboard.lbc file %i

-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\mmboard.lbc library %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\mmboard.lbc library %i

        @%append $(OBJS)\mmboard.lbc option resource=$(OBJS)\mmboard_mmboard.res
        wlink @$(OBJS)\mmboard.lbc
        @%append $(OBJS)\mmboard.lbc option resource=$(OBJS)\mmboard_mmboard.res
        wlink @$(OBJS)\mmboard.lbc

diff --git a/contrib/samples/ogl/ogledit/Makefile.in b/contrib/samples/ogl/ogledit/Makefile.in
index b9683ee0933817108329789963fc155ac1bdfe83..8cd48c985aab0f78e19e1e0f7a5a0dbd4e580802 100644 (file)
--- a/contrib/samples/ogl/ogledit/Makefile.in
+++ b/contrib/samples/ogl/ogledit/Makefile.in
@@ -36,7 +36,8 @@ LIBDIRNAME = $(top_builddir)lib
 OGLEDIT_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) \
 OGLEDIT_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) $(__DLLFLAG_p) -I$(srcdir)/../../../include $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -I../../../../samples \
+       -I$(srcdir)/../../../include $(CXXFLAGS)

 OGLEDIT_OBJECTS =  \
        ogledit_ogledit.o \
        ogledit_doc.o \
 OGLEDIT_OBJECTS =  \
        ogledit_ogledit.o \
        ogledit_doc.o \


@@ -107,8 +108,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \

-       $(__DLLFLAG_p_1) -i $(srcdir)/../../../include -o ogledit$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../../samples/sample.r
+       $(__DLLFLAG_p_1) -i ../../../../samples -i $(srcdir)/../../../include -o \
+       ogledit$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
+       ../../../../samples/sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)


@@ -155,7 +157,7 @@ ogledit_ogledit.o: $(srcdir)/ogledit.cpp
        $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
 
 ogledit_ogledit_rc.o: $(srcdir)/ogledit.rc
        $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
 
 ogledit_ogledit_rc.o: $(srcdir)/ogledit.rc

-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../include
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../../samples --include-dir $(srcdir)/../../../include

 
 ogledit_palette.o: $(srcdir)/palette.cpp
        $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
 
 ogledit_palette.o: $(srcdir)/palette.cpp
        $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<

diff --git a/contrib/samples/ogl/ogledit/makefile.bcc b/contrib/samples/ogl/ogledit/makefile.bcc
index bf10e30757c0fb7b6a701562f7787e9422f111a6..8dce70d5be5222ff941ffd79c2b60b9fb49e6d32 100644 (file)
--- a/contrib/samples/ogl/ogledit/makefile.bcc
+++ b/contrib/samples/ogl/ogledit/makefile.bcc
@@ -29,8 +29,8 @@ OGLEDIT_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include \
        -I$(LIBDIRNAME) -I.\..\..\..\..\src\tiff -I.\..\..\..\..\src\jpeg \
        -I.\..\..\..\..\src\png -I.\..\..\..\..\src\zlib -I.\..\..\..\..\src\regex \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include \
        -I$(LIBDIRNAME) -I.\..\..\..\..\src\tiff -I.\..\..\..\..\src\jpeg \
        -I.\..\..\..\..\src\png -I.\..\..\..\..\src\zlib -I.\..\..\..\..\src\regex \

-       -I.\..\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I.\..\..\..\include \
-       $(CXXFLAGS)
+       -I.\..\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I..\..\..\..\samples \
+       -I.\..\..\..\include $(CXXFLAGS)

 OGLEDIT_OBJECTS =  \
        $(OBJS)\ogledit_ogledit.obj \
        $(OBJS)\ogledit_doc.obj \
 OGLEDIT_OBJECTS =  \
        $(OBJS)\ogledit_ogledit.obj \
        $(OBJS)\ogledit_doc.obj \


@@ -123,6 +123,9 @@ __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -141,8 +144,6 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
 !endif
 
 __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
 !endif
 

-MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DWXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -159,7 +160,7 @@ $(OBJS)\ogledit_ogledit.obj: .\ogledit.cpp
        $(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $**
 
 $(OBJS)\ogledit_ogledit.res: .\ogledit.rc
        $(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $**
 
 $(OBJS)\ogledit_ogledit.res: .\ogledit.rc

-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\..\src\tiff -i.\..\..\..\..\src\jpeg -i.\..\..\..\..\src\png -i.\..\..\..\..\src\zlib  -i.\..\..\..\..\src\regex -i.\..\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) -i.\..\..\..\include $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\..\src\tiff -i.\..\..\..\..\src\jpeg -i.\..\..\..\..\src\png -i.\..\..\..\..\src\zlib  -i.\..\..\..\..\src\regex -i.\..\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) -i..\..\..\..\samples -i.\..\..\..\include $**

 
 $(OBJS)\ogledit_palette.obj: .\palette.cpp
        $(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $**
 
 $(OBJS)\ogledit_palette.obj: .\palette.cpp
        $(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $**


@@ -174,5 +175,5 @@ clean:
 
 $(OBJS)\ogledit.exe: $(OGLEDIT_OBJECTS)  $(OBJS)\ogledit_ogledit.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|
 
 $(OBJS)\ogledit.exe: $(OGLEDIT_OBJECTS)  $(OBJS)\ogledit_ogledit.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|

-       c0w32.obj $(OGLEDIT_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\ogledit_ogledit.res
+       c0w32.obj $(OGLEDIT_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\ogledit_ogledit.res

 |
 |

diff --git a/contrib/samples/ogl/ogledit/makefile.vc b/contrib/samples/ogl/ogledit/makefile.vc
index a8c09880bd7ae95a03f3a5d6ac437f649aedde50..fe03bff12c780ff8326def269d4f9ececce55611 100644 (file)
--- a/contrib/samples/ogl/ogledit/makefile.vc
+++ b/contrib/samples/ogl/ogledit/makefile.vc
@@ -23,7 +23,7 @@ OGLEDIT_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \
        /I.\..\..\..\..\src\tiff /I.\..\..\..\..\src\jpeg /I.\..\..\..\..\src\png \
        /I.\..\..\..\..\src\zlib /I.\..\..\..\..\src\regex \
        /I.\..\..\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_WINDOWS \
        /I.\..\..\..\..\src\tiff /I.\..\..\..\..\src\jpeg /I.\..\..\..\..\src\png \
        /I.\..\..\..\..\src\zlib /I.\..\..\..\..\src\regex \
        /I.\..\..\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_WINDOWS \

-       /I.\..\..\..\include $(CXXFLAGS)
+       /I..\..\..\..\samples /I.\..\..\..\include $(CXXFLAGS)

 OGLEDIT_OBJECTS =  \
        $(OBJS)\ogledit_ogledit.obj \
        $(OBJS)\ogledit_doc.obj \
 OGLEDIT_OBJECTS =  \
        $(OBJS)\ogledit_ogledit.obj \
        $(OBJS)\ogledit_doc.obj \


@@ -144,6 +144,9 @@ __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -220,7 +223,7 @@ $(OBJS)\ogledit_ogledit.obj: .\ogledit.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(OGLEDIT_CXXFLAGS) $**
 
 $(OBJS)\ogledit_ogledit.res: .\ogledit.rc
        $(CXX) /c /nologo /TP /Fo$@ $(OGLEDIT_CXXFLAGS) $**
 
 $(OBJS)\ogledit_ogledit.res: .\ogledit.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\..\src\tiff /i .\..\..\..\..\src\jpeg /i .\..\..\..\..\src\png /i .\..\..\..\..\src\zlib  /i .\..\..\..\..\src\regex /i .\..\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\include $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\..\src\tiff /i .\..\..\..\..\src\jpeg /i .\..\..\..\..\src\png /i .\..\..\..\..\src\zlib  /i .\..\..\..\..\src\regex /i .\..\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS /i ..\..\..\..\samples /i .\..\..\..\include $**

 
 $(OBJS)\ogledit_palette.obj: .\palette.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(OGLEDIT_CXXFLAGS) $**
 
 $(OBJS)\ogledit_palette.obj: .\palette.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(OGLEDIT_CXXFLAGS) $**


@@ -235,5 +238,5 @@ clean:
 
 $(OBJS)\ogledit.exe: $(OGLEDIT_OBJECTS) $(OBJS)\ogledit_ogledit.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<
 
 $(OBJS)\ogledit.exe: $(OGLEDIT_OBJECTS) $(OBJS)\ogledit_ogledit.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<

-       $(OGLEDIT_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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
+       $(OGLEDIT_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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

 <<
 <<

diff --git a/contrib/samples/ogl/ogledit/makefile.wat b/contrib/samples/ogl/ogledit/makefile.wat
index a23b577d879626b8c7567f50e770a15511383cc7..c72b56615e687c9458754ed2bd2e99b255a98889 100644 (file)
--- a/contrib/samples/ogl/ogledit/makefile.wat
+++ b/contrib/samples/ogl/ogledit/makefile.wat
@@ -163,15 +163,13 @@ OGLEDIT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
        -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg &
        -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib &
        -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. &
        -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg &
        -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib &
        -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. &

-       $(__DLLFLAG_p) -i=.\..\..\..\include $(CXXFLAGS)
+       $(__DLLFLAG_p) -i=..\..\..\..\samples -i=.\..\..\..\include $(CXXFLAGS)

 OGLEDIT_OBJECTS =  &
        $(OBJS)\ogledit_ogledit.obj &
        $(OBJS)\ogledit_doc.obj &
        $(OBJS)\ogledit_view.obj &
        $(OBJS)\ogledit_palette.obj
 
 OGLEDIT_OBJECTS =  &
        $(OBJS)\ogledit_ogledit.obj &
        $(OBJS)\ogledit_doc.obj &
        $(OBJS)\ogledit_view.obj &
        $(OBJS)\ogledit_palette.obj
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -188,7 +186,7 @@ $(OBJS)\ogledit_ogledit.obj :  .AUTODEPEND .\ogledit.cpp
        $(CXX) -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $<
 
 $(OBJS)\ogledit_ogledit.res :  .AUTODEPEND .\ogledit.rc
        $(CXX) -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $<
 
 $(OBJS)\ogledit_ogledit.res :  .AUTODEPEND .\ogledit.rc

-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib  -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=.\..\..\..\include $<
+       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib  -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=..\..\..\..\samples -i=.\..\..\..\include $<

 
 $(OBJS)\ogledit_palette.obj :  .AUTODEPEND .\palette.cpp
        $(CXX) -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $<
 
 $(OBJS)\ogledit_palette.obj :  .AUTODEPEND .\palette.cpp
        $(CXX) -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $<


@@ -210,6 +208,6 @@ $(OBJS)\ogledit.exe :  $(OGLEDIT_OBJECTS) $(OBJS)\ogledit_ogledit.res
        @%append $(OBJS)\ogledit.lbc option incremental
        @%append $(OBJS)\ogledit.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(OGLEDIT_OBJECTS)) do @%append $(OBJS)\ogledit.lbc file %i
        @%append $(OBJS)\ogledit.lbc option incremental
        @%append $(OBJS)\ogledit.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(OGLEDIT_OBJECTS)) do @%append $(OBJS)\ogledit.lbc file %i

-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\ogledit.lbc library %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\ogledit.lbc library %i

        @%append $(OBJS)\ogledit.lbc option resource=$(OBJS)\ogledit_ogledit.res
        wlink @$(OBJS)\ogledit.lbc
        @%append $(OBJS)\ogledit.lbc option resource=$(OBJS)\ogledit_ogledit.res
        wlink @$(OBJS)\ogledit.lbc

diff --git a/contrib/samples/ogl/studio/Makefile.in b/contrib/samples/ogl/studio/Makefile.in
index 78d78291de41a1020363eeb43a8a6cad192115fe..e22235f422e0c80a9b30d8f8ab93b5d924ae8e65 100644 (file)
--- a/contrib/samples/ogl/studio/Makefile.in
+++ b/contrib/samples/ogl/studio/Makefile.in
@@ -36,7 +36,8 @@ LIBDIRNAME = $(top_builddir)lib
 OGLEDIT_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) \
 OGLEDIT_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) $(__DLLFLAG_p) -I$(srcdir)/../../../include $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -I../../../../samples \
+       -I$(srcdir)/../../../include $(CXXFLAGS)

 OGLEDIT_OBJECTS =  \
        ogledit_studio.o \
        ogledit_doc.o \
 OGLEDIT_OBJECTS =  \
        ogledit_studio.o \
        ogledit_doc.o \


@@ -113,8 +114,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \

-       $(__DLLFLAG_p_1) -i $(srcdir)/../../../include -o ogledit$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../../samples/sample.r
+       $(__DLLFLAG_p_1) -i ../../../../samples -i $(srcdir)/../../../include -o \
+       ogledit$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
+       ../../../../samples/sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)


@@ -187,7 +189,7 @@ ogledit_studio.o: $(srcdir)/studio.cpp
        $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
 
 ogledit_studio_rc.o: $(srcdir)/studio.rc
        $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
 
 ogledit_studio_rc.o: $(srcdir)/studio.rc

-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../include
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../../samples --include-dir $(srcdir)/../../../include

 
 ogledit_symbols.o: $(srcdir)/symbols.cpp
        $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
 
 ogledit_symbols.o: $(srcdir)/symbols.cpp
        $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<

diff --git a/contrib/samples/ogl/studio/makefile.bcc b/contrib/samples/ogl/studio/makefile.bcc
index 8ee7d303c5764c89f57838d794b7ac2c88846757..6afbacd73646e0f8f669c7ebdb9fb4f243249fd5 100644 (file)
--- a/contrib/samples/ogl/studio/makefile.bcc
+++ b/contrib/samples/ogl/studio/makefile.bcc
@@ -29,8 +29,8 @@ OGLEDIT_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include \
        -I$(LIBDIRNAME) -I.\..\..\..\..\src\tiff -I.\..\..\..\..\src\jpeg \
        -I.\..\..\..\..\src\png -I.\..\..\..\..\src\zlib -I.\..\..\..\..\src\regex \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include \
        -I$(LIBDIRNAME) -I.\..\..\..\..\src\tiff -I.\..\..\..\..\src\jpeg \
        -I.\..\..\..\..\src\png -I.\..\..\..\..\src\zlib -I.\..\..\..\..\src\regex \

-       -I.\..\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I.\..\..\..\include \
-       $(CXXFLAGS)
+       -I.\..\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I..\..\..\..\samples \
+       -I.\..\..\..\include $(CXXFLAGS)

 OGLEDIT_OBJECTS =  \
        $(OBJS)\ogledit_studio.obj \
        $(OBJS)\ogledit_doc.obj \
 OGLEDIT_OBJECTS =  \
        $(OBJS)\ogledit_studio.obj \
        $(OBJS)\ogledit_doc.obj \


@@ -129,6 +129,9 @@ __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -147,8 +150,6 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
 !endif
 
 __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
 !endif
 

-MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DWXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -183,7 +184,7 @@ $(OBJS)\ogledit_studio.obj: .\studio.cpp
        $(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $**
 
 $(OBJS)\ogledit_studio.res: .\studio.rc
        $(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $**
 
 $(OBJS)\ogledit_studio.res: .\studio.rc

-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\..\src\tiff -i.\..\..\..\..\src\jpeg -i.\..\..\..\..\src\png -i.\..\..\..\..\src\zlib  -i.\..\..\..\..\src\regex -i.\..\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) -i.\..\..\..\include $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\..\src\tiff -i.\..\..\..\..\src\jpeg -i.\..\..\..\..\src\png -i.\..\..\..\..\src\zlib  -i.\..\..\..\..\src\regex -i.\..\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) -i..\..\..\..\samples -i.\..\..\..\include $**

 
 $(OBJS)\ogledit_symbols.obj: .\symbols.cpp
        $(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $**
 
 $(OBJS)\ogledit_symbols.obj: .\symbols.cpp
        $(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $**


@@ -202,5 +203,5 @@ data:
 
 $(OBJS)\ogledit.exe: $(OGLEDIT_OBJECTS)  $(OBJS)\ogledit_studio.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|
 
 $(OBJS)\ogledit.exe: $(OGLEDIT_OBJECTS)  $(OBJS)\ogledit_studio.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|

-       c0w32.obj $(OGLEDIT_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\ogledit_studio.res
+       c0w32.obj $(OGLEDIT_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\ogledit_studio.res

 |
 |

diff --git a/contrib/samples/ogl/studio/makefile.vc b/contrib/samples/ogl/studio/makefile.vc
index 1a580a2c006b3a82c6055251934e9614d34da009..7d8e92ce7fb26f46a169335f61403039ff78eeb3 100644 (file)
--- a/contrib/samples/ogl/studio/makefile.vc
+++ b/contrib/samples/ogl/studio/makefile.vc
@@ -23,7 +23,7 @@ OGLEDIT_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \
        /I.\..\..\..\..\src\tiff /I.\..\..\..\..\src\jpeg /I.\..\..\..\..\src\png \
        /I.\..\..\..\..\src\zlib /I.\..\..\..\..\src\regex \
        /I.\..\..\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_WINDOWS \
        /I.\..\..\..\..\src\tiff /I.\..\..\..\..\src\jpeg /I.\..\..\..\..\src\png \
        /I.\..\..\..\..\src\zlib /I.\..\..\..\..\src\regex \
        /I.\..\..\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_WINDOWS \

-       /I.\..\..\..\include $(CXXFLAGS)
+       /I..\..\..\..\samples /I.\..\..\..\include $(CXXFLAGS)

 OGLEDIT_OBJECTS =  \
        $(OBJS)\ogledit_studio.obj \
        $(OBJS)\ogledit_doc.obj \
 OGLEDIT_OBJECTS =  \
        $(OBJS)\ogledit_studio.obj \
        $(OBJS)\ogledit_doc.obj \


@@ -150,6 +150,9 @@ __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -244,7 +247,7 @@ $(OBJS)\ogledit_studio.obj: .\studio.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(OGLEDIT_CXXFLAGS) $**
 
 $(OBJS)\ogledit_studio.res: .\studio.rc
        $(CXX) /c /nologo /TP /Fo$@ $(OGLEDIT_CXXFLAGS) $**
 
 $(OBJS)\ogledit_studio.res: .\studio.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\..\src\tiff /i .\..\..\..\..\src\jpeg /i .\..\..\..\..\src\png /i .\..\..\..\..\src\zlib  /i .\..\..\..\..\src\regex /i .\..\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\include $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\..\src\tiff /i .\..\..\..\..\src\jpeg /i .\..\..\..\..\src\png /i .\..\..\..\..\src\zlib  /i .\..\..\..\..\src\regex /i .\..\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS /i ..\..\..\..\samples /i .\..\..\..\include $**

 
 $(OBJS)\ogledit_symbols.obj: .\symbols.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(OGLEDIT_CXXFLAGS) $**
 
 $(OBJS)\ogledit_symbols.obj: .\symbols.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(OGLEDIT_CXXFLAGS) $**


@@ -263,5 +266,5 @@ data:
 
 $(OBJS)\ogledit.exe: $(OGLEDIT_OBJECTS) $(OBJS)\ogledit_studio.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<
 
 $(OBJS)\ogledit.exe: $(OGLEDIT_OBJECTS) $(OBJS)\ogledit_studio.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<

-       $(OGLEDIT_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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
+       $(OGLEDIT_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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

 <<
 <<

diff --git a/contrib/samples/ogl/studio/makefile.wat b/contrib/samples/ogl/studio/makefile.wat
index a73e9731f700a7861772a85798ba1a78bfe1cfcf..d37731d9c3c3c732a869943c45dc58240c189f99 100644 (file)
--- a/contrib/samples/ogl/studio/makefile.wat
+++ b/contrib/samples/ogl/studio/makefile.wat
@@ -163,7 +163,7 @@ OGLEDIT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
        -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg &
        -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib &
        -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. &
        -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg &
        -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib &
        -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. &

-       $(__DLLFLAG_p) -i=.\..\..\..\include $(CXXFLAGS)
+       $(__DLLFLAG_p) -i=..\..\..\..\samples -i=.\..\..\..\include $(CXXFLAGS)

 OGLEDIT_OBJECTS =  &
        $(OBJS)\ogledit_studio.obj &
        $(OBJS)\ogledit_doc.obj &
 OGLEDIT_OBJECTS =  &
        $(OBJS)\ogledit_studio.obj &
        $(OBJS)\ogledit_doc.obj &


@@ -176,8 +176,6 @@ OGLEDIT_OBJECTS =  &
        $(OBJS)\ogledit_dialogs.obj &
        $(OBJS)\ogledit_csprint.obj
 
        $(OBJS)\ogledit_dialogs.obj &
        $(OBJS)\ogledit_csprint.obj
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -212,7 +210,7 @@ $(OBJS)\ogledit_studio.obj :  .AUTODEPEND .\studio.cpp
        $(CXX) -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $<
 
 $(OBJS)\ogledit_studio.res :  .AUTODEPEND .\studio.rc
        $(CXX) -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $<
 
 $(OBJS)\ogledit_studio.res :  .AUTODEPEND .\studio.rc

-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib  -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=.\..\..\..\include $<
+       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\..\src\tiff -i=.\..\..\..\..\src\jpeg -i=.\..\..\..\..\src\png -i=.\..\..\..\..\src\zlib  -i=.\..\..\..\..\src\regex -i=.\..\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=..\..\..\..\samples -i=.\..\..\..\include $<

 
 $(OBJS)\ogledit_symbols.obj :  .AUTODEPEND .\symbols.cpp
        $(CXX) -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $<
 
 $(OBJS)\ogledit_symbols.obj :  .AUTODEPEND .\symbols.cpp
        $(CXX) -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $<


@@ -238,6 +236,6 @@ $(OBJS)\ogledit.exe :  $(OGLEDIT_OBJECTS) $(OBJS)\ogledit_studio.res
        @%append $(OBJS)\ogledit.lbc option incremental
        @%append $(OBJS)\ogledit.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(OGLEDIT_OBJECTS)) do @%append $(OBJS)\ogledit.lbc file %i
        @%append $(OBJS)\ogledit.lbc option incremental
        @%append $(OBJS)\ogledit.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(OGLEDIT_OBJECTS)) do @%append $(OBJS)\ogledit.lbc file %i

-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\ogledit.lbc library %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\ogledit.lbc library %i

        @%append $(OBJS)\ogledit.lbc option resource=$(OBJS)\ogledit_studio.res
        wlink @$(OBJS)\ogledit.lbc
        @%append $(OBJS)\ogledit.lbc option resource=$(OBJS)\ogledit_studio.res
        wlink @$(OBJS)\ogledit.lbc

diff --git a/contrib/samples/plot/Makefile.in b/contrib/samples/plot/Makefile.in
index b4271083b4e4aea248d645e1020b321baa9b677f..4dd7edb6d0130b9448acb101dfbc81529f336e90 100644 (file)
--- a/contrib/samples/plot/Makefile.in
+++ b/contrib/samples/plot/Makefile.in
@@ -36,7 +36,8 @@ LIBDIRNAME = $(top_builddir)lib
 PLOT_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) \
 PLOT_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) $(__DLLFLAG_p) -I$(srcdir)/../../include $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -I../../../samples -I$(srcdir)/../../include \
+       $(CXXFLAGS)

 PLOT_OBJECTS =  \
        plot_plot.o \
        $(__plot___win32rc)
 PLOT_OBJECTS =  \
        plot_plot.o \
        $(__plot___win32rc)


@@ -104,8 +105,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \

-       $(__DLLFLAG_p_1) -i $(srcdir)/../../include -o plot$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r
+       $(__DLLFLAG_p_1) -i ../../../samples -i $(srcdir)/../../include -o \
+       plot$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
+       ../../../samples/sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)


@@ -149,7 +151,7 @@ plot_plot.o: $(srcdir)/plot.cpp
        $(CXXC) -c -o $@ $(PLOT_CXXFLAGS) $<
 
 plot_plot_rc.o: $(srcdir)/plot.rc
        $(CXXC) -c -o $@ $(PLOT_CXXFLAGS) $<
 
 plot_plot_rc.o: $(srcdir)/plot.rc

-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../include
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples --include-dir $(srcdir)/../../include

 
 uninstall: 
 
 
 uninstall: 
 

diff --git a/contrib/samples/plot/makefile.vc b/contrib/samples/plot/makefile.vc
index d8dd98593cd4ac7f5fcf181be087c75b6f08f44b..a5865a43d96527c34a8dd3ab722e0caee9ca515f 100644 (file)
--- a/contrib/samples/plot/makefile.vc
+++ b/contrib/samples/plot/makefile.vc
@@ -22,7 +22,7 @@ PLOT_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \
        /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \
        /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \
        /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \
        /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \

-       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\include $(CXXFLAGS)
+       $(__DLLFLAG_p) /D_WINDOWS /I..\..\..\samples /I.\..\..\include $(CXXFLAGS)

 PLOT_OBJECTS =  \
        $(OBJS)\plot_plot.obj \
        $(OBJS)\plot_plot.res
 PLOT_OBJECTS =  \
        $(OBJS)\plot_plot.obj \
        $(OBJS)\plot_plot.res


@@ -140,6 +140,9 @@ __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -213,7 +216,7 @@ $(OBJS)\plot_plot.obj: .\plot.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(PLOT_CXXFLAGS) $**
 
 $(OBJS)\plot_plot.res: .\plot.rc
        $(CXX) /c /nologo /TP /Fo$@ $(PLOT_CXXFLAGS) $**
 
 $(OBJS)\plot_plot.res: .\plot.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\src\tiff /i .\..\..\..\src\jpeg /i .\..\..\..\src\png /i .\..\..\..\src\zlib  /i .\..\..\..\src\regex /i .\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\include $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\src\tiff /i .\..\..\..\src\jpeg /i .\..\..\..\src\png /i .\..\..\..\src\zlib  /i .\..\..\..\src\regex /i .\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS /i ..\..\..\samples /i .\..\..\include $**

 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -222,5 +225,5 @@ clean:
 
 $(OBJS)\plot.exe: $(PLOT_OBJECTS) $(OBJS)\plot_plot.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<
 
 $(OBJS)\plot.exe: $(PLOT_OBJECTS) $(OBJS)\plot_plot.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<

-       $(PLOT_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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
+       $(PLOT_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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

 <<
 <<

diff --git a/contrib/samples/plot/makefile.wat b/contrib/samples/plot/makefile.wat
index d5243ccb6cb687d1e9c1fc416c4fd496c67f3df2..aef02fceeb42db33852927d2365acd680231f53f 100644 (file)
--- a/contrib/samples/plot/makefile.wat
+++ b/contrib/samples/plot/makefile.wat
@@ -162,12 +162,10 @@ PLOT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
        $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) &
        -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png &
        -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib &
        $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) &
        -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png &
        -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib &

-       -i=. $(__DLLFLAG_p) -i=.\..\..\include $(CXXFLAGS)
+       -i=. $(__DLLFLAG_p) -i=..\..\..\samples -i=.\..\..\include $(CXXFLAGS)

 PLOT_OBJECTS =  &
        $(OBJS)\plot_plot.obj
 
 PLOT_OBJECTS =  &
        $(OBJS)\plot_plot.obj
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -181,7 +179,7 @@ $(OBJS)\plot_plot.obj :  .AUTODEPEND .\plot.cpp
        $(CXX) -zq -fo=$^@ $(PLOT_CXXFLAGS) $<
 
 $(OBJS)\plot_plot.res :  .AUTODEPEND .\plot.rc
        $(CXX) -zq -fo=$^@ $(PLOT_CXXFLAGS) $<
 
 $(OBJS)\plot_plot.res :  .AUTODEPEND .\plot.rc

-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib  -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=.\..\..\include $<
+       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib  -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=..\..\..\samples -i=.\..\..\include $<

 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -197,6 +195,6 @@ $(OBJS)\plot.exe :  $(PLOT_OBJECTS) $(OBJS)\plot_plot.res
        @%append $(OBJS)\plot.lbc option incremental
        @%append $(OBJS)\plot.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(PLOT_OBJECTS)) do @%append $(OBJS)\plot.lbc file %i
        @%append $(OBJS)\plot.lbc option incremental
        @%append $(OBJS)\plot.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(PLOT_OBJECTS)) do @%append $(OBJS)\plot.lbc file %i

-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\plot.lbc library %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\plot.lbc library %i

        @%append $(OBJS)\plot.lbc option resource=$(OBJS)\plot_plot.res
        wlink @$(OBJS)\plot.lbc
        @%append $(OBJS)\plot.lbc option resource=$(OBJS)\plot_plot.res
        wlink @$(OBJS)\plot.lbc

diff --git a/contrib/samples/stc/Makefile.in b/contrib/samples/stc/Makefile.in
index 16061922df630fc36695f703698f6a0964f84952..f4f1d73cf656c659cff9e06440bc71a1bf1f465f 100644 (file)
--- a/contrib/samples/stc/Makefile.in
+++ b/contrib/samples/stc/Makefile.in
@@ -36,7 +36,8 @@ LIBDIRNAME = $(top_builddir)lib
 STCTEST_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) \
 STCTEST_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) $(__DLLFLAG_p) -I$(srcdir)/../../include $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -I../../../samples -I$(srcdir)/../../include \
+       $(CXXFLAGS)

 STCTEST_OBJECTS =  \
        $(__stctest___win32rc) \
        stctest_stctest.o
 STCTEST_OBJECTS =  \
        $(__stctest___win32rc) \
        stctest_stctest.o


@@ -104,8 +105,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \

-       $(__DLLFLAG_p_1) -i $(srcdir)/../../include -o stctest$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r
+       $(__DLLFLAG_p_1) -i ../../../samples -i $(srcdir)/../../include -o \
+       stctest$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
+       ../../../samples/sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)


@@ -154,7 +156,7 @@ stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc)
        $(__stctest___mac_setfilecmd)
 
 stctest_sample_rc.o: $(srcdir)/../../../samples/sample.rc
        $(__stctest___mac_setfilecmd)
 
 stctest_sample_rc.o: $(srcdir)/../../../samples/sample.rc

-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2)
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples

 
 stctest_stctest.o: $(srcdir)/stctest.cpp
        $(CXXC) -c -o $@ $(STCTEST_CXXFLAGS) $<
 
 stctest_stctest.o: $(srcdir)/stctest.cpp
        $(CXXC) -c -o $@ $(STCTEST_CXXFLAGS) $<

diff --git a/contrib/samples/stc/makefile.vc b/contrib/samples/stc/makefile.vc
index ceba66240cbde26da072b424ec97aebfcb0ac755..978deaa7128d48449fd67f1b6b4a7cb892f3ea0f 100644 (file)
--- a/contrib/samples/stc/makefile.vc
+++ b/contrib/samples/stc/makefile.vc
@@ -22,7 +22,7 @@ STCTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \
        /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \
        /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \
        /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \
        /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \

-       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\include $(CXXFLAGS)
+       $(__DLLFLAG_p) /D_WINDOWS /I..\..\..\samples /I.\..\..\include $(CXXFLAGS)

 STCTEST_OBJECTS =  \
        $(OBJS)\stctest_sample.res \
        $(OBJS)\stctest_stctest.obj
 STCTEST_OBJECTS =  \
        $(OBJS)\stctest_sample.res \
        $(OBJS)\stctest_stctest.obj


@@ -140,6 +140,9 @@ __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -210,7 +213,7 @@ $(OBJS):
 all: $(OBJS)\stctest.exe data
 
 $(OBJS)\stctest_sample.res: .\..\..\..\samples\sample.rc
 all: $(OBJS)\stctest.exe data
 
 $(OBJS)\stctest_sample.res: .\..\..\..\samples\sample.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\src\tiff /i .\..\..\..\src\jpeg /i .\..\..\..\src\png /i .\..\..\..\src\zlib  /i .\..\..\..\src\regex /i .\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\src\tiff /i .\..\..\..\src\jpeg /i .\..\..\..\src\png /i .\..\..\..\src\zlib  /i .\..\..\..\src\regex /i .\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS /i ..\..\..\samples $**

 
 $(OBJS)\stctest_stctest.obj: .\stctest.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(STCTEST_CXXFLAGS) $**
 
 $(OBJS)\stctest_stctest.obj: .\stctest.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(STCTEST_CXXFLAGS) $**


@@ -226,5 +229,5 @@ data:
 
 $(OBJS)\stctest.exe: $(STCTEST_OBJECTS) $(OBJS)\stctest_sample.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<
 
 $(OBJS)\stctest.exe: $(STCTEST_OBJECTS) $(OBJS)\stctest_sample.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<

-       $(STCTEST_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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
+       $(STCTEST_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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

 <<
 <<

diff --git a/contrib/samples/stc/makefile.wat b/contrib/samples/stc/makefile.wat
index 340e9b5379eb072a3b9b3b6ce76aad2ce56a25ae..e58d0f79e0955f23708b37ee8c0defff62b3b0fb 100644 (file)
--- a/contrib/samples/stc/makefile.wat
+++ b/contrib/samples/stc/makefile.wat
@@ -162,12 +162,10 @@ STCTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
        $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) &
        -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png &
        -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib &
        $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) &
        -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png &
        -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib &

-       -i=. $(__DLLFLAG_p) -i=.\..\..\include $(CXXFLAGS)
+       -i=. $(__DLLFLAG_p) -i=..\..\..\samples -i=.\..\..\include $(CXXFLAGS)

 STCTEST_OBJECTS =  &
        $(OBJS)\stctest_stctest.obj
 
 STCTEST_OBJECTS =  &
        $(OBJS)\stctest_stctest.obj
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -178,7 +176,7 @@ $(OBJS) :
 all : .SYMBOLIC $(OBJS)\stctest.exe data
 
 $(OBJS)\stctest_sample.res :  .AUTODEPEND .\..\..\..\samples\sample.rc
 all : .SYMBOLIC $(OBJS)\stctest.exe data
 
 $(OBJS)\stctest_sample.res :  .AUTODEPEND .\..\..\..\samples\sample.rc

-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib  -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) $<
+       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib  -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=..\..\..\samples $<

 
 $(OBJS)\stctest_stctest.obj :  .AUTODEPEND .\stctest.cpp
        $(CXX) -zq -fo=$^@ $(STCTEST_CXXFLAGS) $<
 
 $(OBJS)\stctest_stctest.obj :  .AUTODEPEND .\stctest.cpp
        $(CXX) -zq -fo=$^@ $(STCTEST_CXXFLAGS) $<


@@ -201,6 +199,6 @@ $(OBJS)\stctest.exe :  $(STCTEST_OBJECTS) $(OBJS)\stctest_sample.res
        @%append $(OBJS)\stctest.lbc option incremental
        @%append $(OBJS)\stctest.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(STCTEST_OBJECTS)) do @%append $(OBJS)\stctest.lbc file %i
        @%append $(OBJS)\stctest.lbc option incremental
        @%append $(OBJS)\stctest.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(STCTEST_OBJECTS)) do @%append $(OBJS)\stctest.lbc file %i

-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\stctest.lbc library %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\stctest.lbc library %i

        @%append $(OBJS)\stctest.lbc option resource=$(OBJS)\stctest_sample.res
        wlink @$(OBJS)\stctest.lbc
        @%append $(OBJS)\stctest.lbc option resource=$(OBJS)\stctest_sample.res
        wlink @$(OBJS)\stctest.lbc

diff --git a/contrib/samples/svg/Makefile.in b/contrib/samples/svg/Makefile.in
index 375e978b4df423a1205e296d23117c8b5fc5b918..e0bf0aecd05f9c45b04d28b495894c5b286e417e 100644 (file)
--- a/contrib/samples/svg/Makefile.in
+++ b/contrib/samples/svg/Makefile.in
@@ -36,7 +36,8 @@ LIBDIRNAME = $(top_builddir)lib
 SVGTEST_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) \
 SVGTEST_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) $(__DLLFLAG_p) -I$(srcdir)/../../include $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -I../../../samples -I$(srcdir)/../../include \
+       $(CXXFLAGS)

 SVGTEST_OBJECTS =  \
        $(__svgtest___win32rc) \
        svgtest_svgtest.o
 SVGTEST_OBJECTS =  \
        $(__svgtest___win32rc) \
        svgtest_svgtest.o


@@ -104,8 +105,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \

-       $(__DLLFLAG_p_1) -i $(srcdir)/../../include -o svgtest$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r
+       $(__DLLFLAG_p_1) -i ../../../samples -i $(srcdir)/../../include -o \
+       svgtest$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
+       ../../../samples/sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)


@@ -146,7 +148,7 @@ svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc)
        $(__svgtest___mac_setfilecmd)
 
 svgtest_sample_rc.o: $(srcdir)/../../../samples/sample.rc
        $(__svgtest___mac_setfilecmd)
 
 svgtest_sample_rc.o: $(srcdir)/../../../samples/sample.rc

-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2)
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples

 
 svgtest_svgtest.o: $(srcdir)/svgtest.cpp
        $(CXXC) -c -o $@ $(SVGTEST_CXXFLAGS) $<
 
 svgtest_svgtest.o: $(srcdir)/svgtest.cpp
        $(CXXC) -c -o $@ $(SVGTEST_CXXFLAGS) $<

diff --git a/contrib/samples/svg/makefile.bcc b/contrib/samples/svg/makefile.bcc
index 6f95ecc3a5b96d99d49020a7f033fec4e8947ccc..d6ada1c0f213ef45c35ba1d3490ad598169982fb 100644 (file)
--- a/contrib/samples/svg/makefile.bcc
+++ b/contrib/samples/svg/makefile.bcc
@@ -29,7 +29,8 @@ SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \
        -I$(LIBDIRNAME) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg \
        -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \
        -I$(LIBDIRNAME) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg \
        -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex \

-       -I.\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS)
+       -I.\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I..\..\..\samples \
+       -I.\..\..\include $(CXXFLAGS)

 SVGTEST_OBJECTS =  \
        $(OBJS)\svgtest_svgtest.obj
 
 SVGTEST_OBJECTS =  \
        $(OBJS)\svgtest_svgtest.obj
 


@@ -119,6 +120,9 @@ __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -137,8 +141,6 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
 !endif
 
 __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
 !endif
 

-MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DWXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -149,7 +151,7 @@ $(OBJS):
 all: $(OBJS)\svgtest.exe
 
 $(OBJS)\svgtest_sample.res: .\..\..\..\samples\sample.rc
 all: $(OBJS)\svgtest.exe
 
 $(OBJS)\svgtest_sample.res: .\..\..\..\samples\sample.rc

-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib  -i.\..\..\..\src\regex -i.\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib  -i.\..\..\..\src\regex -i.\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) -i..\..\..\samples $**

 
 $(OBJS)\svgtest_svgtest.obj: .\svgtest.cpp
        $(CXX) -q -c -P -o$@ $(SVGTEST_CXXFLAGS) $**
 
 $(OBJS)\svgtest_svgtest.obj: .\svgtest.cpp
        $(CXX) -q -c -P -o$@ $(SVGTEST_CXXFLAGS) $**


@@ -161,5 +163,5 @@ clean:
 
 $(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS)  $(OBJS)\svgtest_sample.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|
 
 $(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS)  $(OBJS)\svgtest_sample.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|

-       c0w32.obj $(SVGTEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\svgtest_sample.res
+       c0w32.obj $(SVGTEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\svgtest_sample.res

 |
 |

diff --git a/contrib/samples/svg/makefile.gcc b/contrib/samples/svg/makefile.gcc
index 029a9843b168a47b498032d4b5d60f697e16707a..1f4aa2c18ea30395c41a58620b4d6edbaf84364e 100644 (file)
--- a/contrib/samples/svg/makefile.gcc
+++ b/contrib/samples/svg/makefile.gcc
@@ -21,7 +21,7 @@ SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \

-       $(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS)
+       $(__DLLFLAG_p) -I..\..\..\samples -I.\..\..\include $(CXXFLAGS)

 SVGTEST_OBJECTS =  \
        $(OBJS)\svgtest_sample_rc.o \
        $(OBJS)\svgtest_svgtest.o
 SVGTEST_OBJECTS =  \
        $(OBJS)\svgtest_sample_rc.o \
        $(OBJS)\svgtest_svgtest.o


@@ -113,6 +113,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
 endif

+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif

 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif


@@ -131,8 +134,6 @@ ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
 endif
 
 __WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
 endif
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -143,7 +144,7 @@ $(OBJS):
 all: $(OBJS)\svgtest.exe
 
 $(OBJS)\svgtest_sample_rc.o: .\..\..\..\samples\sample.rc
 all: $(OBJS)\svgtest.exe
 
 $(OBJS)\svgtest_sample_rc.o: .\..\..\..\samples\sample.rc

-       windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../include --include-dir $(LIBDIRNAME) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib  --include-dir ./../../../src/regex --include-dir ./../../../src/expat/lib --include-dir . $(__DLLFLAG_p_1)
+       windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../include --include-dir $(LIBDIRNAME) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib  --include-dir ./../../../src/regex --include-dir ./../../../src/expat/lib --include-dir . $(__DLLFLAG_p_1) --include-dir ../../../samples

 
 $(OBJS)\svgtest_svgtest.o: .\svgtest.cpp
        $(CXX) -c -o $@ $(SVGTEST_CXXFLAGS) $<
 
 $(OBJS)\svgtest_svgtest.o: .\svgtest.cpp
        $(CXX) -c -o $@ $(SVGTEST_CXXFLAGS) $<


@@ -153,6 +154,6 @@ clean:
        -if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe
 
 $(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample_rc.o
        -if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe
 
 $(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample_rc.o

-       $(CXX) -o $@ $(SVGTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -o $@ $(SVGTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32

 
 .PHONY: all clean
 
 .PHONY: all clean

diff --git a/contrib/samples/svg/makefile.vc b/contrib/samples/svg/makefile.vc
index 0fc39b69d9f334e6ccc971761909eb58b60ee250..995ff3f059a1f6f16766cb5bda4fa19a19c32844 100644 (file)
--- a/contrib/samples/svg/makefile.vc
+++ b/contrib/samples/svg/makefile.vc
@@ -22,7 +22,7 @@ SVGTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \
        /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \
        /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \
        /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \
        /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \

-       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\include $(CXXFLAGS)
+       $(__DLLFLAG_p) /D_WINDOWS /I..\..\..\samples /I.\..\..\include $(CXXFLAGS)

 SVGTEST_OBJECTS =  \
        $(OBJS)\svgtest_sample.res \
        $(OBJS)\svgtest_svgtest.obj
 SVGTEST_OBJECTS =  \
        $(OBJS)\svgtest_sample.res \
        $(OBJS)\svgtest_svgtest.obj


@@ -140,6 +140,9 @@ __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -210,7 +213,7 @@ $(OBJS):
 all: $(OBJS)\svgtest.exe
 
 $(OBJS)\svgtest_sample.res: .\..\..\..\samples\sample.rc
 all: $(OBJS)\svgtest.exe
 
 $(OBJS)\svgtest_sample.res: .\..\..\..\samples\sample.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\src\tiff /i .\..\..\..\src\jpeg /i .\..\..\..\src\png /i .\..\..\..\src\zlib  /i .\..\..\..\src\regex /i .\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\src\tiff /i .\..\..\..\src\jpeg /i .\..\..\..\src\png /i .\..\..\..\src\zlib  /i .\..\..\..\src\regex /i .\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS /i ..\..\..\samples $**

 
 $(OBJS)\svgtest_svgtest.obj: .\svgtest.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(SVGTEST_CXXFLAGS) $**
 
 $(OBJS)\svgtest_svgtest.obj: .\svgtest.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(SVGTEST_CXXFLAGS) $**


@@ -222,5 +225,5 @@ clean:
 
 $(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<
 
 $(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<

-       $(SVGTEST_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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
+       $(SVGTEST_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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

 <<
 <<

diff --git a/contrib/samples/svg/makefile.wat b/contrib/samples/svg/makefile.wat
index 0fbf52ef55e906a6d7b444eae26d7ceb0b940635..14be83c80f4d8941f52cbd24cea2cbaa689f7467 100644 (file)
--- a/contrib/samples/svg/makefile.wat
+++ b/contrib/samples/svg/makefile.wat
@@ -162,12 +162,10 @@ SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
        $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) &
        -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png &
        -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib &
        $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) &
        -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png &
        -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib &

-       -i=. $(__DLLFLAG_p) -i=.\..\..\include $(CXXFLAGS)
+       -i=. $(__DLLFLAG_p) -i=..\..\..\samples -i=.\..\..\include $(CXXFLAGS)

 SVGTEST_OBJECTS =  &
        $(OBJS)\svgtest_svgtest.obj
 
 SVGTEST_OBJECTS =  &
        $(OBJS)\svgtest_svgtest.obj
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -178,7 +176,7 @@ $(OBJS) :
 all : .SYMBOLIC $(OBJS)\svgtest.exe
 
 $(OBJS)\svgtest_sample.res :  .AUTODEPEND .\..\..\..\samples\sample.rc
 all : .SYMBOLIC $(OBJS)\svgtest.exe
 
 $(OBJS)\svgtest_sample.res :  .AUTODEPEND .\..\..\..\samples\sample.rc

-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib  -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) $<
+       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib  -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=..\..\..\samples $<

 
 $(OBJS)\svgtest_svgtest.obj :  .AUTODEPEND .\svgtest.cpp
        $(CXX) -zq -fo=$^@ $(SVGTEST_CXXFLAGS) $<
 
 $(OBJS)\svgtest_svgtest.obj :  .AUTODEPEND .\svgtest.cpp
        $(CXX) -zq -fo=$^@ $(SVGTEST_CXXFLAGS) $<


@@ -197,6 +195,6 @@ $(OBJS)\svgtest.exe :  $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample.res
        @%append $(OBJS)\svgtest.lbc option incremental
        @%append $(OBJS)\svgtest.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(SVGTEST_OBJECTS)) do @%append $(OBJS)\svgtest.lbc file %i
        @%append $(OBJS)\svgtest.lbc option incremental
        @%append $(OBJS)\svgtest.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(SVGTEST_OBJECTS)) do @%append $(OBJS)\svgtest.lbc file %i

-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\svgtest.lbc library %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\svgtest.lbc library %i

        @%append $(OBJS)\svgtest.lbc option resource=$(OBJS)\svgtest_sample.res
        wlink @$(OBJS)\svgtest.lbc
        @%append $(OBJS)\svgtest.lbc option resource=$(OBJS)\svgtest_sample.res
        wlink @$(OBJS)\svgtest.lbc

diff --git a/contrib/samples/xrc/Makefile.in b/contrib/samples/xrc/Makefile.in
index 627d91371e783d1b320f3e53a16faa7ef8f131e7..99c8be4823ebc02638b69a6ca3cf57a8cad89a9b 100644 (file)
--- a/contrib/samples/xrc/Makefile.in
+++ b/contrib/samples/xrc/Makefile.in
@@ -36,7 +36,8 @@ LIBDIRNAME = $(top_builddir)lib
 XRCDEMO_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) \
 XRCDEMO_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) $(__DLLFLAG_p) -I$(srcdir)/../../include $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -I../../../samples -I$(srcdir)/../../include \
+       $(CXXFLAGS)

 XRCDEMO_OBJECTS =  \
        xrcdemo_xrcdemo.o \
        xrcdemo_myframe.o \
 XRCDEMO_OBJECTS =  \
        xrcdemo_xrcdemo.o \
        xrcdemo_myframe.o \


@@ -107,8 +108,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \

-       $(__DLLFLAG_p_1) -i $(srcdir)/../../include -o xrcdemo$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r
+       $(__DLLFLAG_p_1) -i ../../../samples -i $(srcdir)/../../include -o \
+       xrcdemo$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
+       ../../../samples/sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)


@@ -176,7 +178,7 @@ xrcdemo_xrcdemo.o: $(srcdir)/xrcdemo.cpp
        $(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $<
 
 xrcdemo_xrcdemo_rc.o: $(srcdir)/xrcdemo.rc
        $(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $<
 
 xrcdemo_xrcdemo_rc.o: $(srcdir)/xrcdemo.rc

-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../include
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples --include-dir $(srcdir)/../../include

 
 
 # Include dependency info, if present:
 
 
 # Include dependency info, if present:

diff --git a/contrib/samples/xrc/makefile.bcc b/contrib/samples/xrc/makefile.bcc
index c77209b954492565171c577dabe882439513a446..edfc7e4dc35939d7f3f09e6d342f35bc1f9082d2 100644 (file)
--- a/contrib/samples/xrc/makefile.bcc
+++ b/contrib/samples/xrc/makefile.bcc
@@ -29,7 +29,8 @@ XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \
        -I$(LIBDIRNAME) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg \
        -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \
        -I$(LIBDIRNAME) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg \
        -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex \

-       -I.\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS)
+       -I.\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I..\..\..\samples \
+       -I.\..\..\include $(CXXFLAGS)

 XRCDEMO_OBJECTS =  \
        $(OBJS)\xrcdemo_xrcdemo.obj \
        $(OBJS)\xrcdemo_myframe.obj \
 XRCDEMO_OBJECTS =  \
        $(OBJS)\xrcdemo_xrcdemo.obj \
        $(OBJS)\xrcdemo_myframe.obj \


@@ -122,6 +123,9 @@ __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -147,8 +151,6 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
 !endif
 
 __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
 !endif
 

-MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DWXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -171,7 +173,7 @@ $(OBJS)\xrcdemo_xrcdemo.obj: .\xrcdemo.cpp
        $(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) $**
 
 $(OBJS)\xrcdemo_xrcdemo.res: .\xrcdemo.rc
        $(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) $**
 
 $(OBJS)\xrcdemo_xrcdemo.res: .\xrcdemo.rc

-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib  -i.\..\..\..\src\regex -i.\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) -i.\..\..\include $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib  -i.\..\..\..\src\regex -i.\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) -i..\..\..\samples -i.\..\..\include $**

 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -179,10 +181,10 @@ clean:
        -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe
 
 data: 
        -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe
 
 data: 

-       if not exist $(OBJS)/rc mkdir $(OBJS)/rc
-       for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)/rc\%f copy ./rc\%f $(OBJS)/rc
+       if not exist $(OBJS)\rc mkdir $(OBJS)\rc
+       for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc

 
 $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS)  $(OBJS)\xrcdemo_xrcdemo.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|
 
 $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS)  $(OBJS)\xrcdemo_xrcdemo.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|

-       c0w32.obj $(XRCDEMO_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\xrcdemo_xrcdemo.res
+       c0w32.obj $(XRCDEMO_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\xrcdemo_xrcdemo.res

 |
 |

diff --git a/contrib/samples/xrc/makefile.gcc b/contrib/samples/xrc/makefile.gcc
index 32ef8b1723c87410caefb9ec78baed4c3f697685..c05fab548641e821134706681a299e822bf196d7 100644 (file)
--- a/contrib/samples/xrc/makefile.gcc
+++ b/contrib/samples/xrc/makefile.gcc
@@ -21,7 +21,7 @@ XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \

-       $(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS)
+       $(__DLLFLAG_p) -I..\..\..\samples -I.\..\..\include $(CXXFLAGS)

 XRCDEMO_OBJECTS =  \
        $(OBJS)\xrcdemo_xrcdemo.o \
        $(OBJS)\xrcdemo_myframe.o \
 XRCDEMO_OBJECTS =  \
        $(OBJS)\xrcdemo_xrcdemo.o \
        $(OBJS)\xrcdemo_myframe.o \


@@ -116,6 +116,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
 endif

+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif

 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif


@@ -141,8 +144,6 @@ ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
 endif
 
 __WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
 endif
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -165,17 +166,17 @@ $(OBJS)\xrcdemo_xrcdemo.o: .\xrcdemo.cpp
        $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $<
 
 $(OBJS)\xrcdemo_xrcdemo_rc.o: .\xrcdemo.rc
        $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $<
 
 $(OBJS)\xrcdemo_xrcdemo_rc.o: .\xrcdemo.rc

-       windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../include --include-dir $(LIBDIRNAME) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib  --include-dir ./../../../src/regex --include-dir ./../../../src/expat/lib --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../include
+       windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../include --include-dir $(LIBDIRNAME) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib  --include-dir ./../../../src/regex --include-dir ./../../../src/expat/lib --include-dir . $(__DLLFLAG_p_1) --include-dir ../../../samples --include-dir ./../../include

 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe
 
 data: 
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe
 
 data: 

-       if not exist $(OBJS)/rc mkdir $(OBJS)/rc
-       for %%f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)/rc\%%f copy ./rc\%%f $(OBJS)/rc
+       if not exist $(OBJS)\rc mkdir $(OBJS)\rc
+       for %%f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)\rc\%%f copy .\rc\%%f $(OBJS)\rc

 
 $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo_rc.o
 
 $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo_rc.o

-       $(CXX) -o $@ $(XRCDEMO_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -o $@ $(XRCDEMO_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32

 
 .PHONY: all clean data
 
 .PHONY: all clean data

diff --git a/contrib/samples/xrc/makefile.vc b/contrib/samples/xrc/makefile.vc
index c11f71b54e41b241045f9d02a2f3a0b9ec71ca81..75e4db36c56ab7de0d00ebd25ce3fc9da40c2fa0 100644 (file)
--- a/contrib/samples/xrc/makefile.vc
+++ b/contrib/samples/xrc/makefile.vc
@@ -22,7 +22,7 @@ XRCDEMO_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \
        /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \
        /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \
        /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \
        /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \

-       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\include $(CXXFLAGS)
+       $(__DLLFLAG_p) /D_WINDOWS /I..\..\..\samples /I.\..\..\include $(CXXFLAGS)

 XRCDEMO_OBJECTS =  \
        $(OBJS)\xrcdemo_xrcdemo.obj \
        $(OBJS)\xrcdemo_myframe.obj \
 XRCDEMO_OBJECTS =  \
        $(OBJS)\xrcdemo_xrcdemo.obj \
        $(OBJS)\xrcdemo_myframe.obj \


@@ -143,6 +143,9 @@ __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -232,7 +235,7 @@ $(OBJS)\xrcdemo_xrcdemo.obj: .\xrcdemo.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) $**
 
 $(OBJS)\xrcdemo_xrcdemo.res: .\xrcdemo.rc
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) $**
 
 $(OBJS)\xrcdemo_xrcdemo.res: .\xrcdemo.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\src\tiff /i .\..\..\..\src\jpeg /i .\..\..\..\src\png /i .\..\..\..\src\zlib  /i .\..\..\..\src\regex /i .\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\include $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\src\tiff /i .\..\..\..\src\jpeg /i .\..\..\..\src\png /i .\..\..\..\src\zlib  /i .\..\..\..\src\regex /i .\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS /i ..\..\..\samples /i .\..\..\include $**

 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -240,10 +243,10 @@ clean:
        -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe
 
 data: 
        -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe
 
 data: 

-       if not exist $(OBJS)/rc mkdir $(OBJS)/rc
-       for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)/rc\%f copy ./rc\%f $(OBJS)/rc
+       if not exist $(OBJS)\rc mkdir $(OBJS)\rc
+       for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc

 
 $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<
 
 $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<

-       $(XRCDEMO_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__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
+       $(XRCDEMO_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__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

 <<
 <<

diff --git a/contrib/samples/xrc/makefile.wat b/contrib/samples/xrc/makefile.wat
index a5f2c17fe11af2d65f64f93c410661726a7b0e0f..5de89294e8554054b5ddfc61465c5c8f972c3b58 100644 (file)
--- a/contrib/samples/xrc/makefile.wat
+++ b/contrib/samples/xrc/makefile.wat
@@ -171,15 +171,13 @@ XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
        $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) &
        -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png &
        -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib &
        $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) &
        -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png &
        -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib &

-       -i=. $(__DLLFLAG_p) -i=.\..\..\include $(CXXFLAGS)
+       -i=. $(__DLLFLAG_p) -i=..\..\..\samples -i=.\..\..\include $(CXXFLAGS)

 XRCDEMO_OBJECTS =  &
        $(OBJS)\xrcdemo_xrcdemo.obj &
        $(OBJS)\xrcdemo_myframe.obj &
        $(OBJS)\xrcdemo_derivdlg.obj &
        $(OBJS)\xrcdemo_custclas.obj
 
 XRCDEMO_OBJECTS =  &
        $(OBJS)\xrcdemo_xrcdemo.obj &
        $(OBJS)\xrcdemo_myframe.obj &
        $(OBJS)\xrcdemo_derivdlg.obj &
        $(OBJS)\xrcdemo_custclas.obj
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -202,7 +200,7 @@ $(OBJS)\xrcdemo_xrcdemo.obj :  .AUTODEPEND .\xrcdemo.cpp
        $(CXX) -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $<
 
 $(OBJS)\xrcdemo_xrcdemo.res :  .AUTODEPEND .\xrcdemo.rc
        $(CXX) -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $<
 
 $(OBJS)\xrcdemo_xrcdemo.res :  .AUTODEPEND .\xrcdemo.rc

-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib  -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=.\..\..\include $<
+       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib  -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=..\..\..\samples -i=.\..\..\include $<

 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -212,8 +210,8 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe
 
 data : .SYMBOLIC 
        -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe
 
 data : .SYMBOLIC 

-       if not exist $(OBJS)/rc mkdir $(OBJS)/rc
-       for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)/rc\%f copy ./rc\%f $(OBJS)/rc
+       if not exist $(OBJS)\rc mkdir $(OBJS)\rc
+       for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc

 
 $(OBJS)\xrcdemo.exe :  $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res
        @%create $(OBJS)\xrcdemo.lbc
 
 $(OBJS)\xrcdemo.exe :  $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res
        @%create $(OBJS)\xrcdemo.lbc


@@ -222,6 +220,6 @@ $(OBJS)\xrcdemo.exe :  $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res
        @%append $(OBJS)\xrcdemo.lbc option incremental
        @%append $(OBJS)\xrcdemo.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(XRCDEMO_OBJECTS)) do @%append $(OBJS)\xrcdemo.lbc file %i
        @%append $(OBJS)\xrcdemo.lbc option incremental
        @%append $(OBJS)\xrcdemo.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(XRCDEMO_OBJECTS)) do @%append $(OBJS)\xrcdemo.lbc file %i

-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\xrcdemo.lbc library %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\xrcdemo.lbc library %i

        @%append $(OBJS)\xrcdemo.lbc option resource=$(OBJS)\xrcdemo_xrcdemo.res
        wlink @$(OBJS)\xrcdemo.lbc
        @%append $(OBJS)\xrcdemo.lbc option resource=$(OBJS)\xrcdemo_xrcdemo.res
        wlink @$(OBJS)\xrcdemo.lbc

diff --git a/contrib/utils/wxrc/makefile.bcc b/contrib/utils/wxrc/makefile.bcc
index b12fbda6f658ba5a086cf819cdfd48cbc7101982..02523f9cc7debbd9c3d3442825f2ac0bdac2d90f 100644 (file)
--- a/contrib/utils/wxrc/makefile.bcc
+++ b/contrib/utils/wxrc/makefile.bcc
@@ -107,6 +107,9 @@ __RUNTIME_LIBS_7 =
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !endif
 !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
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -121,8 +124,6 @@ __WXLIB_XML_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 !endif
 
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 !endif
 

-MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DWXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -142,5 +143,5 @@ clean:
 
 $(OBJS)\wxrc.exe: $(WXRC_OBJECTS)
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap @&&|
 
 $(OBJS)\wxrc.exe: $(WXRC_OBJECTS)
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap @&&|

-       c0x32.obj $(WXRC_OBJECTS),$@,, $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,,
+       c0x32.obj $(WXRC_OBJECTS),$@,, $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,,

 |
 |

diff --git a/contrib/utils/wxrc/makefile.gcc b/contrib/utils/wxrc/makefile.gcc
index 0e3e818ced89f23aaa44bce9690c8ca4e1495586..67d5d39425a71468345670e9a6270f008eb3d11b 100644 (file)
--- a/contrib/utils/wxrc/makefile.gcc
+++ b/contrib/utils/wxrc/makefile.gcc
@@ -98,6 +98,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif

+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif

 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif


@@ -112,8 +115,6 @@ ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 endif
 
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 endif
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -131,6 +132,6 @@ clean:
        -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe
 
 $(OBJS)\wxrc.exe: $(WXRC_OBJECTS)
        -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe
 
 $(OBJS)\wxrc.exe: $(WXRC_OBJECTS)

-       $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME)   $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME)   $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32

 
 .PHONY: all clean
 
 .PHONY: all clean

diff --git a/contrib/utils/wxrc/makefile.vc b/contrib/utils/wxrc/makefile.vc
index c0bca85b205275c1ecd1f3d8760d1ecb40f559c6..418da18c1ea35e2093335b74e1dca6889c5ad536 100644 (file)
--- a/contrib/utils/wxrc/makefile.vc
+++ b/contrib/utils/wxrc/makefile.vc
@@ -127,6 +127,9 @@ __RUNTIME_LIBS_7 = T
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !endif
 !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
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -181,5 +184,5 @@ clean:
 
 $(OBJS)\wxrc.exe: $(WXRC_OBJECTS)
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE @<<
 
 $(OBJS)\wxrc.exe: $(WXRC_OBJECTS)
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE @<<

-       $(WXRC_OBJECTS)  $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__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
+       $(WXRC_OBJECTS)  $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__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

 <<
 <<

diff --git a/contrib/utils/wxrc/makefile.wat b/contrib/utils/wxrc/makefile.wat
index 6e3a55627215bd15f11d72dba4f803d77e952dd3..29f86838cc2c74769c63d2b4e74a07a275074313 100644 (file)
--- a/contrib/utils/wxrc/makefile.wat
+++ b/contrib/utils/wxrc/makefile.wat
@@ -165,8 +165,6 @@ WXRC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
 WXRC_OBJECTS =  &
        $(OBJS)\wxrc_wxrc.obj
 
 WXRC_OBJECTS =  &
        $(OBJS)\wxrc_wxrc.obj
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -193,6 +191,6 @@ $(OBJS)\wxrc.exe :  $(WXRC_OBJECTS)
        @%append $(OBJS)\wxrc.lbc option incremental
        @%append $(OBJS)\wxrc.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_'
        @for %i in ($(WXRC_OBJECTS)) do @%append $(OBJS)\wxrc.lbc file %i
        @%append $(OBJS)\wxrc.lbc option incremental
        @%append $(OBJS)\wxrc.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_'
        @for %i in ($(WXRC_OBJECTS)) do @%append $(OBJS)\wxrc.lbc file %i

-       @for %i in ( $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\wxrc.lbc library %i
+       @for %i in ( $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\wxrc.lbc library %i

        @%append $(OBJS)\wxrc.lbc
        wlink @$(OBJS)\wxrc.lbc
        @%append $(OBJS)\wxrc.lbc
        wlink @$(OBJS)\wxrc.lbc

diff --git a/samples/stc/Makefile.in b/samples/stc/Makefile.in
index 16061922df630fc36695f703698f6a0964f84952..f4f1d73cf656c659cff9e06440bc71a1bf1f465f 100644 (file)
--- a/samples/stc/Makefile.in
+++ b/samples/stc/Makefile.in
@@ -36,7 +36,8 @@ LIBDIRNAME = $(top_builddir)lib
 STCTEST_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) \
 STCTEST_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) $(__DLLFLAG_p) -I$(srcdir)/../../include $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -I../../../samples -I$(srcdir)/../../include \
+       $(CXXFLAGS)

 STCTEST_OBJECTS =  \
        $(__stctest___win32rc) \
        stctest_stctest.o
 STCTEST_OBJECTS =  \
        $(__stctest___win32rc) \
        stctest_stctest.o


@@ -104,8 +105,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \

-       $(__DLLFLAG_p_1) -i $(srcdir)/../../include -o stctest$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r
+       $(__DLLFLAG_p_1) -i ../../../samples -i $(srcdir)/../../include -o \
+       stctest$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
+       ../../../samples/sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)


@@ -154,7 +156,7 @@ stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc)
        $(__stctest___mac_setfilecmd)
 
 stctest_sample_rc.o: $(srcdir)/../../../samples/sample.rc
        $(__stctest___mac_setfilecmd)
 
 stctest_sample_rc.o: $(srcdir)/../../../samples/sample.rc

-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2)
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples

 
 stctest_stctest.o: $(srcdir)/stctest.cpp
        $(CXXC) -c -o $@ $(STCTEST_CXXFLAGS) $<
 
 stctest_stctest.o: $(srcdir)/stctest.cpp
        $(CXXC) -c -o $@ $(STCTEST_CXXFLAGS) $<

diff --git a/samples/stc/makefile.vc b/samples/stc/makefile.vc
index ceba66240cbde26da072b424ec97aebfcb0ac755..978deaa7128d48449fd67f1b6b4a7cb892f3ea0f 100644 (file)
--- a/samples/stc/makefile.vc
+++ b/samples/stc/makefile.vc
@@ -22,7 +22,7 @@ STCTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \
        /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \
        /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \
        /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \
        /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \

-       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\include $(CXXFLAGS)
+       $(__DLLFLAG_p) /D_WINDOWS /I..\..\..\samples /I.\..\..\include $(CXXFLAGS)

 STCTEST_OBJECTS =  \
        $(OBJS)\stctest_sample.res \
        $(OBJS)\stctest_stctest.obj
 STCTEST_OBJECTS =  \
        $(OBJS)\stctest_sample.res \
        $(OBJS)\stctest_stctest.obj


@@ -140,6 +140,9 @@ __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -210,7 +213,7 @@ $(OBJS):
 all: $(OBJS)\stctest.exe data
 
 $(OBJS)\stctest_sample.res: .\..\..\..\samples\sample.rc
 all: $(OBJS)\stctest.exe data
 
 $(OBJS)\stctest_sample.res: .\..\..\..\samples\sample.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\src\tiff /i .\..\..\..\src\jpeg /i .\..\..\..\src\png /i .\..\..\..\src\zlib  /i .\..\..\..\src\regex /i .\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\src\tiff /i .\..\..\..\src\jpeg /i .\..\..\..\src\png /i .\..\..\..\src\zlib  /i .\..\..\..\src\regex /i .\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS /i ..\..\..\samples $**

 
 $(OBJS)\stctest_stctest.obj: .\stctest.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(STCTEST_CXXFLAGS) $**
 
 $(OBJS)\stctest_stctest.obj: .\stctest.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(STCTEST_CXXFLAGS) $**


@@ -226,5 +229,5 @@ data:
 
 $(OBJS)\stctest.exe: $(STCTEST_OBJECTS) $(OBJS)\stctest_sample.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<
 
 $(OBJS)\stctest.exe: $(STCTEST_OBJECTS) $(OBJS)\stctest_sample.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<

-       $(STCTEST_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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
+       $(STCTEST_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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

 <<
 <<

diff --git a/samples/stc/makefile.wat b/samples/stc/makefile.wat
index 340e9b5379eb072a3b9b3b6ce76aad2ce56a25ae..e58d0f79e0955f23708b37ee8c0defff62b3b0fb 100644 (file)
--- a/samples/stc/makefile.wat
+++ b/samples/stc/makefile.wat
@@ -162,12 +162,10 @@ STCTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
        $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) &
        -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png &
        -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib &
        $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) &
        -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png &
        -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib &

-       -i=. $(__DLLFLAG_p) -i=.\..\..\include $(CXXFLAGS)
+       -i=. $(__DLLFLAG_p) -i=..\..\..\samples -i=.\..\..\include $(CXXFLAGS)

 STCTEST_OBJECTS =  &
        $(OBJS)\stctest_stctest.obj
 
 STCTEST_OBJECTS =  &
        $(OBJS)\stctest_stctest.obj
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -178,7 +176,7 @@ $(OBJS) :
 all : .SYMBOLIC $(OBJS)\stctest.exe data
 
 $(OBJS)\stctest_sample.res :  .AUTODEPEND .\..\..\..\samples\sample.rc
 all : .SYMBOLIC $(OBJS)\stctest.exe data
 
 $(OBJS)\stctest_sample.res :  .AUTODEPEND .\..\..\..\samples\sample.rc

-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib  -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) $<
+       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib  -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=..\..\..\samples $<

 
 $(OBJS)\stctest_stctest.obj :  .AUTODEPEND .\stctest.cpp
        $(CXX) -zq -fo=$^@ $(STCTEST_CXXFLAGS) $<
 
 $(OBJS)\stctest_stctest.obj :  .AUTODEPEND .\stctest.cpp
        $(CXX) -zq -fo=$^@ $(STCTEST_CXXFLAGS) $<


@@ -201,6 +199,6 @@ $(OBJS)\stctest.exe :  $(STCTEST_OBJECTS) $(OBJS)\stctest_sample.res
        @%append $(OBJS)\stctest.lbc option incremental
        @%append $(OBJS)\stctest.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(STCTEST_OBJECTS)) do @%append $(OBJS)\stctest.lbc file %i
        @%append $(OBJS)\stctest.lbc option incremental
        @%append $(OBJS)\stctest.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(STCTEST_OBJECTS)) do @%append $(OBJS)\stctest.lbc file %i

-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\stctest.lbc library %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\stctest.lbc library %i

        @%append $(OBJS)\stctest.lbc option resource=$(OBJS)\stctest_sample.res
        wlink @$(OBJS)\stctest.lbc
        @%append $(OBJS)\stctest.lbc option resource=$(OBJS)\stctest_sample.res
        wlink @$(OBJS)\stctest.lbc

diff --git a/samples/svg/Makefile.in b/samples/svg/Makefile.in
index 375e978b4df423a1205e296d23117c8b5fc5b918..e0bf0aecd05f9c45b04d28b495894c5b286e417e 100644 (file)
--- a/samples/svg/Makefile.in
+++ b/samples/svg/Makefile.in
@@ -36,7 +36,8 @@ LIBDIRNAME = $(top_builddir)lib
 SVGTEST_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) \
 SVGTEST_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) $(__DLLFLAG_p) -I$(srcdir)/../../include $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -I../../../samples -I$(srcdir)/../../include \
+       $(CXXFLAGS)

 SVGTEST_OBJECTS =  \
        $(__svgtest___win32rc) \
        svgtest_svgtest.o
 SVGTEST_OBJECTS =  \
        $(__svgtest___win32rc) \
        svgtest_svgtest.o


@@ -104,8 +105,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \

-       $(__DLLFLAG_p_1) -i $(srcdir)/../../include -o svgtest$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r
+       $(__DLLFLAG_p_1) -i ../../../samples -i $(srcdir)/../../include -o \
+       svgtest$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
+       ../../../samples/sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)


@@ -146,7 +148,7 @@ svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc)
        $(__svgtest___mac_setfilecmd)
 
 svgtest_sample_rc.o: $(srcdir)/../../../samples/sample.rc
        $(__svgtest___mac_setfilecmd)
 
 svgtest_sample_rc.o: $(srcdir)/../../../samples/sample.rc

-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2)
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples

 
 svgtest_svgtest.o: $(srcdir)/svgtest.cpp
        $(CXXC) -c -o $@ $(SVGTEST_CXXFLAGS) $<
 
 svgtest_svgtest.o: $(srcdir)/svgtest.cpp
        $(CXXC) -c -o $@ $(SVGTEST_CXXFLAGS) $<

diff --git a/samples/svg/makefile.bcc b/samples/svg/makefile.bcc
index 6f95ecc3a5b96d99d49020a7f033fec4e8947ccc..d6ada1c0f213ef45c35ba1d3490ad598169982fb 100644 (file)
--- a/samples/svg/makefile.bcc
+++ b/samples/svg/makefile.bcc
@@ -29,7 +29,8 @@ SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \
        -I$(LIBDIRNAME) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg \
        -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \
        -I$(LIBDIRNAME) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg \
        -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex \

-       -I.\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS)
+       -I.\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I..\..\..\samples \
+       -I.\..\..\include $(CXXFLAGS)

 SVGTEST_OBJECTS =  \
        $(OBJS)\svgtest_svgtest.obj
 
 SVGTEST_OBJECTS =  \
        $(OBJS)\svgtest_svgtest.obj
 


@@ -119,6 +120,9 @@ __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -137,8 +141,6 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
 !endif
 
 __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
 !endif
 

-MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DWXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -149,7 +151,7 @@ $(OBJS):
 all: $(OBJS)\svgtest.exe
 
 $(OBJS)\svgtest_sample.res: .\..\..\..\samples\sample.rc
 all: $(OBJS)\svgtest.exe
 
 $(OBJS)\svgtest_sample.res: .\..\..\..\samples\sample.rc

-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib  -i.\..\..\..\src\regex -i.\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib  -i.\..\..\..\src\regex -i.\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) -i..\..\..\samples $**

 
 $(OBJS)\svgtest_svgtest.obj: .\svgtest.cpp
        $(CXX) -q -c -P -o$@ $(SVGTEST_CXXFLAGS) $**
 
 $(OBJS)\svgtest_svgtest.obj: .\svgtest.cpp
        $(CXX) -q -c -P -o$@ $(SVGTEST_CXXFLAGS) $**


@@ -161,5 +163,5 @@ clean:
 
 $(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS)  $(OBJS)\svgtest_sample.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|
 
 $(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS)  $(OBJS)\svgtest_sample.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|

-       c0w32.obj $(SVGTEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\svgtest_sample.res
+       c0w32.obj $(SVGTEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\svgtest_sample.res

 |
 |

diff --git a/samples/svg/makefile.gcc b/samples/svg/makefile.gcc
index 029a9843b168a47b498032d4b5d60f697e16707a..1f4aa2c18ea30395c41a58620b4d6edbaf84364e 100644 (file)
--- a/samples/svg/makefile.gcc
+++ b/samples/svg/makefile.gcc
@@ -21,7 +21,7 @@ SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \

-       $(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS)
+       $(__DLLFLAG_p) -I..\..\..\samples -I.\..\..\include $(CXXFLAGS)

 SVGTEST_OBJECTS =  \
        $(OBJS)\svgtest_sample_rc.o \
        $(OBJS)\svgtest_svgtest.o
 SVGTEST_OBJECTS =  \
        $(OBJS)\svgtest_sample_rc.o \
        $(OBJS)\svgtest_svgtest.o


@@ -113,6 +113,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
 endif

+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif

 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif


@@ -131,8 +134,6 @@ ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
 endif
 
 __WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
 endif
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -143,7 +144,7 @@ $(OBJS):
 all: $(OBJS)\svgtest.exe
 
 $(OBJS)\svgtest_sample_rc.o: .\..\..\..\samples\sample.rc
 all: $(OBJS)\svgtest.exe
 
 $(OBJS)\svgtest_sample_rc.o: .\..\..\..\samples\sample.rc

-       windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../include --include-dir $(LIBDIRNAME) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib  --include-dir ./../../../src/regex --include-dir ./../../../src/expat/lib --include-dir . $(__DLLFLAG_p_1)
+       windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../include --include-dir $(LIBDIRNAME) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib  --include-dir ./../../../src/regex --include-dir ./../../../src/expat/lib --include-dir . $(__DLLFLAG_p_1) --include-dir ../../../samples

 
 $(OBJS)\svgtest_svgtest.o: .\svgtest.cpp
        $(CXX) -c -o $@ $(SVGTEST_CXXFLAGS) $<
 
 $(OBJS)\svgtest_svgtest.o: .\svgtest.cpp
        $(CXX) -c -o $@ $(SVGTEST_CXXFLAGS) $<


@@ -153,6 +154,6 @@ clean:
        -if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe
 
 $(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample_rc.o
        -if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe
 
 $(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample_rc.o

-       $(CXX) -o $@ $(SVGTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -o $@ $(SVGTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32

 
 .PHONY: all clean
 
 .PHONY: all clean

diff --git a/samples/svg/makefile.vc b/samples/svg/makefile.vc
index 0fc39b69d9f334e6ccc971761909eb58b60ee250..995ff3f059a1f6f16766cb5bda4fa19a19c32844 100644 (file)
--- a/samples/svg/makefile.vc
+++ b/samples/svg/makefile.vc
@@ -22,7 +22,7 @@ SVGTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \
        /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \
        /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \
        /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \
        /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \

-       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\include $(CXXFLAGS)
+       $(__DLLFLAG_p) /D_WINDOWS /I..\..\..\samples /I.\..\..\include $(CXXFLAGS)

 SVGTEST_OBJECTS =  \
        $(OBJS)\svgtest_sample.res \
        $(OBJS)\svgtest_svgtest.obj
 SVGTEST_OBJECTS =  \
        $(OBJS)\svgtest_sample.res \
        $(OBJS)\svgtest_svgtest.obj


@@ -140,6 +140,9 @@ __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -210,7 +213,7 @@ $(OBJS):
 all: $(OBJS)\svgtest.exe
 
 $(OBJS)\svgtest_sample.res: .\..\..\..\samples\sample.rc
 all: $(OBJS)\svgtest.exe
 
 $(OBJS)\svgtest_sample.res: .\..\..\..\samples\sample.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\src\tiff /i .\..\..\..\src\jpeg /i .\..\..\..\src\png /i .\..\..\..\src\zlib  /i .\..\..\..\src\regex /i .\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\src\tiff /i .\..\..\..\src\jpeg /i .\..\..\..\src\png /i .\..\..\..\src\zlib  /i .\..\..\..\src\regex /i .\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS /i ..\..\..\samples $**

 
 $(OBJS)\svgtest_svgtest.obj: .\svgtest.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(SVGTEST_CXXFLAGS) $**
 
 $(OBJS)\svgtest_svgtest.obj: .\svgtest.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(SVGTEST_CXXFLAGS) $**


@@ -222,5 +225,5 @@ clean:
 
 $(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<
 
 $(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<

-       $(SVGTEST_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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
+       $(SVGTEST_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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

 <<
 <<

diff --git a/samples/svg/makefile.wat b/samples/svg/makefile.wat
index 0fbf52ef55e906a6d7b444eae26d7ceb0b940635..14be83c80f4d8941f52cbd24cea2cbaa689f7467 100644 (file)
--- a/samples/svg/makefile.wat
+++ b/samples/svg/makefile.wat
@@ -162,12 +162,10 @@ SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
        $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) &
        -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png &
        -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib &
        $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) &
        -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png &
        -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib &

-       -i=. $(__DLLFLAG_p) -i=.\..\..\include $(CXXFLAGS)
+       -i=. $(__DLLFLAG_p) -i=..\..\..\samples -i=.\..\..\include $(CXXFLAGS)

 SVGTEST_OBJECTS =  &
        $(OBJS)\svgtest_svgtest.obj
 
 SVGTEST_OBJECTS =  &
        $(OBJS)\svgtest_svgtest.obj
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -178,7 +176,7 @@ $(OBJS) :
 all : .SYMBOLIC $(OBJS)\svgtest.exe
 
 $(OBJS)\svgtest_sample.res :  .AUTODEPEND .\..\..\..\samples\sample.rc
 all : .SYMBOLIC $(OBJS)\svgtest.exe
 
 $(OBJS)\svgtest_sample.res :  .AUTODEPEND .\..\..\..\samples\sample.rc

-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib  -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) $<
+       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib  -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=..\..\..\samples $<

 
 $(OBJS)\svgtest_svgtest.obj :  .AUTODEPEND .\svgtest.cpp
        $(CXX) -zq -fo=$^@ $(SVGTEST_CXXFLAGS) $<
 
 $(OBJS)\svgtest_svgtest.obj :  .AUTODEPEND .\svgtest.cpp
        $(CXX) -zq -fo=$^@ $(SVGTEST_CXXFLAGS) $<


@@ -197,6 +195,6 @@ $(OBJS)\svgtest.exe :  $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample.res
        @%append $(OBJS)\svgtest.lbc option incremental
        @%append $(OBJS)\svgtest.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(SVGTEST_OBJECTS)) do @%append $(OBJS)\svgtest.lbc file %i
        @%append $(OBJS)\svgtest.lbc option incremental
        @%append $(OBJS)\svgtest.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(SVGTEST_OBJECTS)) do @%append $(OBJS)\svgtest.lbc file %i

-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\svgtest.lbc library %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\svgtest.lbc library %i

        @%append $(OBJS)\svgtest.lbc option resource=$(OBJS)\svgtest_sample.res
        wlink @$(OBJS)\svgtest.lbc
        @%append $(OBJS)\svgtest.lbc option resource=$(OBJS)\svgtest_sample.res
        wlink @$(OBJS)\svgtest.lbc

diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in
index 627d91371e783d1b320f3e53a16faa7ef8f131e7..99c8be4823ebc02638b69a6ca3cf57a8cad89a9b 100644 (file)
--- a/samples/xrc/Makefile.in
+++ b/samples/xrc/Makefile.in
@@ -36,7 +36,8 @@ LIBDIRNAME = $(top_builddir)lib
 XRCDEMO_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) \
 XRCDEMO_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) $(__DLLFLAG_p) -I$(srcdir)/../../include $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -I../../../samples -I$(srcdir)/../../include \
+       $(CXXFLAGS)

 XRCDEMO_OBJECTS =  \
        xrcdemo_xrcdemo.o \
        xrcdemo_myframe.o \
 XRCDEMO_OBJECTS =  \
        xrcdemo_xrcdemo.o \
        xrcdemo_myframe.o \


@@ -107,8 +108,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \

-       $(__DLLFLAG_p_1) -i $(srcdir)/../../include -o xrcdemo$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r
+       $(__DLLFLAG_p_1) -i ../../../samples -i $(srcdir)/../../include -o \
+       xrcdemo$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
+       ../../../samples/sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)


@@ -176,7 +178,7 @@ xrcdemo_xrcdemo.o: $(srcdir)/xrcdemo.cpp
        $(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $<
 
 xrcdemo_xrcdemo_rc.o: $(srcdir)/xrcdemo.rc
        $(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $<
 
 xrcdemo_xrcdemo_rc.o: $(srcdir)/xrcdemo.rc

-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../include
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples --include-dir $(srcdir)/../../include

 
 
 # Include dependency info, if present:
 
 
 # Include dependency info, if present:

diff --git a/samples/xrc/makefile.bcc b/samples/xrc/makefile.bcc
index c77209b954492565171c577dabe882439513a446..edfc7e4dc35939d7f3f09e6d342f35bc1f9082d2 100644 (file)
--- a/samples/xrc/makefile.bcc
+++ b/samples/xrc/makefile.bcc
@@ -29,7 +29,8 @@ XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \
        -I$(LIBDIRNAME) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg \
        -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \
        -I$(LIBDIRNAME) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg \
        -I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex \

-       -I.\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS)
+       -I.\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I..\..\..\samples \
+       -I.\..\..\include $(CXXFLAGS)

 XRCDEMO_OBJECTS =  \
        $(OBJS)\xrcdemo_xrcdemo.obj \
        $(OBJS)\xrcdemo_myframe.obj \
 XRCDEMO_OBJECTS =  \
        $(OBJS)\xrcdemo_xrcdemo.obj \
        $(OBJS)\xrcdemo_myframe.obj \


@@ -122,6 +123,9 @@ __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -147,8 +151,6 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
 !endif
 
 __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
 !endif
 

-MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DWXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -171,7 +173,7 @@ $(OBJS)\xrcdemo_xrcdemo.obj: .\xrcdemo.cpp
        $(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) $**
 
 $(OBJS)\xrcdemo_xrcdemo.res: .\xrcdemo.rc
        $(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) $**
 
 $(OBJS)\xrcdemo_xrcdemo.res: .\xrcdemo.rc

-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib  -i.\..\..\..\src\regex -i.\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) -i.\..\..\include $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i$(LIBDIRNAME) -i.\..\..\..\src\tiff -i.\..\..\..\src\jpeg -i.\..\..\..\src\png -i.\..\..\..\src\zlib  -i.\..\..\..\src\regex -i.\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) -i..\..\..\samples -i.\..\..\include $**

 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -179,10 +181,10 @@ clean:
        -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe
 
 data: 
        -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe
 
 data: 

-       if not exist $(OBJS)/rc mkdir $(OBJS)/rc
-       for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)/rc\%f copy ./rc\%f $(OBJS)/rc
+       if not exist $(OBJS)\rc mkdir $(OBJS)\rc
+       for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc

 
 $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS)  $(OBJS)\xrcdemo_xrcdemo.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|
 
 $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS)  $(OBJS)\xrcdemo_xrcdemo.res
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|

-       c0w32.obj $(XRCDEMO_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\xrcdemo_xrcdemo.res
+       c0w32.obj $(XRCDEMO_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\xrcdemo_xrcdemo.res

 |
 |

diff --git a/samples/xrc/makefile.gcc b/samples/xrc/makefile.gcc
index 32ef8b1723c87410caefb9ec78baed4c3f697685..c05fab548641e821134706681a299e822bf196d7 100644 (file)
--- a/samples/xrc/makefile.gcc
+++ b/samples/xrc/makefile.gcc
@@ -21,7 +21,7 @@ XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
        -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \

-       $(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS)
+       $(__DLLFLAG_p) -I..\..\..\samples -I.\..\..\include $(CXXFLAGS)

 XRCDEMO_OBJECTS =  \
        $(OBJS)\xrcdemo_xrcdemo.o \
        $(OBJS)\xrcdemo_myframe.o \
 XRCDEMO_OBJECTS =  \
        $(OBJS)\xrcdemo_xrcdemo.o \
        $(OBJS)\xrcdemo_myframe.o \


@@ -116,6 +116,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
 endif

+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif

 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif


@@ -141,8 +144,6 @@ ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
 endif
 
 __WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
 endif
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -165,17 +166,17 @@ $(OBJS)\xrcdemo_xrcdemo.o: .\xrcdemo.cpp
        $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $<
 
 $(OBJS)\xrcdemo_xrcdemo_rc.o: .\xrcdemo.rc
        $(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $<
 
 $(OBJS)\xrcdemo_xrcdemo_rc.o: .\xrcdemo.rc

-       windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../include --include-dir $(LIBDIRNAME) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib  --include-dir ./../../../src/regex --include-dir ./../../../src/expat/lib --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../include
+       windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../include --include-dir $(LIBDIRNAME) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib  --include-dir ./../../../src/regex --include-dir ./../../../src/expat/lib --include-dir . $(__DLLFLAG_p_1) --include-dir ../../../samples --include-dir ./../../include

 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe
 
 data: 
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe
 
 data: 

-       if not exist $(OBJS)/rc mkdir $(OBJS)/rc
-       for %%f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)/rc\%%f copy ./rc\%%f $(OBJS)/rc
+       if not exist $(OBJS)\rc mkdir $(OBJS)\rc
+       for %%f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)\rc\%%f copy .\rc\%%f $(OBJS)\rc

 
 $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo_rc.o
 
 $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo_rc.o

-       $(CXX) -o $@ $(XRCDEMO_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -o $@ $(XRCDEMO_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32

 
 .PHONY: all clean data
 
 .PHONY: all clean data

diff --git a/samples/xrc/makefile.vc b/samples/xrc/makefile.vc
index c11f71b54e41b241045f9d02a2f3a0b9ec71ca81..75e4db36c56ab7de0d00ebd25ce3fc9da40c2fa0 100644 (file)
--- a/samples/xrc/makefile.vc
+++ b/samples/xrc/makefile.vc
@@ -22,7 +22,7 @@ XRCDEMO_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \
        /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \
        /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \
        /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \
        /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \

-       $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\include $(CXXFLAGS)
+       $(__DLLFLAG_p) /D_WINDOWS /I..\..\..\samples /I.\..\..\include $(CXXFLAGS)

 XRCDEMO_OBJECTS =  \
        $(OBJS)\xrcdemo_xrcdemo.obj \
        $(OBJS)\xrcdemo_myframe.obj \
 XRCDEMO_OBJECTS =  \
        $(OBJS)\xrcdemo_xrcdemo.obj \
        $(OBJS)\xrcdemo_myframe.obj \


@@ -143,6 +143,9 @@ __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
 !endif

+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -232,7 +235,7 @@ $(OBJS)\xrcdemo_xrcdemo.obj: .\xrcdemo.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) $**
 
 $(OBJS)\xrcdemo_xrcdemo.res: .\xrcdemo.rc
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) $**
 
 $(OBJS)\xrcdemo_xrcdemo.res: .\xrcdemo.rc

-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\src\tiff /i .\..\..\..\src\jpeg /i .\..\..\..\src\png /i .\..\..\..\src\zlib  /i .\..\..\..\src\regex /i .\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\include $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\src\tiff /i .\..\..\..\src\jpeg /i .\..\..\..\src\png /i .\..\..\..\src\zlib  /i .\..\..\..\src\regex /i .\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS /i ..\..\..\samples /i .\..\..\include $**

 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -240,10 +243,10 @@ clean:
        -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe
 
 data: 
        -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe
 
 data: 

-       if not exist $(OBJS)/rc mkdir $(OBJS)/rc
-       for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)/rc\%f copy ./rc\%f $(OBJS)/rc
+       if not exist $(OBJS)\rc mkdir $(OBJS)\rc
+       for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc

 
 $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<
 
 $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<

-       $(XRCDEMO_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__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
+       $(XRCDEMO_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__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

 <<
 <<

diff --git a/samples/xrc/makefile.wat b/samples/xrc/makefile.wat
index a5f2c17fe11af2d65f64f93c410661726a7b0e0f..5de89294e8554054b5ddfc61465c5c8f972c3b58 100644 (file)
--- a/samples/xrc/makefile.wat
+++ b/samples/xrc/makefile.wat
@@ -171,15 +171,13 @@ XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
        $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) &
        -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png &
        -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib &
        $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) &
        -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png &
        -i=.\..\..\..\src\zlib -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib &

-       -i=. $(__DLLFLAG_p) -i=.\..\..\include $(CXXFLAGS)
+       -i=. $(__DLLFLAG_p) -i=..\..\..\samples -i=.\..\..\include $(CXXFLAGS)

 XRCDEMO_OBJECTS =  &
        $(OBJS)\xrcdemo_xrcdemo.obj &
        $(OBJS)\xrcdemo_myframe.obj &
        $(OBJS)\xrcdemo_derivdlg.obj &
        $(OBJS)\xrcdemo_custclas.obj
 
 XRCDEMO_OBJECTS =  &
        $(OBJS)\xrcdemo_xrcdemo.obj &
        $(OBJS)\xrcdemo_myframe.obj &
        $(OBJS)\xrcdemo_derivdlg.obj &
        $(OBJS)\xrcdemo_custclas.obj
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -202,7 +200,7 @@ $(OBJS)\xrcdemo_xrcdemo.obj :  .AUTODEPEND .\xrcdemo.cpp
        $(CXX) -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $<
 
 $(OBJS)\xrcdemo_xrcdemo.res :  .AUTODEPEND .\xrcdemo.rc
        $(CXX) -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $<
 
 $(OBJS)\xrcdemo_xrcdemo.res :  .AUTODEPEND .\xrcdemo.rc

-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib  -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=.\..\..\include $<
+       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\..\src\tiff -i=.\..\..\..\src\jpeg -i=.\..\..\..\src\png -i=.\..\..\..\src\zlib  -i=.\..\..\..\src\regex -i=.\..\..\..\src\expat\lib -i=. $(__DLLFLAG_p) -i=..\..\..\samples -i=.\..\..\include $<

 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -212,8 +210,8 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe
 
 data : .SYMBOLIC 
        -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe
 
 data : .SYMBOLIC 

-       if not exist $(OBJS)/rc mkdir $(OBJS)/rc
-       for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)/rc\%f copy ./rc\%f $(OBJS)/rc
+       if not exist $(OBJS)\rc mkdir $(OBJS)\rc
+       for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc

 
 $(OBJS)\xrcdemo.exe :  $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res
        @%create $(OBJS)\xrcdemo.lbc
 
 $(OBJS)\xrcdemo.exe :  $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res
        @%create $(OBJS)\xrcdemo.lbc


@@ -222,6 +220,6 @@ $(OBJS)\xrcdemo.exe :  $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res
        @%append $(OBJS)\xrcdemo.lbc option incremental
        @%append $(OBJS)\xrcdemo.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(XRCDEMO_OBJECTS)) do @%append $(OBJS)\xrcdemo.lbc file %i
        @%append $(OBJS)\xrcdemo.lbc option incremental
        @%append $(OBJS)\xrcdemo.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(XRCDEMO_OBJECTS)) do @%append $(OBJS)\xrcdemo.lbc file %i

-       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\xrcdemo.lbc library %i
+       @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc.lib $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\xrcdemo.lbc library %i

        @%append $(OBJS)\xrcdemo.lbc option resource=$(OBJS)\xrcdemo_xrcdemo.res
        wlink @$(OBJS)\xrcdemo.lbc
        @%append $(OBJS)\xrcdemo.lbc option resource=$(OBJS)\xrcdemo_xrcdemo.res
        wlink @$(OBJS)\xrcdemo.lbc

diff --git a/utils/wxrc/makefile.bcc b/utils/wxrc/makefile.bcc
index b12fbda6f658ba5a086cf819cdfd48cbc7101982..02523f9cc7debbd9c3d3442825f2ac0bdac2d90f 100644 (file)
--- a/utils/wxrc/makefile.bcc
+++ b/utils/wxrc/makefile.bcc
@@ -107,6 +107,9 @@ __RUNTIME_LIBS_7 =
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !endif
 !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
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -121,8 +124,6 @@ __WXLIB_XML_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 !endif
 
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 !endif
 

-MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DWXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -142,5 +143,5 @@ clean:
 
 $(OBJS)\wxrc.exe: $(WXRC_OBJECTS)
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap @&&|
 
 $(OBJS)\wxrc.exe: $(WXRC_OBJECTS)
        ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap @&&|

-       c0x32.obj $(WXRC_OBJECTS),$@,, $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,,
+       c0x32.obj $(WXRC_OBJECTS),$@,, $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,,

 |
 |

diff --git a/utils/wxrc/makefile.gcc b/utils/wxrc/makefile.gcc
index 0e3e818ced89f23aaa44bce9690c8ca4e1495586..67d5d39425a71468345670e9a6270f008eb3d11b 100644 (file)
--- a/utils/wxrc/makefile.gcc
+++ b/utils/wxrc/makefile.gcc
@@ -98,6 +98,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 endif

+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif

 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif


@@ -112,8 +115,6 @@ ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 endif
 
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 endif
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all: $(OBJS)
 $(OBJS):
 
 all: $(OBJS)
 $(OBJS):


@@ -131,6 +132,6 @@ clean:
        -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe
 
 $(OBJS)\wxrc.exe: $(WXRC_OBJECTS)
        -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe
 
 $(OBJS)\wxrc.exe: $(WXRC_OBJECTS)

-       $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME)   $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME)   $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32

 
 .PHONY: all clean
 
 .PHONY: all clean

diff --git a/utils/wxrc/makefile.vc b/utils/wxrc/makefile.vc
index c0bca85b205275c1ecd1f3d8760d1ecb40f559c6..418da18c1ea35e2093335b74e1dca6889c5ad536 100644 (file)
--- a/utils/wxrc/makefile.vc
+++ b/utils/wxrc/makefile.vc
@@ -127,6 +127,9 @@ __RUNTIME_LIBS_7 = T
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !endif
 !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
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -181,5 +184,5 @@ clean:
 
 $(OBJS)\wxrc.exe: $(WXRC_OBJECTS)
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE @<<
 
 $(OBJS)\wxrc.exe: $(WXRC_OBJECTS)
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE @<<

-       $(WXRC_OBJECTS)  $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__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
+       $(WXRC_OBJECTS)  $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__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

 <<
 <<

diff --git a/utils/wxrc/makefile.wat b/utils/wxrc/makefile.wat
index 6e3a55627215bd15f11d72dba4f803d77e952dd3..29f86838cc2c74769c63d2b4e74a07a275074313 100644 (file)
--- a/utils/wxrc/makefile.wat
+++ b/utils/wxrc/makefile.wat
@@ -165,8 +165,6 @@ WXRC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
 WXRC_OBJECTS =  &
        $(OBJS)\wxrc_wxrc.obj
 
 WXRC_OBJECTS =  &
        $(OBJS)\wxrc_wxrc.obj
 

-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-

 
 all : $(OBJS)
 $(OBJS) :
 
 all : $(OBJS)
 $(OBJS) :


@@ -193,6 +191,6 @@ $(OBJS)\wxrc.exe :  $(WXRC_OBJECTS)
        @%append $(OBJS)\wxrc.lbc option incremental
        @%append $(OBJS)\wxrc.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_'
        @for %i in ($(WXRC_OBJECTS)) do @%append $(OBJS)\wxrc.lbc file %i
        @%append $(OBJS)\wxrc.lbc option incremental
        @%append $(OBJS)\wxrc.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_'
        @for %i in ($(WXRC_OBJECTS)) do @%append $(OBJS)\wxrc.lbc file %i

-       @for %i in ( $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\wxrc.lbc library %i
+       @for %i in ( $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__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 ) do @%append $(OBJS)\wxrc.lbc library %i

        @%append $(OBJS)\wxrc.lbc
        wlink @$(OBJS)\wxrc.lbc
        @%append $(OBJS)\wxrc.lbc
        wlink @$(OBJS)\wxrc.lbc