X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6a3517155dc33a03083fb4436ce2162fc03b0f7..2e09dc2dc80d5dd5c42a559c4dd4738ed006a276:/src/makeg95.env diff --git a/src/makeg95.env b/src/makeg95.env index af4b7e129a..64dc0d12fb 100644 --- a/src/makeg95.env +++ b/src/makeg95.env @@ -1,7 +1,7 @@ # # 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. # @@ -10,15 +10,27 @@ # 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 -WXVERSION=21_11 +WXVERSION=232 + +ifndef UNICODE + 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. # Note that you're probably going to wait forever for dlltool/gcc/etc @@ -28,7 +40,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. -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. @@ -81,7 +93,10 @@ RCDEFSWITCH=--define # 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 +# Note: --use-temp-file removed since Mingw32 2.95.2 doesn't recognise it +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 @@ -91,10 +106,13 @@ DLLTOOL = $(CROSS)dlltool # 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 -DEBUGFLAGS = -D__WXDEBUG__ +ifeq ($(FINAL),0) + DEBUGFLAGS = -g -D__WXDEBUG__ +endif WIN95=1 @@ -124,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 , 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). @@ -148,11 +177,16 @@ COMPPATHS= ########################## Directories ############################### -WINLIBS=-lstdc++ -lgcc \ - -lwinspool -lwinmm -lshell32 \ - -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 \ - -lole32 -loleaut32 -luuid \ - -lodbc32 -lwsock32# -loldnames +OLELIBS=-lole32 -loleaut32 -luuid +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 \ @@ -162,9 +196,8 @@ 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 +GNUWIN32EXTRA=-I$(WXDIR)/include/wx/msw/gnuwin32 ifeq ($(MINGW32),1) ifneq "$(findstring 2.95, $(MINGW32VERSION))" "" @@ -173,9 +206,9 @@ ifeq ($(MINGW32),1) 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) +#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/xpm -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" @@ -184,7 +217,7 @@ ifdef WXUSINGDLL # png, jpeg, etc are exported from wx dll, so skip and save on link time. LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(COMPLIBS) else - LIBS = $(EXTRALIBS) $(WXLIB) -lpng -ljpeg -lzlib -lxpm -ltiff $(WINLIBS) $(COMPLIBS) + LIBS = $(EXTRALIBS) $(WXLIB) -lregex -lpng -ljpeg -lzlib -ltiff $(WINLIBS) $(COMPLIBS) endif WINFLAGS=-D_X86_=1 -DWIN32 -D_WIN32 $(WINVERSION) @@ -198,21 +231,43 @@ LDLIBS = $(LIBS) # OBJDIR = objects$(GUISUFFIX) OBJDIR = . +ifeq ($(FINAL),1) + DEBEXT= +else + DEBEXT=d +endif + +ifeq ($(UNICODE),1) + UNIEXT=u +else + UNIEXT= +endif + +ifeq ($(WXMAKINGDLL)$(WXUSINGDLL),) + INCEXT=$(UNIEXT)$(DEBEXT) +else + 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)wx$(WXVERSION).$(LIBSUFF) + WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT).$(LIBSUFF) endif ifdef WXUSINGDLL EXTRADLLFLAGS = -DWXUSINGDLL=1 - WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx$(WXVERSION).$(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