X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9806a0e71eb2190827e93cd463e9682a3b939eee..6cc687bfee071b5328f9e48d1708795287006bb7:/src/makeg95.env?ds=sidebyside diff --git a/src/makeg95.env b/src/makeg95.env index 71ca65a9f0..64dc0d12fb 100644 --- a/src/makeg95.env +++ b/src/makeg95.env @@ -18,7 +18,19 @@ MINGW32=1 MINGW32VERSION=2.95 # If building DLL, the version -WXVERSION=23_2 +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 @@ -83,6 +95,7 @@ RCDEFSWITCH=--define # 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. @@ -97,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 @@ -127,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). @@ -152,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 \ @@ -165,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 @@ -178,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$(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 +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" @@ -187,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 -ltiff $(WINLIBS) $(COMPLIBS) + LIBS = $(EXTRALIBS) $(WXLIB) -lregex -lpng -ljpeg -lzlib -ltiff $(WINLIBS) $(COMPLIBS) endif WINFLAGS=-D_X86_=1 -DWIN32 -D_WIN32 $(WINVERSION) @@ -201,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