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
This commit is contained in:
parent
19da43267e
commit
a4fe652485
@ -120,6 +120,10 @@ WXLIBNAME=wx200
|
||||
WXLIBNAME=wx
|
||||
!endif
|
||||
|
||||
!if "$(NEW_WXLIBNAME)" != ""
|
||||
WXLIBNAME=$(NEW_WXLIBNAME)
|
||||
!endif
|
||||
|
||||
!if "$(FINAL)" == "1"
|
||||
D=Release
|
||||
!else
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user