Applied patch [ 868373 ] Missed Unicode markup in menu sample

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

diff --git a/samples/sockets/makefile.vc b/samples/sockets/makefile.vc
index 103170f4fe2b866a52aaa4fdd7be710c07992993..ae48b3c02e3fff80092722dce36d24729a59ba6e 100644 (file)
--- a/samples/sockets/makefile.vc
+++ b/samples/sockets/makefile.vc
@@ -12,21 +12,23 @@
 
 ### Variables: ###
 
-CLIENT_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \
-       $(__DEBUGINFO_2) /Fd$(OBJS)\client.pdb $(____DEBUGRUNTIME_2_p) \
+CLIENT_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \
+       $(__DEBUGINFO) /Fd$(OBJS)\client.pdb $(____DEBUGRUNTIME_2_p) \
        $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \
-       /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) /GR /GX
+       /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_0) \
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
 CLIENT_OBJECTS =  \
        $(OBJS)\client_client.obj \
        $(OBJS)\client_client.res
 OBJS = \
        vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-SERVER_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_14) /DWIN32 \
-       $(__DEBUGINFO_2) /Fd$(OBJS)\server.pdb $(____DEBUGRUNTIME_13_p) \
+SERVER_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_16) /DWIN32 \
+       $(__DEBUGINFO) /Fd$(OBJS)\server.pdb $(____DEBUGRUNTIME_15_p) \
        $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I$(SETUPHDIR) \
-       /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(CXXFLAGS) /GR /GX
+       /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples $(__EXCEPTIONSFLAG_0) \
+       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
 SERVER_OBJECTS =  \
        $(OBJS)\server_server.obj \
        $(OBJS)\server_server.res
@@ -63,7 +65,7 @@ WXUNICODEFLAG = u
 WXUNIVNAME = univ
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = d
+__DEBUGINFO = /Zi
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO = 
@@ -72,7 +74,7 @@ __DEBUGINFO =
 __DEBUGINFO = 
 !endif
 !if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = d
+__DEBUGINFO = /Zi
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO_1 = /DEBUG
@@ -87,7 +89,7 @@ __DEBUGINFO_1 =
 __DEBUGINFO_1 = /DEBUG
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_2 = /Zi
+__DEBUGINFO_2 = d
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO_2 = 
@@ -96,16 +98,16 @@ __DEBUGINFO_2 =
 __DEBUGINFO_2 = 
 !endif
 !if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_2 = /Zi
+__DEBUGINFO_2 = d
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-__DEBUGRUNTIME_14 = 
+__DEBUGRUNTIME_16 = 
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-__DEBUGRUNTIME_14 = d
+__DEBUGRUNTIME_16 = d
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_14 = $(__DEBUGINFO)
+__DEBUGRUNTIME_16 = $(__DEBUGINFO_2)
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
 __DEBUGRUNTIME_3 = 
@@ -114,7 +116,7 @@ __DEBUGRUNTIME_3 =
 __DEBUGRUNTIME_3 = d
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 = $(__DEBUGINFO)
+__DEBUGRUNTIME_3 = $(__DEBUGINFO_2)
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
 __DEBUG_DEFINE_p = /D__WXDEBUG__
@@ -134,6 +136,18 @@ __DLLFLAG_p = /DWXUSINGDLL
 !if "$(SHARED)" == "1"
 __DLLFLAG_p_0 = /d WXUSINGDLL
 !endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG = /GX
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_0 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_0 = /GR
+!endif
 !if "$(USE_GUI)" == "1"
 __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
 !endif
@@ -221,22 +235,22 @@ ____DEBUGINFO_0 =
 ____DEBUGINFO_0 = /d _DEBUG
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_13_p = 
+____DEBUGRUNTIME_15_p = 
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_13_p = /D_DEBUG
+____DEBUGRUNTIME_15_p = /D_DEBUG
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_13_p = $(____DEBUGINFO)
+____DEBUGRUNTIME_15_p = $(____DEBUGINFO)
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_13_p_1 = 
+____DEBUGRUNTIME_15_p_1 = 
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_13_p_1 = /d _DEBUG
+____DEBUGRUNTIME_15_p_1 = /d _DEBUG
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_13_p_1 = $(____DEBUGINFO_0)
+____DEBUGRUNTIME_15_p_1 = $(____DEBUGINFO_0)
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
 ____DEBUGRUNTIME_2_p = 
@@ -276,7 +290,7 @@ $(OBJS)\server_server.obj: .\server.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(SERVER_CXXFLAGS) $**
 
 $(OBJS)\server_server.res: .\server.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_13_p_1) $(__NO_VC_CRTDBG_p_0) /d __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) /i .\..\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_0) /d _WINDOWS /i .\..\..\samples $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_15_p_1) $(__NO_VC_CRTDBG_p_0) /d __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) /i .\..\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_0) /d _WINDOWS /i .\..\..\samples $**
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj