Hopefully fixed library names generated by wx-config for OS/2's PM port.

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

diff --git a/samples/erase/makefile.vc b/samples/erase/makefile.vc
index 123844319f79e7ec252298069122f49f92a286db..78dec84e1ee9fa0786de82140de12e79a33a04c6 100644 (file)
--- a/samples/erase/makefile.vc
+++ b/samples/erase/makefile.vc
@@ -12,7 +12,7 @@
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-WX_RELEASE_NODOT = 25
+WX_RELEASE_NODOT = 26

 OBJS = \
        vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = .\..\..\lib\vc_$(LIBTYPE_SUFFIX)$(CFG)
 OBJS = \
        vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = .\..\..\lib\vc_$(LIBTYPE_SUFFIX)$(CFG)


@@ -88,26 +88,23 @@ __DEBUGINFO_1 =
 !if "$(DEBUG_INFO)" == "1"
 __DEBUGINFO_1 = /DEBUG
 !endif
 !if "$(DEBUG_INFO)" == "1"
 __DEBUGINFO_1 = /DEBUG
 !endif

+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_2_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_2_p = 
+!endif

 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
 ____DEBUGRUNTIME_2_p = 
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
 ____DEBUGRUNTIME_2_p = /D_DEBUG
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
 ____DEBUGRUNTIME_2_p = 
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
 ____DEBUGRUNTIME_2_p = /D_DEBUG
 !endif

-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p = $(____DEBUGINFO_2_p)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO_2_p = /D_DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO_2_p = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-____DEBUGINFO_2_p = 
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_2_p_1 = /d _DEBUG

 !endif
 !endif

-!if "$(DEBUG_INFO)" == "1"
-____DEBUGINFO_2_p = /D_DEBUG
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_2_p_1 = 

 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
 ____DEBUGRUNTIME_2_p_1 = 
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
 ____DEBUGRUNTIME_2_p_1 = 


@@ -115,20 +112,11 @@ ____DEBUGRUNTIME_2_p_1 =
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
 ____DEBUGRUNTIME_2_p_1 = /d _DEBUG
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
 ____DEBUGRUNTIME_2_p_1 = /d _DEBUG
 !endif

-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_2_p_1 = $(____DEBUGINFO_2_p_1)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO_2_p_1 = /d _DEBUG
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-____DEBUGINFO_2_p_1 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-____DEBUGINFO_2_p_1 = 
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_3 = d

 !endif
 !endif

-!if "$(DEBUG_INFO)" == "1"
-____DEBUGINFO_2_p_1 = /d _DEBUG
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_3 = 

 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
 __DEBUGRUNTIME_3 = 
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "0"
 __DEBUGRUNTIME_3 = 


@@ -136,21 +124,6 @@ __DEBUGRUNTIME_3 =
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
 __DEBUGRUNTIME_3 = d
 !endif
 !if "$(DEBUG_RUNTIME_LIBS)" == "1"
 __DEBUGRUNTIME_3 = d
 !endif

-!if "$(DEBUG_RUNTIME_LIBS)" == "default"
-__DEBUGRUNTIME_3 = $(__DEBUGINFO_3)
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_3 = d
-!endif
-!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_3 = 
-!endif
-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_3 = 
-!endif
-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_3 = d
-!endif

 !if "$(BUILD)" == "debug"
 __OPTIMIZEFLAG_4 = /Od
 !endif
 !if "$(BUILD)" == "debug"
 __OPTIMIZEFLAG_4 = /Od
 !endif