From b5ff2fbd94fb04fbf315a3835b12a80f1d1f3846 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 5 Jun 2001 22:06:06 +0000 Subject: [PATCH] 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 --- contrib/utils/wxrc/makefile.vc | 9 ++++++++- contrib/utils/wxrcedit/makefile.vc | 8 +++++++- utils/wxrc/makefile.vc | 9 ++++++++- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/contrib/utils/wxrc/makefile.vc b/contrib/utils/wxrc/makefile.vc index 4623b7a808..aee28399d3 100644 --- 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 69a54242d2..36fdc9e84d 100644 --- 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 4623b7a808..aee28399d3 100644 --- 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 -- 2.45.2