X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0c589ad076cb531a3ef7808aaedadc03c8286942..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/makeg95.env diff --git a/src/makeg95.env b/src/makeg95.env index 8af9e36408..9c40db3f39 100644 --- a/src/makeg95.env +++ b/src/makeg95.env @@ -2,32 +2,38 @@ # Common makefile settings for wxWindows programs # 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. # -# An alternative to editing this file is to create a shell script -# to export specific variables, and call make with the -e switch -# to override makefile variables. See wx/install/install.txt. -# And you can override specific variables on the make command line, e.g. -# -# make -f makefile.unix WXDEBUG='' -# -# You may prefer to use the GNU configure script than raw makefiles - -# see contrib/wxshlib. -# + +# If using Cygwin, set this to 0. +# If using Mingw32, set this to 1. +MINGW32=0 + +# Set to the version you have +MINGW32VERSION=2.95 + +# Set to the appropriate remove command +RM=rm -f + +# Set to the appropriate copy command +COPY=cp ########################## Compiler ################################## # C++ compiler -# For AIX/CSet++: use CC = xlC -# For IRIX: use CC = CC -# CC = gcc-2.6.2 -CC = gcc +# Put a comment before --pipe for Cygwin, remove comment for Mingw32 2.95 + +ifeq ($(MINGW32),1) + ifeq ($(MINGW32VERSION),2.95) + CC = gcc --pipe -fvtable-thunks + else + CC = gcc + endif +else + CC = gcc +endif # C compiler for pure C programs -# Typical: CC=g++ , CCC=gcc -# CC=cl386 /Tp, CCC=cl386 -# -# (Used only for XView, file sb_scrol.c) -# CCC = $(CC) # Compiler used for LEX generated C @@ -39,8 +45,8 @@ MAKE=make LEX=flex # -t -L # YACC. yacc or bison -# YACC=yacc -YACC=bison +YACC=byacc +#YACC=bison # Settings for Cyginw/Mingw32 RESCOMP=windres.exe @@ -54,12 +60,10 @@ RESFLAGS=$(RCINCSWITCH) $(WXDIR)/include $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH) ########################## Compiler flags ############################# # Miscellaneous compiler options -OPTIONS= -D__EGCS__ -DSTRICT # -D__MINGW32__ +OPTIONS= -DSTRICT # -D__MINGW32__ # Debugging information -# AIX: comment out. -# IRIX: -g3 -DEBUGFLAGS = -ggdb -D__WXDEBUG__ +DEBUGFLAGS = -D__WXDEBUG__ WIN95=1 @@ -92,45 +96,60 @@ WARN = -Wall # Which GUI, -Dwx_xview or -Dwx_motif (don't change this) GUI = -D__WXMSW__ -D__WINDOWS__ -# Optimization -# OPT = -O - -# according to Guillermo Rodriguez Garcia this flag is needed -# to make the standard div() functio work - otherwise it returns absolutely -# incorrect results and completely breaks the wxImage class (where it's used -# extensively) -OPT = -fno-pcc-struct-return +# according to Guillermo Rodriguez Garcia this flag is +# needed to make the standard div() function work - otherwise it returns +# absolutely incorrect results and completely breaks the wxImage class +# (where it's used extensively) +# GRG: at least it is needed in mingw32-gcc2.8.1 +OPT = -fno-pcc-struct-return -O2 -fno-rtti -fno-exceptions # Options for ar archiver # AROPTIONS = crs # For IRIX and Solaris (both SYSVR4). AROPTIONS = ruv RANLIB = ranlib -# Compiler libraries: defaults to GCC libraries -#COMPLIBS=-lg++ -#for win95 -#COMPLIBS=-lgcc +# Extra compiler libraries +COMPLIBS= # Compiler or system-specific include paths COMPPATHS= ########################## Directories ############################### - WINLIBS=-lstdc++ -lgcc \ -lwinspool -lwinmm -lshell32 \ - -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 # -loldnames + -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 \ + -lole32 -loleaut32 -luuid \ + -lodbc32 -lwsock32# -loldnames + +#WINLIBS=-lstdc++ -lgcc \ +# -lwinspool -lwinmm -lshell32 \ +# -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 -lwsock32 # -loldnames # Shouldn't need to change these... WXSRC=$(WXDIR)/src/msw WXINC=$(WXDIR)/include WXBASESRC=$(WXDIR)/src/common WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx.$(LIBSUFF) -INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/include/wx/msw/gnuwin32 -I$(WXDIR)/src/zlib $(EXTRAINC) $(COMPPATHS) -RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)\include" -#LIBS = -lctl3d32 $(WXLIB) $(WINLIBS) $(COMPLIBS) -LIBS = $(WXLIB) $(WINLIBS) $(COMPLIBS) $(EXTRALIBS) +GNUWIN32EXTRA=-I$(WXDIR)/include/wx/msw/gnuwin32 + +ifeq ($(MINGW32),1) + ifeq ($(MINGW32),2.95) + GNUWIN32EXTRA= + endif +endif + +ifeq ($(MINGW32),1) +INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib $(EXTRAINC) $(COMPPATHS) +else +INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib $(EXTRAINC) $(COMPPATHS) -I$(WXDIR)/include/wx/msw/gnuwin32 +endif + +RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)/include" + +#LIBS = $(WXLIB) $(WXDIR)/lib/libzlib.a $(WXDIR)/lib/libpng.a $(WXDIR)/lib/libjpeg.a $(WINLIBS) $(COMPLIBS) $(EXTRALIBS) +LIBS = $(WXLIB) -lpng -ljpeg -lzlib $(WINLIBS) $(COMPLIBS) $(EXTRALIBS) WINFLAGS=-D_X86_=1 -DWIN32 -D_WIN32 $(WINVERSION) @@ -141,6 +160,7 @@ LDLIBS = $(LIBS) # Directory for object files (don't change) # OBJDIR = objects$(GUISUFFIX) +OBJDIR = . # You shouldn't need to change these... CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRACPPFLAGS) @@ -150,17 +170,6 @@ LDFLAGS = $(WINDOWSLDFLAGS) -L$(WXDIR)/lib $(EXTRALDFLAGS) .SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .c -# Set these in a batch file instead e.g. install/cygnus.bat -# RCINCLUDE="$(WXDIR)/include/msw;$(WXDIR)/contrib/fafa;$(WXDIR)/contrib/itsybits"; \ -# CPLUS_INCLUDE_PATH=/usr/H-i386-cygwin32/i386-cygwin32/include:/usr/H-i386-cygwin32/lib/gcc-lib/i386-cygwin32/cygnus-2.7.2-961023/include:$(WXDIR)/include/common:$(WXDIR)/include/msw:$(WXDIR)/contrib/fafa:$(WXDIR)/contrib/itsybits; \ -# export CPLUS_INCLUDE_PATH RCINCLUDE; \ - -#.rc.$(RESSUFF): $< $(WXDIR)/include/msw/wx.rc -# $(RC) $(RESFLAGS1) $< $(RESFLAGS2) $*.$(RESSUFF) $(RCLFLAGS) - -#.$(RESSUFF).$(RSCSUFF): $< -# $(CVTRES) $< $*.$(RSCSUFF) - .$(SRCSUFF).$(OBJSUFF): $(CC) -c $(CPPFLAGS) -o $@ $*.$(SRCSUFF)