removed incorrect 'static' keyword from var declarations

[wxWidgets.git] / src / makeb32.env

diff --git a/src/makeb32.env b/src/makeb32.env
index 7eae33781eb20636c80557b16a9db6e9b92485a5..dd0cf6467f3bfc619c3daa84965b23a08414a7b0 100644 (file)
--- a/src/makeb32.env
+++ b/src/makeb32.env
@@ -2,9 +2,21 @@
 
 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
 WXLIBDIR = $(WXDIR)\lib

-WXINC = $(WXDIR)\include;$(WXDIR)\src\iodbc
+WXLIBDIR2 = $(WXDIR)\contrib\lib
+WXINC = $(WXDIR)\include;$(WXDIR)\contrib\include;$(WXDIR)\src\iodbc;

 WIN95FLAG = -D__WIN95__ -D__WINDOWS__
 WIN95FLAG = -D__WIN95__ -D__WINDOWS__

+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


@@ -31,16 +43,16 @@ DLL=0
 #
 
 !if "$(WXMAKINGDLL)" == "1"
 #
 
 !if "$(WXMAKINGDLL)" == "1"

-DLL_FLAGS= -DWXMAKINGDLL=1 -D_WINDLL
-WXLIB= $(WXLIBDIR)\wx200.lib
+DLL_FLAGS= -DWXMAKINGDLL=1 -D_RTLDLL
+WXLIB= $(WXLIBDIR)\wx232.lib

 
 !else
 
 
 !else
 

-LINK_FLAGS= /Tpe /ap /c
+LINK_FLAGS= /aa /c

 
 !if "$(WXUSINGDLL)" == "1"
 
 !if "$(WXUSINGDLL)" == "1"

-DLL_FLAGS= -DWXUSINGDLL=1
-WXLIB= $(WXLIBDIR)\wx200.lib
+DLL_FLAGS= -DWXUSINGDLL=1 -D_RTLDLL
+WXLIB= $(WXLIBDIR)\wx232.lib

 !else
 DLL_FLAGS=
 WXLIB= $(WXLIBDIR)\wx32.lib
 !else
 DLL_FLAGS=
 WXLIB= $(WXLIBDIR)\wx32.lib


@@ -49,8 +61,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)