change to /usr/share/wx/version

[wxWidgets.git] / src / makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index 26fff919289cc0118108bf1e380c0461871bbc66..32a6cb92269644b212ee6cea4dee4f026a206dbf 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -1,22 +1,28 @@
 #
 # makeg95.env
 # Common makefile settings for wxWindows programs
 #
 # makeg95.env
 # Common makefile settings for wxWindows programs

-# This file is included by all the other makefiles, thus changes 
+# This file is included by all the other makefiles, thus changes

 # made here take effect everywhere (except where overriden).
 # The settings are for GnuWin32-derived compilers, i.e. Cygwin and Mingw32.
 #
 # made here take effect everywhere (except where overriden).
 # The settings are for GnuWin32-derived compilers, i.e. Cygwin and Mingw32.
 #

+# Customize this file to match your own settings.
+#

 # CVS_ID: $Id$
 #
 
 # CVS_ID: $Id$
 #
 

-# If using Cygwin, set this to 0.
-# If using Mingw32, set this to 1.
+# If using Cygwin beta, set this to 0.
+# If using Mingw32 or Cygwin 1.0 or later, set this to 1.

 MINGW32=1
 
 # Set to the version you have
 MINGW32VERSION=2.95
 
 # If building DLL, the version
 MINGW32=1
 
 # Set to the version you have
 MINGW32VERSION=2.95
 
 # If building DLL, the version

-WXVERSION=21_11
+WXVERSION=232
+
+ifndef UNICODE
+    UNICODE=0
+endif

 
 # Say yes if you have a "modern" linker that supports --shared option.
 # Note that you're probably going to wait forever for dlltool/gcc/etc
 
 # Say yes if you have a "modern" linker that supports --shared option.
 # Note that you're probably going to wait forever for dlltool/gcc/etc


@@ -24,16 +30,13 @@ WXVERSION=21_11
 # supports --shared.
 LD_SUPPORTS_SHARED=yes
 
 # supports --shared.
 LD_SUPPORTS_SHARED=yes
 

-# Set to the appropriate remove command
-RM=rm -f 
+# Set to the appropriate remove command (must support forward slashes)
+# You can get a suitable rm.exe from ports/mingw32/extra.zip on the ftp site.
+RM=rm -f

 
 

-# Set to the appropriate copy command
-# Some possible alternatives:
-# COPY=cp and COPYSEP=/
-# COPY=copy and COPYSEP=\
-#
-COPY=copy
-COPYSEP=\
+# Set to the appropriate copy command (must support forward slashes)
+# You can get a suitable cp.exe from ports/mingw32/extra.zip on the ftp site.
+COPY=cp

 
 # Cross compiling? Provide the target prefix (eg., i386-mingw32-)
 # CROSS=i386-mingw32-
 
 # Cross compiling? Provide the target prefix (eg., i386-mingw32-)
 # CROSS=i386-mingw32-


@@ -59,18 +62,20 @@ CCC = $(CC)
 # Compiler used for LEX generated C
 CCLEX=$(CROSS)gcc
 
 # Compiler used for LEX generated C
 CCLEX=$(CROSS)gcc
 

-# GRG: This shouldn't be here! make is supposed to define the
-# MAKE variable itself.
-MAKE=make
+# This shouldn't be needed as make is supposed to define this
+# variable itself. Uncomment it if your make complains.
+#MAKE=make

 
 

-# LEX
+# LEX (currently unused)

 LEX=flex # -t -L
 
 LEX=flex # -t -L
 

-# YACC. yacc or bison
+# YACC (currently unused)

 YACC=byacc
 #YACC=bison
 
 # Settings for Cyginw/Mingw32
 YACC=byacc
 #YACC=bison
 
 # Settings for Cyginw/Mingw32

+# Some versions of windres cannot cope with the --preprocessor
+# option. Uncomment the RCPREPROCESSOR line below if yours can.

 RESCOMP=$(CROSS)windres
 RCINPUTSWITCH=-i
 RCOUTPUTSWITCH=-o
 RESCOMP=$(CROSS)windres
 RCINPUTSWITCH=-i
 RCOUTPUTSWITCH=-o


@@ -80,7 +85,9 @@ RCDEFSWITCH=--define
 # but commenting out RCPREPROCESSOR then does the trick.
 #RCPREPROCESSOR=--preprocessor "$(CC) -c -E -xc-header -DRC_INVOKED"
 
 # but commenting out RCPREPROCESSOR then does the trick.
 #RCPREPROCESSOR=--preprocessor "$(CC) -c -E -xc-header -DRC_INVOKED"
 

-RESFLAGS=$(RCPREPROCESSOR) $(RCINCSWITCH) $(WXDIR)/include $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH) __WIN95__ $(RCDEFSWITCH) __GNUWIN32__
+# Don't make this too long (e.g. by adding contrib/include/wx) because it will
+# truncate the command line
+RESFLAGS=$(RCPREPROCESSOR) $(RCINCSWITCH) $(WXDIR)/include $(RCEXTRAINC) $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH) __WIN95__ $(RCDEFSWITCH) __GNUWIN32__

 
 # Needed to build a DLL if your linker does not support --shared option.
 AS = $(CROSS)as
 
 # Needed to build a DLL if your linker does not support --shared option.
 AS = $(CROSS)as


@@ -90,6 +97,7 @@ DLLTOOL = $(CROSS)dlltool
 
 # Miscellaneous compiler options
 # GRG: the __MINGW32__ option is not needed anymore
 
 # Miscellaneous compiler options
 # GRG: the __MINGW32__ option is not needed anymore

+# add "-DHAVE_W32API_H" if you have w32api >= 0.5

 OPTIONS = -DSTRICT # -D__MINGW32__
 
 # Debugging information
 OPTIONS = -DSTRICT # -D__MINGW32__
 
 # Debugging information


@@ -104,7 +112,7 @@ ifeq ($(WIN95),0)
 APPVER=3.50
 WINVERSION=-DWINVER=0x0350 -D__GNUWIN32__ -D__WIN32__ # Generic WIN32
 else
 APPVER=3.50
 WINVERSION=-DWINVER=0x0350 -D__GNUWIN32__ -D__WIN32__ # Generic WIN32
 else

-APPVER=3.50 # 4.0
+APPVER=4.0 # 3.50

 # This means 'enable Windows 95 features' (in wxWindows and in VC++ 4.0).
 WINVERSION=-DWINVER=0x0400 -D__WIN95__ -D__GNUWIN32__ -D__WIN32__
 endif
 # This means 'enable Windows 95 features' (in wxWindows and in VC++ 4.0).
 WINVERSION=-DWINVER=0x0400 -D__WIN95__ -D__GNUWIN32__ -D__WIN32__
 endif


@@ -147,11 +155,11 @@ COMPPATHS=
 
 ########################## Directories ###############################
 
 
 ########################## Directories ###############################
 

+OLELIBS=-lole32 -loleaut32 -luuid

 WINLIBS=-lstdc++ -lgcc \
        -lwinspool -lwinmm -lshell32 \
        -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 \
 WINLIBS=-lstdc++ -lgcc \
        -lwinspool -lwinmm -lshell32 \
        -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 \

-       -lole32 -loleaut32 -luuid \
-       -lodbc32 -lwsock32#  -loldnames
+       -lodbc32 -lwsock32 -lopengl32 -lglu32 $(OLELIBS) #  -loldnames

 
 #WINLIBS=-lstdc++ -lgcc \
 #      -lwinspool -lwinmm -lshell32 \
 
 #WINLIBS=-lstdc++ -lgcc \
 #      -lwinspool -lwinmm -lshell32 \


@@ -163,7 +171,7 @@ WXINC=$(WXDIR)/include
 WXBASESRC=$(WXDIR)/src/common
 WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx.$(LIBSUFF)
 
 WXBASESRC=$(WXDIR)/src/common
 WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx.$(LIBSUFF)
 

-GNUWIN32EXTRA=-I$(WXDIR)/include/wx/msw/gnuwin32 
+GNUWIN32EXTRA=-I$(WXDIR)/include/wx/msw/gnuwin32

 
 ifeq ($(MINGW32),1)
   ifneq "$(findstring 2.95, $(MINGW32VERSION))" ""
 
 ifeq ($(MINGW32),1)
   ifneq "$(findstring 2.95, $(MINGW32VERSION))" ""


@@ -171,19 +179,19 @@ ifeq ($(MINGW32),1)
   endif
 endif
 
   endif
 endif
 

-ifeq ($(MINGW32),1)
-INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/xpm -I$(WXDIR)/src/tiff $(EXTRAINC) $(COMPPATHS)
-else
-INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/xpm -I$(WXDIR)/src/tiff $(EXTRAINC) $(COMPPATHS) -I$(WXDIR)/include/wx/msw/gnuwin32 
-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
+#endif

 
 RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)/include"
 
 ifdef WXUSINGDLL
   # png, jpeg, etc are exported from wx dll, so skip and save on link time.
 
 RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)/include"
 
 ifdef WXUSINGDLL
   # png, jpeg, etc are exported from wx dll, so skip and save on link time.

-  LIBS = $(WXLIB) $(WINLIBS) $(COMPLIBS) $(EXTRALIBS)
+  LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(COMPLIBS)

 else
 else

-  LIBS = $(WXLIB) -lpng -ljpeg -lzlib -lxpm -ltiff $(WINLIBS) $(COMPLIBS) $(EXTRALIBS)
+  LIBS = $(EXTRALIBS) $(WXLIB) -lregex -lpng -ljpeg -lzlib -ltiff $(WINLIBS) $(COMPLIBS)

 endif
 
 WINFLAGS=-D_X86_=1 -DWIN32 -D_WIN32 $(WINVERSION)
 endif
 
 WINFLAGS=-D_X86_=1 -DWIN32 -D_WIN32 $(WINVERSION)


@@ -197,14 +205,26 @@ LDLIBS = $(LIBS)
 # OBJDIR = objects$(GUISUFFIX)
 OBJDIR = .
 
 # OBJDIR = objects$(GUISUFFIX)
 OBJDIR = .
 

+ifeq ($(UNICODE),1)
+    UNIEXT=u
+else
+    UNIEXT=
+endif
+
+ifeq ($(WXMAKINGDLL)$(WXUSINGDLL),)
+    INCEXT=$(UNIEXT)
+else
+    INCEXT=dll$(UNIEXT)
+endif
+

 ifdef WXMAKINGDLL
   EXTRADLLFLAGS = -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1
 ifdef WXMAKINGDLL
   EXTRADLLFLAGS = -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1

-  WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx$(WXVERSION).$(LIBSUFF)
+  WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wxmsw$(WXVERSION)$(UNIEXT).$(LIBSUFF)

 endif
 
 ifdef WXUSINGDLL
   EXTRADLLFLAGS = -DWXUSINGDLL=1
 endif
 
 ifdef WXUSINGDLL
   EXTRADLLFLAGS = -DWXUSINGDLL=1

-  WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx$(WXVERSION).$(LIBSUFF)
+  WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wxmsw$(WXVERSION)$(UNIEXT).$(LIBSUFF)

 endif
 
 
 endif
 
 


@@ -212,15 +232,18 @@ endif
 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
 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

-LDFLAGS = $(WINDOWSLDFLAGS) -L$(WXDIR)/lib $(EXTRALDFLAGS)
-
-.SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .c
+LDFLAGS = $(WINDOWSLDFLAGS) -L$(WXDIR)/lib -L$(WXDIR)/contrib/lib $(EXTRALDFLAGS)

 
 

+.SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .cxx .c

 
 .c.o:
        $(CC) -c $(CFLAGS) -o $@ $*.c
 
 
 .c.o:
        $(CC) -c $(CFLAGS) -o $@ $*.c
 

+.cxx.o:
+       $(CC) -c $(CPPFLAGS) -o $@ $*.cxx
+

 .$(SRCSUFF).$(OBJSUFF):
        $(CC) -c $(CPPFLAGS) -o $@ $*.$(SRCSUFF)
 
 
 .$(SRCSUFF).$(OBJSUFF):
        $(CC) -c $(CPPFLAGS) -o $@ $*.$(SRCSUFF)
 
 

+