*** empty log message ***

[wxWidgets.git] / src / make.env

diff --git a/src/make.env b/src/make.env
index 55a9efe36d5bcd12e32b8c8552531412b05087da..4e72c8d2d205bdc961be3770596315f6bf334cb2 100644 (file)
--- 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).
 # 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
 #
 ########################### Programs #################################
 
 # Replace this with your own path if necessary

-WXDIR       = /home/jacs/wx2
+WXDIR       = $(WXWIN)

 
 # C++ compiler
 CC          = g++
 
 # C++ compiler
 CC          = g++


@@ -28,14 +29,14 @@ RANLIB      = ranlib
 ############################ Switches #################################
 
 # Debug/trace mode. 1 or more for debugging.
 ############################ 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
 GUI         = -D__WXSTUBS__ -D__LINUX__ -D__UNIX__
 GUISUFFIX   = _stubs
 
 ########################## Compiler flags #############################
 
 # Misc options

-OPTIONS     = -D__WXDEBUG__ -DWXDEBUG
+OPTIONS     = -D__WXDEBUG__

 COPTIONS    =
 DEBUGFLAGS  = -ggdb
 INCLUDE     =
 COPTIONS    =
 DEBUGFLAGS  = -ggdb
 INCLUDE     =


@@ -74,8 +75,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) -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)
 
 LDFLAGS     = $(EXTRALDFLAGS) $(XLIB) -L$(WXDIR)/lib
 LDLIBS      = $(EXTRALDLIBS) $(GUILDLIBS)
 


@@ -83,11 +84,14 @@ LDLIBS      = $(EXTRALDLIBS) $(GUILDLIBS)
 .SUFFIXES:     .o .cpp .c
 
 .c.o :
 .SUFFIXES:     .o .cpp .c
 
 .c.o :

-       $(CC) -c $(CFLAGS) -o $@ $<
+       $(CCC) -c $(CFLAGS) -o $@ $<

 
 .cpp.o :
        $(CC) -c $(CPPFLAGS) -o $@ $<
 
 
 .cpp.o :
        $(CC) -c $(CPPFLAGS) -o $@ $<
 

+.C.o :
+       $(CC) -c $(CPPFLAGS) -o $@ $<
+

 ####################### Targets to allow multiple GUIs ####################
 
 dummy:
 ####################### Targets to allow multiple GUIs ####################
 
 dummy:


@@ -97,10 +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__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 -lXpm -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:
 
 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__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'
 
 cleanstubs:
        make -f makefile.unx clean GUI='-D__WXSTUBS__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'