use type safe list instead of wxList for m_columns

[wxWidgets.git] / src / makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index ee90e2a380e70bba15a9b45d90b3a377442638ed..71ca65a9f0fe587c695755a412fe83dbb0a5ccbf 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -1,7 +1,7 @@
 #
 # 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.
 #


@@ -10,15 +10,15 @@
 # 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=23_2

 
 # 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


@@ -28,7 +28,7 @@ LD_SUPPORTS_SHARED=yes
 
 # 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.
 
 # 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 
+RM=rm -f

 
 # 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.
 
 # 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.


@@ -81,7 +81,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 $(RCINCSWITCH) $(WXDIR)/contrib/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


@@ -91,6 +93,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


@@ -148,11 +151,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 \


@@ -164,7 +167,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))" ""


@@ -172,19 +175,19 @@ ifeq ($(MINGW32),1)
   endif
 endif
 
   endif
 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/xpm -I$(WXDIR)/src/tiff $(EXTRAINC) $(COMPPATHS)
-else
-INC = -I$(WXINC) -I$(WXDIR)/contrib/include -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$(WXINC) -I$(WXDIR)/contrib/include -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) -lpng -ljpeg -lzlib -ltiff $(WINLIBS) $(COMPLIBS)

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


@@ -215,13 +218,16 @@ CFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXT
 WINDOWSLDFLAGS=-Wl,--subsystem,windows -mwindows
 LDFLAGS = $(WINDOWSLDFLAGS) -L$(WXDIR)/lib -L$(WXDIR)/contrib/lib $(EXTRALDFLAGS)
 
 WINDOWSLDFLAGS=-Wl,--subsystem,windows -mwindows
 LDFLAGS = $(WINDOWSLDFLAGS) -L$(WXDIR)/lib -L$(WXDIR)/contrib/lib $(EXTRALDFLAGS)
 

-.SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .c
-
+.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)
 
 

+