From a4fe6524851ebeed1f6d24e8e3fa53b706479ff6 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 29 Apr 1999 15:57:41 +0000 Subject: [PATCH] Added $(NEW_WXLIBNAME) to allow changing the library or DLL name git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/makevc.env | 4 ++++ src/msw/makefile.vc | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/makevc.env b/src/makevc.env index 9ce663d59e..d73db5b206 100644 --- a/src/makevc.env +++ b/src/makevc.env @@ -120,6 +120,10 @@ WXLIBNAME=wx200 WXLIBNAME=wx !endif +!if "$(NEW_WXLIBNAME)" != "" +WXLIBNAME=$(NEW_WXLIBNAME) +!endif + !if "$(FINAL)" == "1" D=Release !else diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index e80cec04b3..e5f0d9eff4 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -287,10 +287,10 @@ $(OLEDIR)\$D: # wxWindows library as DLL dll: - nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 + nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) cleandll: - nmake -f makefile.vc clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 + nmake -f makefile.vc clean FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME) # wxWindows + app as DLL. Only affects main.cpp. dllapp: @@ -311,7 +311,7 @@ dllnp: # or an app is calling the DLL exported functionality (WXDLLEXPORT is different # in each case) so you couldn't use the same PCH. pch: - nmake -f makefile.vc pch1 WXUSINGDLL=1 FINAL=$(FINAL) + nmake -f makefile.vc pch1 WXUSINGDLL=1 FINAL=$(FINAL) NEW_WXLIBNAME=$(NEW_WXLIBNAME) pch1: dirs $(DUMMYOBJ) echo $(DUMMYOBJ) -- 2.45.2