X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7f555861b7e50f335c7b929bb76be38e9ebd69c5..eeccd5d94ce6b11f36af95db4ac528a2e2e0c4c5:/src/make.env

diff --git a/src/make.env b/src/make.env
index a5a1a2d4a1..4e72c8d2d2 100644
--- a/src/make.env
+++ b/src/make.env
@@ -4,22 +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$
 #
-# An alternative to editing this file is to create a shell script
-# to export specific variables, and call make with the -e switch
-# to override makefile variables. See wx/install/install.txt.
-# And you can override specific variables on the make command line, e.g.
-#
-# make -f makefile.unix DEBUG=''
-#
-# You may prefer to use the GNU configure script than raw makefiles -
-# see contrib/wxshlib.
-#
-
 ########################### Programs #################################
 
 # Replace this with your own path if necessary
-WXDIR       = /home/jacs/wx2
+WXDIR       = $(WXWIN)
 
 # C++ compiler
 CC          = g++
@@ -39,14 +29,14 @@ RANLIB      = ranlib
 ############################ Switches #################################
 
 # Debug/trace mode. 1 or more for debugging.
-DEBUG       = 0
+DEBUG       = 1
 GUI         = -D__WXSTUBS__ -D__LINUX__ -D__UNIX__
 GUISUFFIX   = _stubs
 
 ########################## Compiler flags #############################
 
 # Misc options
-OPTIONS     = -D__WXDEBUG__ -DWXDEBUG
+OPTIONS     = -D__WXDEBUG__
 COPTIONS    =
 DEBUGFLAGS  = -ggdb
 INCLUDE     =
@@ -65,7 +55,7 @@ XLIB        = -L/usr/local/X11/lib -L/usr/openwin/lib -L/usr/X11/lib -L/usr/X11R
 ############################ Libraries ################################
 
 COMPLIBS    = -lstdc++
-GUILDLIBS   = -lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm
+GUILDLIBS   = -lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lXpm -lX11 -lm
 
 ############################# Suffixes ################################
 
@@ -85,8 +75,8 @@ INC         = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib $(COMPPATHS)
 # Directory for object files
 OBJDIR = objects$(GUISUFFIX)
 
-CPPFLAGS    = $(EXTRACPPFLAGS) $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) -DDEBUG='$(DEBUG)' $(WARN) $(OPT)
-CFLAGS      = $(EXTRACFLAGS) $(XINCLUDE) $(INC) $(COPTIONS) $(GUI) $(DEBUGFLAGS) -DDEBUG='$(DEBUG)' $(CWARN) $(OPT)
+CPPFLAGS    = $(EXTRACPPFLAGS) $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT)
+CFLAGS      = $(EXTRACFLAGS) $(XINCLUDE) $(INC) $(COPTIONS) $(GUI) $(DEBUGFLAGS) $(CWARN) $(OPT)
 LDFLAGS     = $(EXTRALDFLAGS) $(XLIB) -L$(WXDIR)/lib
 LDLIBS      = $(EXTRALDLIBS) $(GUILDLIBS)
 
@@ -94,11 +84,14 @@ LDLIBS      = $(EXTRALDLIBS) $(GUILDLIBS)
 .SUFFIXES:	.o .cpp .c
 
 .c.o :
-	$(CC) -c $(CFLAGS) -o $@ $<
+	$(CCC) -c $(CFLAGS) -o $@ $<
 
 .cpp.o :
 	$(CC) -c $(CPPFLAGS) -o $@ $<
 
+.C.o :
+	$(CC) -c $(CPPFLAGS) -o $@ $<
+
 ####################### Targets to allow multiple GUIs ####################
 
 dummy:
@@ -108,7 +101,10 @@ stubs:
 	make -f makefile.unx all GUI='-D__WXSTUBS__ -D__LINUX__ -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 -lX11 -lm'
+	make -f makefile.unx all GUI='-D__WXMOTIF__ -D__LINUX__ -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_gtk2 $(COMPLIBS) -ldl -lgtk -lgdk -lglib -lpng -lzlib -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'