some wxArtProv docs

[wxWidgets.git] / src / makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index 6a6788ae21f750c42e0173834573069525a30257..e53d90b25c2d510aaadd705d4bd284cbd865ae9c 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -18,10 +18,18 @@ MINGW32=1
 MINGW32VERSION=2.95
 
 # If building DLL, the version
-WXVERSION=232
+WXVERSION=233
 
 ifndef UNICODE
-    UNICODE=0
+  UNICODE=0
+endif
+
+ifndef FINAL
+  FINAL=0
+endif
+
+ifndef wxUSE_GUI
+  wxUSE_GUI=1
 endif
 
 # Say yes if you have a "modern" linker that supports --shared option.
@@ -102,7 +110,9 @@ DLLTOOL = $(CROSS)dlltool
 OPTIONS = -DSTRICT # -D__MINGW32__
 
 # Debugging information
-DEBUGFLAGS = -D__WXDEBUG__
+ifeq ($(FINAL),0)
+  DEBUGFLAGS = -g -D__WXDEBUG__
+endif
 
 WIN95=1
 
@@ -132,15 +142,26 @@ RSCSUFF=rsc
 # Warnings
 WARN = -Wall
 
-# Which GUI, -Dwx_xview or -Dwx_motif (don't change this)
-GUI = -D__WXMSW__ -D__WINDOWS__
+# build wxbase/wxMSW
+ifeq ($(wxUSE_GUI),1)
+    TOOLKIT=msw
+    GUI = -D__WXMSW__ -D__WINDOWS__
+else
+    TOOLKIT=base
+    GUI = -D__WXMSW__ -D__WINDOWS__ -DwxUSE_GUI=0
+endif
+
 
 # According to Guillermo Rodriguez Garcia <guille@iies.es>, the
 # -fno-pcc-struct-return option is needed to make the standard div()
 # function work - otherwise it returns absolutely incorrect results
 # which breaks the wxImage class. This is true at least for
 # mingw32-gcc2.8.1, don't know about others.
-OPT = -fno-pcc-struct-return -O2 -fno-rtti -fno-exceptions
+ifeq ($(FINAL),1)
+  OPT = -fno-pcc-struct-return -O2 -fno-rtti -fno-exceptions
+else
+  OPT = -fno-pcc-struct-return -fno-rtti -fno-exceptions
+endif
 
 # Options for ar archiver
 # AROPTIONS = crs # For IRIX and Solaris (both SYSVR4).
@@ -157,10 +178,15 @@ COMPPATHS=
 ########################## Directories ###############################
 
 OLELIBS=-lole32 -loleaut32 -luuid
-WINLIBS=-lstdc++ -lgcc \
-       -lwinspool -lwinmm -lshell32 \
-       -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 \
-       -lodbc32 -lwsock32 -lopengl32 -lglu32 $(OLELIBS) #  -loldnames
+BASELIBS=-lstdc++ -lgcc -lodbc32 -lwsock32
+ifeq ($(wxUSE_GUI),1)
+  WINLIBS= $(BASELIBS) \
+         -lwinspool -lwinmm -lshell32 \
+         -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 \
+         -lodbc32 -lwsock32 -lopengl32 -lglu32 $(OLELIBS) #  -loldnames
+else
+  WINLIBS=$(BASELIBS)
+endif
 
 #WINLIBS=-lstdc++ -lgcc \
 #      -lwinspool -lwinmm -lshell32 \
@@ -170,7 +196,6 @@ WINLIBS=-lstdc++ -lgcc \
 WXSRC=$(WXDIR)/src/msw
 WXINC=$(WXDIR)/include
 WXBASESRC=$(WXDIR)/src/common
-WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx.$(LIBSUFF)
 
 GNUWIN32EXTRA=-I$(WXDIR)/include/wx/msw/gnuwin32
 
@@ -183,7 +208,7 @@ endif
 #ifeq ($(MINGW32),1)
 #INC = -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/tiff $(EXTRAINC) $(COMPPATHS)
 #else
-INC = -I$(WXDIR)/lib/msw$(INCEXT) -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/regex -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/tiff $(EXTRAINC) $(COMPPATHS) -I$(WXDIR)/include/wx/msw/gnuwin32
+INC = -I$(WXDIR)/lib/$(TOOLKIT)$(INCEXT) -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/regex -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/tiff $(EXTRAINC) $(COMPPATHS) -I$(WXDIR)/include/wx/msw/gnuwin32
 #endif
 
 RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)/include"
@@ -206,6 +231,12 @@ LDLIBS = $(LIBS)
 # OBJDIR = objects$(GUISUFFIX)
 OBJDIR = .
 
+ifeq ($(FINAL),1)
+    DEBEXT=
+else
+    DEBEXT=d
+endif
+
 ifeq ($(UNICODE),1)
     UNIEXT=u
 else
@@ -213,26 +244,30 @@ else
 endif
 
 ifeq ($(WXMAKINGDLL)$(WXUSINGDLL),)
-    INCEXT=$(UNIEXT)
+    INCEXT=$(UNIEXT)$(DEBEXT)
 else
-    INCEXT=dll$(UNIEXT)
+    INCEXT=dll$(UNIEXT)$(DEBEXT)
 endif
 
+WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx$(TOOLKIT)$(UNIEXT)$(DEBEXT).$(LIBSUFF)
+
 ifdef WXMAKINGDLL
   EXTRADLLFLAGS = -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1
-  WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wxmsw$(WXVERSION)$(UNIEXT).$(LIBSUFF)
+  WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT).$(LIBSUFF)
 endif
 
 ifdef WXUSINGDLL
   EXTRADLLFLAGS = -DWXUSINGDLL=1
-  WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wxmsw$(WXVERSION)$(UNIEXT).$(LIBSUFF)
+  WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT).$(LIBSUFF)
 endif
 
 
 # You shouldn't need to change these...
 CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRACPPFLAGS) $(EXTRADLLFLAGS)
 CFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRACFLAGS) -DWIN32_LEAN_AND_MEAN
-WINDOWSLDFLAGS=-Wl,--subsystem,windows -mwindows
+ifeq ($(wxUSE_GUI),1)
+    WINDOWSLDFLAGS=-Wl,--subsystem,windows -mwindows
+endif
 LDFLAGS = $(WINDOWSLDFLAGS) -L$(WXDIR)/lib -L$(WXDIR)/contrib/lib $(EXTRALDFLAGS)
 
 .SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .cxx .c