X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8bbe427f8e5a2078b266e282453595b5a634d35c..1d37e644007e676b82e75426daa1d5118bb76780:/src/make.env

diff --git a/src/make.env b/src/make.env
index 465773788c..5e6354b265 100644
--- a/src/make.env
+++ b/src/make.env
@@ -4,11 +4,12 @@
 # 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).
+# RCS-ID:      $Id$
 #
 ########################### Programs #################################
 
 # Replace this with your own path if necessary
-WXDIR       = $(wx)
+WXDIR       = $(WXWIN)
 
 # C++ compiler
 CC          = g++
@@ -21,6 +22,8 @@ CCLEX       = $(CCC)
 
 LEX         = lex
 YACC        = yacc
+# Note: if using bison, use -y option for yacc compatibility
+# YACC      = bison -y
 MAKE        = make
 AROPTIONS   = ruv
 RANLIB      = ranlib
@@ -28,27 +31,28 @@ RANLIB      = ranlib
 ############################ Switches #################################
 
 # Debug/trace mode. 1 or more for debugging.
-DEBUG       = 0
-GUI         = -D__WXSTUBS__ -D__LINUX__ -D__UNIX__
+DEBUG       = 1
+GUI         = -D__WXSTUBS__ -D__UNIX__
 GUISUFFIX   = _stubs
 
 ########################## Compiler flags #############################
 
 # Misc options
-OPTIONS     = -D__WXDEBUG__
+OPTIONS     = -D__LINUX__ -D__WXDEBUG__
 COPTIONS    =
-DEBUGFLAGS  = -ggdb
+DEBUGFLAGS  = # -ggdb
 INCLUDE     =
 WARN        = -Wall -Wno-unused # -w
 CWARN       = -Wall -Wno-unused # -w
-OPT         = # -O2
+OPT         = -O2
 
 ############################ Includes #################################
 
 # Compiler or system-specific include paths
 COMPPATHS   =
 XINCLUDE    = -I/usr/openwin/include -I/usr/include/X11 -I/usr/include/Xm \
-              -I/usr/include/X11/Xm -I/usr/include
+              -I/usr/include/X11/Xm -I/usr/include -I/usr/local/include \
+	      -I/usr/lib/glib/include -I/usr/local/lib/glib/include
 XLIB        = -L/usr/local/X11/lib -L/usr/openwin/lib -L/usr/X11/lib -L/usr/X11R6/lib
 
 ############################ Libraries ################################
@@ -69,13 +73,13 @@ MAINSUFF    =cpp
 
 WXINC       = $(WXDIR)/include
 WXLIB       = $(WXDIR)/lib/libwx$(GUISUFFIX).a
-INC         = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib $(COMPPATHS)
+INC         = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib $(COMPPATHS)
 
 # 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)
 
@@ -97,19 +101,22 @@ dummy:
 	echo Use a target: one of motif, stubs
 
 stubs:
-	make -f makefile.unx all GUI='-D__WXSTUBS__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'
+	make -f makefile.unx all GUI='-D__WXSTUBS__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'
 
 motif:
-	make -f makefile.unx all GUI='-D__WXMOTIF__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lXm -lXmu -lXt -lXpm -lX11 -lm'
+	make -f makefile.unx all GUI='-D__WXMOTIF__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lpng -lzlib -lXm -lXmu -lXt -lXpm -lX11 -lm'
 
 gtk:
-	make -f makefile.unx all GUI='-D__WXGTK__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_gtk' GUILDLIBS='-lwx_gtk $(COMPLIBS) -lXm -lXmu -lXpm -lX11 -lm'
+	make -f makefile.unx all GUI='-D__WXGTK__ -D__UNIX__' GUISUFFIX='_gtk' GUILDLIBS='-lwx_gtk $(COMPLIBS) -ldl `gtk-config --libs` -lX11 -lm -pthread'
 
 cleanstubs:
-	make -f makefile.unx clean GUI='-D__WXSTUBS__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'
+	make -f makefile.unx clean GUI='-D__WXSTUBS__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'
 
 cleanmotif:
-	make -f makefile.unx clean GUI='-D__WXMOTIF__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'
+	make -f makefile.unx clean GUI='-D__WXMOTIF__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'
+
+cleangtk:
+	make -f makefile.unx clean GUI='-D__WXGTK__ -D__UNIX__' GUISUFFIX='_gtk'
 
 $(OBJDIR):
 	mkdir $(OBJDIR)