Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added $(NEW_WXLIBNAME) to allow changing the library or DLL name

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1999-04-29 15:57:41 +00:00
parent 19da43267e
commit a4fe652485
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/makevc.env
View File

@@ -120,6 +120,10 @@ WXLIBNAME=wx200
WXLIBNAME=wx WXLIBNAME=wx
!endif !endif
!if "$(NEW_WXLIBNAME)" != ""
WXLIBNAME=$(NEW_WXLIBNAME)
!endif
!if "$(FINAL)" == "1" !if "$(FINAL)" == "1"
D=Release D=Release
!else !else

6
src/msw/makefile.vc
View File

@@ -287,10 +287,10 @@ $(OLEDIR)\$D:
# wxWindows library as DLL # wxWindows library as DLL
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: 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. # wxWindows + app as DLL. Only affects main.cpp.
dllapp: dllapp:
@@ -311,7 +311,7 @@ dllnp:
# or an app is calling the DLL exported functionality (WXDLLEXPORT is different # or an app is calling the DLL exported functionality (WXDLLEXPORT is different
# in each case) so you couldn't use the same PCH. # in each case) so you couldn't use the same PCH.
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) pch1: dirs $(DUMMYOBJ)
echo $(DUMMYOBJ) echo $(DUMMYOBJ)