post wxUniv merge fixes

[wxWidgets.git] / src / makeenvs / solaris.env

diff --git a/src/makeenvs/solaris.env b/src/makeenvs/solaris.env
index a6c8d1b7fd2c8745fc1f02819499ed7208868db5..3cf01d57bebe5ace8d2b64d42a13ed87fedff623 100644 (file)
--- a/src/makeenvs/solaris.env
+++ b/src/makeenvs/solaris.env
@@ -1,5 +1,5 @@
-# generic.env
-# Linux/generic
+# solaris.env
+# Solaris

 #
 # Common makefile settings for wxWindows programs
 # This file is included by all the other makefiles, thus changes 
 #
 # Common makefile settings for wxWindows programs
 # This file is included by all the other makefiles, thus changes 


@@ -22,6 +22,8 @@ CCLEX       = $(CCC)
 
 LEX         = lex
 YACC        = yacc
 
 LEX         = lex
 YACC        = yacc

+# Note: if using bison, use -y option for yacc compatibility
+# YACC      = bison -y

 MAKE        = make
 AROPTIONS   = ruv
 RANLIB      = ranlib
 MAKE        = make
 AROPTIONS   = ruv
 RANLIB      = ranlib


@@ -75,8 +77,8 @@ INC         = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib $(COMPPATHS)
 # Directory for object files
 OBJDIR = objects$(GUISUFFIX)
 
 # Directory for object files
 OBJDIR = objects$(GUISUFFIX)
 

-CPPFLAGS    = $(EXTRACPPFLAGS) $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT)
-CFLAGS      = $(EXTRACFLAGS) $(XINCLUDE) $(INC) $(COPTIONS) $(GUI) $(DEBUGFLAGS) $(CWARN) $(OPT)
+CPPFLAGS    = $(EXTRACPPFLAGS) $(INC) $(XINCLUDE) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT)
+CFLAGS      = $(EXTRACFLAGS) $(INC) $(XINCLUDE) $(COPTIONS) $(GUI) $(DEBUGFLAGS) $(CWARN) $(OPT)

 LDFLAGS     = $(EXTRALDFLAGS) $(XLIB) -L$(WXDIR)/lib
 LDLIBS      = $(EXTRALDLIBS) $(GUILDLIBS)
 
 LDFLAGS     = $(EXTRALDFLAGS) $(XLIB) -L$(WXDIR)/lib
 LDLIBS      = $(EXTRALDLIBS) $(GUILDLIBS)