projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added wxcompliant patterns for hatched brushes
[wxWidgets.git]
/
src
/
makeb32.env
diff --git
a/src/makeb32.env
b/src/makeb32.env
index 145d7e611e9604458ae4851ae6b63ebc0d496da8..e6a4ba6b933c6f8c1320e046866dd2c62ea5cb91 100644
(file)
--- a/
src/makeb32.env
+++ b/
src/makeb32.env
@@
-1,14
+1,26
@@
# Common settings for Borland 32-bit compilation (makefile.b32 files)
# Common settings for Borland 32-bit compilation (makefile.b32 files)
+!if "$(RM)" == ""
+RM= erase
+!endif
+
WXDIR = $(WXWIN)
CFG = $(WXDIR)\src\msw\wxwin32.cfg
WXDIR = $(WXWIN)
CFG = $(WXDIR)\src\msw\wxwin32.cfg
+# Using a config file isn't compatible across all BC++ versions
+# LNKCFG=$(WXDIR)\src\msw\bclnk32.cfg
WXLIBDIR = $(WXDIR)\lib
WXLIBDIR2 = $(WXDIR)\contrib\lib
WXLIBDIR = $(WXDIR)\lib
WXLIBDIR2 = $(WXDIR)\contrib\lib
-WXINC = $(WXDIR)\include;$(WXDIR)\contrib\include;$(WXDIR)\src\iodbc
+WXINC = $(WXDIR)\include;$(WXDIR)\contrib\include;$(WXDIR)\src\iodbc
;$(WXDIR)\src\regex;
WIN95FLAG = -D__WIN95__ -D__WINDOWS__
WIN95FLAG = -D__WIN95__ -D__WINDOWS__
-
-# This should be changed to ilink32 for C++Builder 4 and above
-LINK=tlink32
+RFLAGS = -i$(WXDIR)\include;$(WXDIR)\src
+
+# This should be changed to tlink32 if ilink32 is not available.
+# Ilink32 is available on BC++ 5.02 and above, and all
+# versions of C++ Builder.
+!ifndef LINK
+LINK=ilink32
+#LINK=tlink32
+!endif
!ifndef FINAL
FINAL=0
!ifndef FINAL
FINAL=0
@@
-35,16
+47,16
@@
DLL=0
#
!if "$(WXMAKINGDLL)" == "1"
#
!if "$(WXMAKINGDLL)" == "1"
-DLL_FLAGS= -DWXMAKINGDLL=1 -D_
WIN
DLL
-WXLIB= $(WXLIBDIR)\wx2
00
.lib
+DLL_FLAGS= -DWXMAKINGDLL=1 -D_
RTL
DLL
+WXLIB= $(WXLIBDIR)\wx2
32
.lib
!else
!else
-LINK_FLAGS= /
Tpe /ap
/c
+LINK_FLAGS= /
aa
/c
!if "$(WXUSINGDLL)" == "1"
!if "$(WXUSINGDLL)" == "1"
-DLL_FLAGS= -DWXUSINGDLL=1
-WXLIB= $(WXLIBDIR)\wx2
00
.lib
+DLL_FLAGS= -DWXUSINGDLL=1
-D_RTLDLL
+WXLIB= $(WXLIBDIR)\wx2
32
.lib
!else
DLL_FLAGS=
WXLIB= $(WXLIBDIR)\wx32.lib
!else
DLL_FLAGS=
WXLIB= $(WXLIBDIR)\wx32.lib
@@
-53,8
+65,7
@@
WXLIB= $(WXLIBDIR)\wx32.lib
!endif
!if "$(WXBUILDDLL)" == "1"
!endif
!if "$(WXBUILDDLL)" == "1"
-DLL_FLAGS= $(DLL_FLAGS) -D_RTLDLL
-LINK_FLAGS= /Tpd /ap /c $(EXTRALINKFLAGS)
+LINK_FLAGS= /Tpd /c $(EXTRALINKFLAGS)
!endif
CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG)
!endif
CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG)