Added style parameter to wxPopupWindow ctors so they match the Create method.

[wxWidgets.git] / src / make.env.in

diff --git a/src/make.env.in b/src/make.env.in
index 97cfd5d948b811d22cedf15178695a121a4599ad..f085a09f1d62d9e66c798c6ee2bb3946dae15278 100644 (file)
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -1,20 +1,26 @@
 #
 # File:     make.env
 #
 # File:     make.env

-# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
+# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin, Ron Lee

 # Created:  1993
 # Created:  1993

-# Updated:  1999
+# Updated:  2001

 # Copyright:(c) 1993, AIAI, University of Edinburgh,
 # Copyright:(c) 1999, Vadim Zeitlin
 # Copyright:(c) 1999, Robert Roebling
 # Copyright:(c) 1993, AIAI, University of Edinburgh,
 # Copyright:(c) 1999, Vadim Zeitlin
 # Copyright:(c) 1999, Robert Roebling

+# Copyright:(c) 2001, Ron Lee

 #
 
 #
 

-########################### VERSION #################################
+####################### GENERAL SETTINGS ############################

 
 

-LDLIBS = @LD_LIBS@
+# see comment near LDFLAGS at the end of file
+EXTRALIBS = @LDFLAGS@ @EXTRA_LIBS@
+OPENGLLIBS = @OPENGL_LIBS@
+LDLIBS = ${APPEXTRALIBS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${EXTRALIBS}

 
 TOOLKIT = @TOOLKIT@
 
 TOOLKIT = @TOOLKIT@

+TOOLKITDIR = @TOOLKIT_DIR@

 
 

-WXLIB = lib@WX_LIBRARY@.a
+WXLIB = @WX_LIBRARY_NAME_STATIC@
+WXSHLIB = @WX_LIBRARY_NAME_SHARED@

 
 ########################### VERSION #################################
 
 
 ########################### VERSION #################################
 


@@ -22,19 +28,10 @@ WX_MAJOR_VERSION_NUMBER = @WX_MAJOR_VERSION_NUMBER@
 WX_MINOR_VERSION_NUMBER = @WX_MINOR_VERSION_NUMBER@
 WX_RELEASE_NUMBER = @WX_RELEASE_NUMBER@
 
 WX_MINOR_VERSION_NUMBER = @WX_MINOR_VERSION_NUMBER@
 WX_RELEASE_NUMBER = @WX_RELEASE_NUMBER@
 

-########################### Misc #################################
-
-SHELL = @SHELL@
-

 ########################### Programs #################################
 
 ########################### Programs #################################
 

-# C++ compiler
-CC          = @CXX@
-CCPP        = @CXXCPP@
-
-# C compiler
-CCC         = @CC@
-CCCPP       = @CPP@
+CXX         = @CXX@
+CC          = @CC@

 
 # Compiler for lex/yacc .c programs
 CCLEX       = @CC@
 
 # Compiler for lex/yacc .c programs
 CCLEX       = @CC@


@@ -52,21 +49,25 @@ RANLIB      = @RANLIB@
 LD          = @LD@
 MAKEINFO    = @MAKEINFO@
 
 LD          = @LD@
 MAKEINFO    = @MAKEINFO@
 

-########################### Flags #################################
-
-CFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CFLAGS@
-CPPFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CXXFLAGS@
+SHARED_LD   = @SHARED_LD@

 
 

-########################### Rules #################################
+RESFLAGS    = @RESFLAGS@
+RESCOMP     = @RESCOMP@

 
 

-# Clears all default suffixes
-.SUFFIXES:     .o .cpp .c
+DEREZ       = @DEREZ@

 
 

-.c.o :
-       $(CCC) -c $(CFLAGS) -o $@ $<
+DLLTOOL     = @DLLTOOL@

 
 

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

 
 

+CPPFLAGS = ${APPEXTRACPPFLAGS} @CPPFLAGS@ @TOOLCHAIN_DEFS@ @WXDEBUG_DEFINE@
+CFLAGS = ${APPEXTRACFLAGS} ${CPPFLAGS} @CODE_GEN_FLAGS@ @CFLAGS@
+CXXFLAGS = ${APPEXTRACXXFLAGS} ${CPPFLAGS} \
+           @CODE_GEN_FLAGS@ @CODE_GEN_FLAGS_CXX@ @CXXFLAGS@
+PICFLAGS = @PIC_FLAG@

 
 

+# taking into account how SHARED_LD is defined, appending LDFLAGS to it
+# doesn't work, so we put them in the end of the linker command line in
+# EXTRALIBS instead (see above)
+# LDFLAGS = @LDFLAGS@