Unicodified wxSplitPath

[wxWidgets.git] / src / makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index 53fcbc41c93fe53aff16269f777bb4ff3d1f47bd..67df3d0a74e09681e265a1d32e52bfde8ef7e092 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -36,7 +36,7 @@ CCLEX=gcc
 MAKE=make
 
 # LEX
-LEX=flex -t -L
+LEX=flex # -t -L
 
 # YACC. yacc or bison
 # YACC=yacc
@@ -54,7 +54,7 @@ RESFLAGS=$(RCINCSWITCH) $(WXDIR)/include $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH)
 ########################## Compiler flags #############################
 
 # Miscellaneous compiler options
-OPTIONS= # -D__MINGW32__ # -D__EGCS__
+OPTIONS= -D__EGCS__ # -D__MINGW32__
 
 # Debugging information
 # AIX: comment out.
@@ -94,7 +94,12 @@ GUI = -D__WXMSW__ -D__WINDOWS__
 
 # Optimization
 # OPT = -O
-OPT =
+
+# according to Guillermo Rodriguez Garcia <guille@iies.es> 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
 
 # Options for ar archiver
 # AROPTIONS = crs # For IRIX and Solaris (both SYSVR4).
@@ -107,25 +112,25 @@ RANLIB = ranlib
 #COMPLIBS=-lgcc
 
 # Compiler or system-specific include paths
-COMPPATHS=-I$(TWINDIR)/include -DTWIN32 -D__TWIN32__
+COMPPATHS=
 
 ########################## Directories ###############################
 
 
 WINLIBS=-lstdc++ -lgcc \
-       -lwinspool -lwinmm -lshell32 -loldnames \
-       -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32
+       -lwinspool -lwinmm -lshell32 \
+       -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 #  -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)/include/wx/msw/gnuwin32 -I$(WXDIR)/src/zlib $(EXTRAINC)$(COMPPATHS)
+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)
+LIBS = $(WXLIB) $(WINLIBS) $(COMPLIBS) $(EXTRALIBS)
 
 WINFLAGS=-D_X86_=1 -DWIN32 -D_WIN32 $(WINVERSION)
 
@@ -135,13 +140,13 @@ XLIB=$(LIBS)
 LDLIBS = $(LIBS)
 
 # Directory for object files (don't change)
-OBJDIR = objects$(GUISUFFIX)
+# OBJDIR = objects$(GUISUFFIX)
 
 # You shouldn't need to change these...
-CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT)
-CFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT)
+CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRACPPFLAGS)
+CFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRACFLAGS)
 WINDOWSLDFLAGS=-Wl,--subsystem,windows -mwindows
-LDFLAGS = $(WINDOWSLDFLAGS) -L$(WXDIR)/lib
+LDFLAGS = $(WINDOWSLDFLAGS) -L$(WXDIR)/lib $(EXTRALDFLAGS)
 
 .SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .c
 
@@ -150,11 +155,11 @@ LDFLAGS = $(WINDOWSLDFLAGS) -L$(WXDIR)/lib
 #      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)
+#.rc.$(RESSUFF):  $< $(WXDIR)/include/msw/wx.rc
+#      $(RC) $(RESFLAGS1) $< $(RESFLAGS2) $*.$(RESSUFF) $(RCLFLAGS)
 
-.$(RESSUFF).$(RSCSUFF): $<
-       $(CVTRES) $< $*.$(RSCSUFF)
+#.$(RESSUFF).$(RSCSUFF): $<
+#      $(CVTRES) $< $*.$(RSCSUFF)
 
 .$(SRCSUFF).$(OBJSUFF):
        $(CC) -c $(CPPFLAGS) -o $@ $*.$(SRCSUFF)