XML code needs wchar_t

[wxWidgets.git] / samples / vscroll / makefile.vc

diff --git a/samples/vscroll/makefile.vc b/samples/vscroll/makefile.vc
index b31384e5b52c6bf00caf8491e4ab95c495bcf3bb..460cd38c06232081cbe215abd2aec9822af4c61c 100644 (file)
--- a/samples/vscroll/makefile.vc
+++ b/samples/vscroll/makefile.vc
@@ -13,7 +13,7 @@
 ### Variables: ###
 
 OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 ### Variables: ###
 
 OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

-VSCROLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\vscroll.pdb $(__OPTIMIZEFLAG_3)  /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib  /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS)
+VSCROLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGFLAG_2) /DWIN32 $(__DEBUGFLAG_0) /Fd$(OBJS)\vscroll.pdb $(____DEBUGFLAG_3_p) $(__OPTIMIZEFLAG_4)  /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib  /I.\..\..\src\regex /I.\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_WINDOWS $(CXXFLAGS)

 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 


@@ -66,16 +66,16 @@ __DLLFLAG_p = /DWXUSINGDLL
 __DLLFLAG_p_1 = /dWXUSINGDLL
 !endif
 !if "$(BUILD)" == "debug"
 __DLLFLAG_p_1 = /dWXUSINGDLL
 !endif
 !if "$(BUILD)" == "debug"

-__OPTIMIZEFLAG_3 = /Od
+__OPTIMIZEFLAG_4 = /Od

 !endif
 !if "$(BUILD)" == "release"
 !endif
 !if "$(BUILD)" == "release"

-__OPTIMIZEFLAG_3 = /O2
+__OPTIMIZEFLAG_4 = /O2

 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"

-__RUNTIME_LIBS_6 = D
+__RUNTIME_LIBS_7 = D

 !endif
 !if "$(RUNTIME_LIBS)" == "static"
 !endif
 !if "$(RUNTIME_LIBS)" == "static"

-__RUNTIME_LIBS_6 = T
+__RUNTIME_LIBS_7 = T

 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1


@@ -98,6 +98,18 @@ __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
 !if "$(WXUNIV)" == "1"
 __WXUNIV_DEFINE_p_1 = /d__WXUNIVERSAL__
 !endif
 !if "$(WXUNIV)" == "1"
 __WXUNIV_DEFINE_p_1 = /d__WXUNIVERSAL__
 !endif

+!if "$(BUILD)" == "debug"
+____DEBUGFLAG_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release"
+____DEBUGFLAG_3_p = /DNDEBUG
+!endif
+!if "$(BUILD)" == "debug"
+____DEBUGFLAG_3_p_1 = /d_DEBUG
+!endif
+!if "$(BUILD)" == "release"
+____DEBUGFLAG_3_p_1 = /dNDEBUG
+!endif

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


@@ -112,7 +124,7 @@ $(OBJS)\vscroll_vscroll.obj: .\vscroll.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(VSCROLL_CXXFLAGS) $**
 
 $(OBJS)\vscroll_vscroll.res: .\vscroll.rc
        $(CXX) /c /nologo /TP /Fo$@ $(VSCROLL_CXXFLAGS) $**
 
 $(OBJS)\vscroll_vscroll.res: .\vscroll.rc

-       rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib  /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $**
+       rc /fo$@ /dWIN32 $(____DEBUGFLAG_3_p_1) /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /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 $**

 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj


@@ -120,6 +132,6 @@ clean:
        -if exist $(OBJS)\vscroll.exe del $(OBJS)\vscroll.exe
 
 $(OBJS)\vscroll.exe: $(OBJS)\vscroll_vscroll.obj $(OBJS)\vscroll_vscroll.res
        -if exist $(OBJS)\vscroll.exe del $(OBJS)\vscroll.exe
 
 $(OBJS)\vscroll.exe: $(OBJS)\vscroll_vscroll.obj $(OBJS)\vscroll_vscroll.res

-       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1)  /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  /SUBSYSTEM:WINDOWS @<<
-       $(OBJS)\vscroll_vscroll.obj $(OBJS)\vscroll_vscroll.res  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(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
+       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1)  /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS  @<<
+       $(OBJS)\vscroll_vscroll.obj $(OBJS)\vscroll_vscroll.res  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib 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

 <<
 <<