Fixed to recognise the FINAL=hybrid make flag and to then use the

right library.

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

diff --git a/contrib/utils/wxrc/makefile.vc b/contrib/utils/wxrc/makefile.vc
index 4623b7a8089ed7ca3e5d23eb32c4799987bc84ff..aee28399d3f11dba2ff1c61111d37a384ae827af 100644 (file)
--- a/contrib/utils/wxrc/makefile.vc
+++ b/contrib/utils/wxrc/makefile.vc
@@ -19,10 +19,17 @@ FINAL=0
 
 !if "$(FINAL)" == "0"
 EXTRALIBS=$(WXDIR)\lib\wxxmld.lib
-!else
+!endif
+
+!if "$(FINAL)" == "1"
 EXTRALIBS=$(WXDIR)\lib\wxxml.lib
 !endif
 
+!if "$(FINAL)" == "hybrid"
+EXTRALIBS=$(WXDIR)\lib\wxxmlh.lib
+!endif
+
+
 OBJECTS = $(PROGRAM).obj
 
 !include $(WXDIR)\src\makeprog.vc

diff --git a/contrib/utils/wxrcedit/makefile.vc b/contrib/utils/wxrcedit/makefile.vc
index 69a54242d20064f1b57117d13956704163a0597f..36fdc9e84ddc961e1b8ebe688e1bd9c2e96aa38d 100644 (file)
--- a/contrib/utils/wxrcedit/makefile.vc
+++ b/contrib/utils/wxrcedit/makefile.vc
@@ -19,10 +19,16 @@ FINAL=0
 
 !if "$(FINAL)" == "0"
 EXTRALIBS=$(WXDIR)\lib\wxxmld.lib
-!else
+!endif
+
+!if "$(FINAL)" == "1"
 EXTRALIBS=$(WXDIR)\lib\wxxml.lib
 !endif
 
+!if "$(FINAL)" == "hybrid"
+EXTRALIBS=$(WXDIR)\lib\wxxmlh.lib
+!endif
+
 OBJECTS=edapp.obj editor.obj nodehnd.obj xmlhelpr.obj preview.obj nodesdb.obj \
         pe_basic.obj pe_adv.obj propedit.obj propframe.obj splittree.obj
 

diff --git a/utils/wxrc/makefile.vc b/utils/wxrc/makefile.vc
index 4623b7a8089ed7ca3e5d23eb32c4799987bc84ff..aee28399d3f11dba2ff1c61111d37a384ae827af 100644 (file)
--- a/utils/wxrc/makefile.vc
+++ b/utils/wxrc/makefile.vc
@@ -19,10 +19,17 @@ FINAL=0
 
 !if "$(FINAL)" == "0"
 EXTRALIBS=$(WXDIR)\lib\wxxmld.lib
-!else
+!endif
+
+!if "$(FINAL)" == "1"
 EXTRALIBS=$(WXDIR)\lib\wxxml.lib
 !endif
 
+!if "$(FINAL)" == "hybrid"
+EXTRALIBS=$(WXDIR)\lib\wxxmlh.lib
+!endif
+
+
 OBJECTS = $(PROGRAM).obj
 
 !include $(WXDIR)\src\makeprog.vc