more reasonable default size

[wxWidgets.git] / src / make.env

diff --git a/src/make.env b/src/make.env
index 7df2eca3cfc210f099c5c6f706f0d28068144165..5e6354b2657f464492cfdc176edbf36b76fa5dfc 100644 (file)
--- a/src/make.env
+++ b/src/make.env
@@ -40,18 +40,19 @@ GUISUFFIX   = _stubs
 # Misc options
 OPTIONS     = -D__LINUX__ -D__WXDEBUG__
 COPTIONS    =
 # Misc options
 OPTIONS     = -D__LINUX__ -D__WXDEBUG__
 COPTIONS    =

-DEBUGFLAGS  = -ggdb
+DEBUGFLAGS  = # -ggdb

 INCLUDE     =
 WARN        = -Wall -Wno-unused # -w
 CWARN       = -Wall -Wno-unused # -w
 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 \
 
 ############################ 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 ################################
 XLIB        = -L/usr/local/X11/lib -L/usr/openwin/lib -L/usr/X11/lib -L/usr/X11R6/lib
 
 ############################ Libraries ################################


@@ -72,7 +73,7 @@ MAINSUFF    =cpp
 
 WXINC       = $(WXDIR)/include
 WXLIB       = $(WXDIR)/lib/libwx$(GUISUFFIX).a
 
 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)
 
 # Directory for object files
 OBJDIR = objects$(GUISUFFIX)


@@ -106,7 +107,7 @@ motif:
        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__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__UNIX__' GUISUFFIX='_gtk' GUILDLIBS='-lwx_gtk2 $(COMPLIBS) -ldl -lgtk -lgdk -lglib -lpng -lzlib -lX11 -lm -pthread'
+       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__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'
 
 cleanstubs:
        make -f makefile.unx clean GUI='-D__WXSTUBS__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'