fix name of borland dll
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -77,11 +77,11 @@ DLL=0
|
||||
# options and all the obj files, and note that you must delete the obj files if you
|
||||
# change the options so that they are compiled using the correct ones.
|
||||
|
||||
!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
|
||||
WXLIBNAME=wx32
|
||||
!else
|
||||
WXLIBNAME=wx32
|
||||
!endif
|
||||
|
||||
##need to change this with version
|
||||
## in 2.4.0 was wx32
|
||||
WXLIBNAME=wx24
|
||||
|
||||
|
||||
## Use this if you want to use the UNIV controls set rather than the native ones
|
||||
## make -f makefile.b32 WXUSINGUNIV=1
|
||||
@@ -133,8 +133,8 @@ INCEXT=dll$(INCEXT)
|
||||
WXLIBDIR=$(WXDIR)\lib
|
||||
!endif
|
||||
|
||||
WXLIB=$(WXLIBDIR)\$(WXLIBNAME).lib
|
||||
WXDLL=$(WXLIBDIR)\$(WXLIBNAME).dll
|
||||
WXLIB=$(WXLIBDIR)\$(WXLIBNAME)_bcc.lib
|
||||
WXDLL=$(WXLIBDIR)\$(WXLIBNAME)_bcc.dll
|
||||
|
||||
!if "$(WXMAKINGDLL)" == "1"
|
||||
DLL_FLAGS= -DWXMAKINGDLL=1 -D_RTLDLL
|
||||
|
Reference in New Issue
Block a user