oops, forgot to fix wxHtmlTag dtor

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

diff --git a/src/makeenvs/sgi.env b/src/makeenvs/sgi.env
index f608bd9263f9c1bc438bd78e27bac9209beca507..b16923a70805d6540114aaa6f76ca7cd49d8dd56 100644 (file)
--- a/src/makeenvs/sgi.env
+++ b/src/makeenvs/sgi.env
@@ -1,29 +1,33 @@
-# generic.env
-# Linux/generic
+# sgi.env
+# SGI

 #
 # 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/mon/src/wx20
+WXWIN      = /home/jds/wx2
+WXDIR       = $(WXWIN)

 
 # C++ compiler
 
 # C++ compiler

-CC          = CC -n32 -D__SGI__ -D__SGI_CC__ 
+CC          = CC

 
 # C compiler
 
 # C compiler

-CCC         = cc -n32 -Xcpluscomm -D__SGI__ -D__SGI_CC__ 
+CCC         = cc

 
 # Compiler for lex/yacc .c programs
 CCLEX       = $(CCC)
 
 
 # Compiler for lex/yacc .c programs
 CCLEX       = $(CCC)
 

-LEX         = flex
+LEX         = lex

 YACC        = yacc
 YACC        = yacc

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

 MAKE        = make
 AROPTIONS   = ruv
 MAKE        = make
 AROPTIONS   = ruv

-RANLIB      = echo ranlib not required on SGI
+RANLIB      = echo

 
 ############################ Switches #################################
 
 
 ############################ Switches #################################
 


@@ -35,32 +39,31 @@ GUISUFFIX   = _stubs
 ########################## Compiler flags #############################
 
 # Misc options
 ########################## Compiler flags #############################
 
 # Misc options

-OPTIONS     = -D__WXDEBUG__ # -DDEBUG='$(DEBUG)' # -DWXDEBUG
-COPTIONS    =
-DEBUGFLAGS  = -g
+OPTIONS     = -32 -D__WXDEBUG__ -D__SGI__ -D__SGI_CC__ 
+COPTIONS    = -32 -Xcpluscomm -D__SGI__ -D__SGI_CC__ 
+DEBUGFLAGS  = -g3

 INCLUDE     =
 INCLUDE     =

-WARN        = 
-CWARN       = 
-OPT         = # -O2
+WARN        = -w
+CWARN       = -w
+OPT         = 

 
 ############################ Includes #################################
 
 # Compiler or system-specific include paths
 
 ############################ Includes #################################
 
 # Compiler or system-specific include paths

-COMPPATHS   =
+COMPPATHS   = 

 XINCLUDE    = -I/usr/include/X11 -I/usr/include/Xm \
               -I/usr/include/X11/Xm -I/usr/include
 XLIB        = -L/usr/local/X11/lib -L/usr/X11/lib -L/usr/X11R6/lib
 
 ############################ Libraries ################################
 
 XINCLUDE    = -I/usr/include/X11 -I/usr/include/Xm \
               -I/usr/include/X11/Xm -I/usr/include
 XLIB        = -L/usr/local/X11/lib -L/usr/X11/lib -L/usr/X11R6/lib
 
 ############################ Libraries ################################
 

-COMPLIBS    = #-lstdc++
+COMPLIBS    = 
+#COMPLIBS    = -lstdc++
+#COMPLIBS    = -lPW

 GUILDLIBS   = -lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lXpm -lX11 -lm
 
 ############################# Suffixes ################################
 
 GUILDLIBS   = -lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lXpm -lX11 -lm
 
 ############################# Suffixes ################################
 

-# Change cpp to c if you want to use main.c instead of main.cpp.
-# Edit wx_setup.h accordingly (USE_C_MAIN=1)
-

 OBJSUFF     =o
 SRCSUFF     =cpp
 MAINSUFF    =cpp
 OBJSUFF     =o
 SRCSUFF     =cpp
 MAINSUFF    =cpp


@@ -74,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)
 


@@ -97,19 +100,19 @@ dummy:
        echo Use a target: one of motif, stubs
 
 stubs:
        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:
 
 motif:

-       make -f makefile.unx all GUI='-D__WXMOTIF__ -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:
 
 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_gtk2 $(COMPLIBS) -ldl -lgtk -lgdk -lglib -lpng -lzlib -lX11 -lm -pthread'

 
 cleanstubs:
 
 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:
 
 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'

 
 $(OBJDIR):
        mkdir $(OBJDIR)
 
 $(OBJDIR):
        mkdir $(OBJDIR)