Found bug that skrewed up display wrt horizontal

[wxWidgets.git] / src / makeb32.env

diff --git a/src/makeb32.env b/src/makeb32.env
index d99981bfac56b28a32c5f9a2e39777d6b38c0a42..3c90826c45e05f495ab78b6b33925517ed4e5882 100644 (file)
--- a/src/makeb32.env
+++ b/src/makeb32.env
@@ -3,32 +3,70 @@
 WXDIR = $(WXWIN)
 CFG = $(WXDIR)\src\msw\wxwin32.cfg
 WXLIBDIR = $(WXDIR)\lib
 WXDIR = $(WXWIN)
 CFG = $(WXDIR)\src\msw\wxwin32.cfg
 WXLIBDIR = $(WXDIR)\lib

-WXINC = $(WXDIR)\include
-WIN95FLAG = -D__WIN95__
+WXLIBDIR2 = $(WXDIR)\contrib\lib
+WXINC = $(WXDIR)\include;$(WXDIR)\contrib\include;$(WXDIR)\src\iodbc
+WIN95FLAG = -D__WIN95__ -D__WINDOWS__
+
+# This should be changed to tlink32 if ilink32 is not available
+# Available on C++ 5.02 and above
+LINK=ilink32

 
 !ifndef FINAL
 FINAL=0
 !endif
 
 
 !ifndef FINAL
 FINAL=0
 !endif
 

-!ifndef DEBUG
-DEBUG=1
-!endif
-

 !if "$(FINAL)" == "0"
 OPT = -Od
 !if "$(FINAL)" == "0"
 OPT = -Od

-DEBUG_FLAGS= -v -DDEBUG=$(DEBUG) -DUSE_DEFINE
+DEBUG_FLAGS= -v -DWXDEBUG=1 -D__WXDEBUG__ -DUSE_DEFINE

 !else
 OPT = -O2
 !else
 OPT = -O2

-DEBUG_FLAGS = -DDEBUG=$(DEBUG) -DUSE_DEFINE
+DEBUG_FLAGS = -DUSE_DEFINE
+!endif
+
+!ifndef DLL
+DLL=0

 !endif
 !endif

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

 
 

-LIBTARGET= $(WXLIBDIR)\wx32.lib
+# 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
+#
+
+!if "$(WXMAKINGDLL)" == "1"
+DLL_FLAGS= -DWXMAKINGDLL=1 -D_WINDLL
+WXLIB= $(WXLIBDIR)\wx200.lib
+
+!else
+
+LINK_FLAGS= /Tpe /ap /c
+
+!if "$(WXUSINGDLL)" == "1"
+DLL_FLAGS= -DWXUSINGDLL=1
+WXLIB= $(WXLIBDIR)\wx200.lib
+!else
+DLL_FLAGS=
+WXLIB= $(WXLIBDIR)\wx32.lib
+!endif
+
+!endif
+
+!if "$(WXBUILDDLL)" == "1"
+DLL_FLAGS= $(DLL_FLAGS) -D_RTLDLL
+LINK_FLAGS= /Tpd /ap /c $(EXTRALINKFLAGS)
+!endif
+
+CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG)
+

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

+WAITFLAG = /w
+

 .$(SRCSUFF).obj:
        bcc32 $(CPPFLAGS) -c {$< }
 
 .$(SRCSUFF).obj:
        bcc32 $(CPPFLAGS) -c {$< }