When saving the editable state, use the real state (m_editable)

[wxWidgets.git] / src / makeb32.env

diff --git a/src/makeb32.env b/src/makeb32.env
index 2ecc973fdbfd970c253a7e007a3b93649c4b64d1..857e503f62b1d0c12d0f952719d09726ee99114a 100644 (file)
--- a/src/makeb32.env
+++ b/src/makeb32.env
@@ -1,32 +1,169 @@
 # 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)
 WXDIR = $(WXWIN)

-CFG = $(WXDIR)\src\msw\wxwin32.cfg
+CFG = $(WXDIR)\src\msw\wxw32
+
+BCCDIR=$(MAKEDIR)\..
+
+!if "$(BCCDIR)" == "\.."
+!error Your Borland compiler does not define MAKEDIR. Pleasedefine the BCCDIR variable in makeb32.env line 10, e.g. BCCDIR=d:\bc4
+!endif
+
+ARCHINCDIR=$(WXDIR)\lib\msw
+ARCHSETUPH=$(ARCHINCDIR)\wx\setup.h
+#see below for SETUPSRCDIR
+
+
+# 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
-WIN95FLAG = -D__WIN95__
+WXLIBDIR2 = $(WXDIR)\contrib\lib
+WXINC = $(WXDIR)\include;$(WXDIR)\contrib\include;$(WXDIR)\src\iodbc;$(WXDIR)\src\regex;
+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
 !endif
 
 
 !ifndef FINAL
 FINAL=0
 !endif
 

-!if "$(FINAL)" == "0"
+!ifndef WXMAKINGDLL
+WXMAKINGDLL=0
+!endif
+
+!if "$(FINAL)" == "1"
+OPT = -O2
+DEBUG_FLAGS = -DUSE_DEFINE
+LINKDEBUGFLAGS=
+!else

 OPT = -Od
 DEBUG_FLAGS= -v -DWXDEBUG=1 -D__WXDEBUG__ -DUSE_DEFINE
 OPT = -Od
 DEBUG_FLAGS= -v -DWXDEBUG=1 -D__WXDEBUG__ -DUSE_DEFINE

+LINKDEBUGFLAGS=/v
+!endif
+
+# allow to use debugger but no wxDebugging functions
+!if "$(FINAL)" == "hybrid"
+OPT = -Od
+DEBUG_FLAGS= -v 
+LINKDEBUGFLAGS=/v
+!endif
+
+!ifndef DLL
+DLL=0
+!endif
+
+# Target             WXMAKINGDLL       WXUSINGDLL     WXBUILDDLL
+# wxWin DLL              1                 0               1
+# wxWin STATIC           0                 0               0
+# App use wxWin DLL      0                 1               0
+# DLL use wxWin DLL      0                 1               1
+# DLL use wxWin STATIC   0                 0               1
+#
+
+# Determine the library name depending on the options, to allow
+# multiple versions to coexist.
+# Note that the clean target will only delete the appropriate .lib for the current
+# 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
 !else

-OPT = -O2
-DEBUG_FLAGS = -DUSE_DEFINE
+WXLIBNAME=wx32

 !endif
 !endif

-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)

 
 

-LIBTARGET= $(WXLIBDIR)\wx32.lib
+## Use this if you want to use the UNIV controls set rather than the native ones 
+## make -f makefile.b32 WXUSINGUNIV=1
+!if "$(WXUSINGUNIV)" == "1"
+USE_UNIV="UNIV"
+CFG=$(CFG)v
+WXLIBNAME=$(WXLIBNAME)v
+ARCHINCDIR=$(ARCHINCDIR)v
+SETUPSRCDIR=$(WXDIR)\include\wx\univ
+PORT=__WXUNIVERSAL__
+!else
+USE_UNIV=""
+PORT=__WXMSW__
+SETUPSRCDIR=$(WXDIR)\include\wx\msw
+!endif
+
+#not sure what to do with unicode builds - we need to define something ?
+#!if "$(UNICODE)" == "1"
+#WXLIBNAME=$(WXLIBNAME)u
+#!endif
+
+
+#a hybrid , does not set __WXDEBUG__ but sets -v (see above)
+!if "$(FINAL)" == "hybrid"
+WXLIBNAME=$(WXLIBNAME)h
+CFG=$(CFG)h
+!endif
+
+!if "$(FINAL)" == "0"
+WXLIBNAME=$(WXLIBNAME)d
+CFG=$(CFG)d
+!endif
+
+!if "$(wxUSE_GUI)" == "0"
+WXLIBNAME=$(WXLIBNAME)b
+CFG=$(CFG)b
+CPPFLAGS=-DwxUSE_GUI=0
+!endif
+
+!if "$(WXMAKINGDLL)" != "1" && "$(WXUSINGDLL)" != "1"
+WXLIBNAME=$(WXLIBNAME)s
+!endif
+
+!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
+INCEXT=dll$(INCEXT)
+!endif
+
+!ifndef WXLIBDIR
+WXLIBDIR=$(WXDIR)\lib
+!endif
+
+WXLIB=$(WXLIBDIR)\$(WXLIBNAME).lib
+WXDLL=$(WXLIBDIR)\$(WXLIBNAME).dll
+
+!if "$(WXMAKINGDLL)" == "1"
+DLL_FLAGS= -DWXMAKINGDLL=1 -D_RTLDLL
+!else
+
+!if "$(WXUSINGDLL)" == "1"
+DLL_FLAGS= -DWXUSINGDLL=1 -D_RTLDLL
+!else
+DLL_FLAGS=
+!endif
+
+!endif
+
+!if "$(WXBUILDDLL)" == "1"
+LINK_FLAGS= /Tpd /c $(EXTRALINKFLAGS)
+!endif
+
+CFG=$(CFG).cfg
+CPPFLAGS=$(CPPFLAGS) $(DLL_FLAGS) @$(CFG) $(EXTRACPPFLAGS)
+

 DUMMY=dummy
 
 SRCSUFF = cpp
 OBJSUFF = obj
 
 DUMMY=dummy
 
 SRCSUFF = cpp
 OBJSUFF = obj
 

+WAITFLAG = /w
+

 .$(SRCSUFF).obj:
 .$(SRCSUFF).obj:

-       bcc32 $(CPPFLAGS) -c {$< }
+    bcc32 $(CPPFLAGS) -c {$< }

 
 .c.obj:
 
 .c.obj:

-       bcc32 $(CPPFLAGS) -P- -c {$< }
+    bcc32 $(CPPFLAGS) -P- -c {$< }