X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/25a73439590e04730168bee6b691bd6233880ad4..ef76cf4c6591148a7f588cd6b57dc3a0b1c126ab:/samples/printing/makefile.vc

diff --git a/samples/printing/makefile.vc b/samples/printing/makefile.vc
index 996b10d165..b69bdc5739 100644
--- a/samples/printing/makefile.vc
+++ b/samples/printing/makefile.vc
@@ -4,7 +4,7 @@
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
-!include <../../build/config.vc>
+!include <../../build/msw/config.vc>
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
@@ -21,7 +21,8 @@ PRINTING_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \
 	$(__OPTIMIZEFLAG_4) /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) /D_WINDOWS $(CXXFLAGS)
+	/I.\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_WINDOWS /I..\..\samples \
+	$(CXXFLAGS)
 PRINTING_OBJECTS =  \
 	$(OBJS)\printing_printing.obj \
 	$(OBJS)\printing_printing.res
@@ -139,6 +140,9 @@ __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !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
@@ -160,10 +164,10 @@ __WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
 ____DEBUGINFO_2_p = /D_DEBUG
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO_2_p = /DNDEBUG
+____DEBUGINFO_2_p = 
 !endif
 !if "$(DEBUG_INFO)" == "0"
-____DEBUGINFO_2_p = /DNDEBUG
+____DEBUGINFO_2_p = 
 !endif
 !if "$(DEBUG_INFO)" == "1"
 ____DEBUGINFO_2_p = /D_DEBUG
@@ -172,16 +176,16 @@ ____DEBUGINFO_2_p = /D_DEBUG
 ____DEBUGINFO_2_p_1 = /d _DEBUG
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO_2_p_1 = /d NDEBUG
+____DEBUGINFO_2_p_1 = 
 !endif
 !if "$(DEBUG_INFO)" == "0"
-____DEBUGINFO_2_p_1 = /d NDEBUG
+____DEBUGINFO_2_p_1 = 
 !endif
 !if "$(DEBUG_INFO)" == "1"
 ____DEBUGINFO_2_p_1 = /d _DEBUG
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p = /DNDEBUG
+____DEBUGRUNTIME_2_p = 
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
 ____DEBUGRUNTIME_2_p = /D_DEBUG
@@ -190,7 +194,7 @@ ____DEBUGRUNTIME_2_p = /D_DEBUG
 ____DEBUGRUNTIME_2_p = $(____DEBUGINFO_2_p)
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_2_p_1 = /d NDEBUG
+____DEBUGRUNTIME_2_p_1 = 
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
 ____DEBUGRUNTIME_2_p_1 = /d _DEBUG
@@ -212,7 +216,7 @@ $(OBJS)\printing_printing.obj: .\printing.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(PRINTING_CXXFLAGS) $**
 
 $(OBJS)\printing_printing.res: .\printing.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
@@ -221,5 +225,5 @@ clean:
 
 $(OBJS)\printing.exe: $(PRINTING_OBJECTS) $(OBJS)\printing_printing.res
 	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<
-	$(PRINTING_OBJECTS)  $(__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
+	$(PRINTING_OBJECTS)  $(__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
 <<