We don't put main() in the library any more.

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

diff --git a/src/make.env.in b/src/make.env.in
index 473217cd2f2d75fc3464839706221cad55f8ac58..0604cbca52b86764200fa35848ddc5e2bbac7a0d 100644 (file)
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -3,7 +3,7 @@
 # Author:   Julian Smart, Robert Roebling, Vadim Zeitlin, Ron Lee
 # Created:  1993
 # Updated:  2001
 # Author:   Julian Smart, Robert Roebling, Vadim Zeitlin, Ron Lee
 # Created:  1993
 # Updated:  2001

-# Copyright:(c) 1993, AIAI, University of Edinburgh,
+# Copyright:,

 # Copyright:(c) 1999, Vadim Zeitlin
 # Copyright:(c) 1999, Robert Roebling
 # Copyright:(c) 2001, Ron Lee
 # Copyright:(c) 1999, Vadim Zeitlin
 # Copyright:(c) 1999, Robert Roebling
 # Copyright:(c) 2001, Ron Lee


@@ -12,8 +12,9 @@
 ####################### GENERAL SETTINGS ############################
 
 # see comment near LDFLAGS at the end of file
 ####################### GENERAL SETTINGS ############################
 
 # see comment near LDFLAGS at the end of file

-EXTRALIBS = @LDFLAGS@ @LIBS@ @DMALLOC_LIBS@
+EXTRALIBS = @LDFLAGS@ @LDFLAGS_VERSIONING@ @LIBS@ @DMALLOC_LIBS@

 OPENGLLIBS = @OPENGL_LIBS@
 OPENGLLIBS = @OPENGL_LIBS@

+LDFLAGS_GL = @LDFLAGS_GL@

 LDLIBS = ${APPEXTRALIBS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${EXTRALIBS}
 
 TOOLKIT = @TOOLKIT@
 LDLIBS = ${APPEXTRALIBS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${EXTRALIBS}
 
 TOOLKIT = @TOOLKIT@


@@ -21,6 +22,7 @@ TOOLKITDIR = @TOOLKIT_DIR@
 
 WXLIB = @WX_LIBRARY_NAME_STATIC@
 WXSHLIB = @WX_LIBRARY_NAME_SHARED@
 
 WXLIB = @WX_LIBRARY_NAME_STATIC@
 WXSHLIB = @WX_LIBRARY_NAME_SHARED@

+WXLIBBASE = @WX_LIBRARY_BASENAME@

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


@@ -56,6 +58,8 @@ RESCOMP     = @RESCOMP@
 
 DEREZ       = @DEREZ@
 
 
 DEREZ       = @DEREZ@
 

+SETFILE     = @SETFILE@
+

 DLLTOOL     = @DLLTOOL@
 
 INSTALL         = @INSTALL@
 DLLTOOL     = @DLLTOOL@
 
 INSTALL         = @INSTALL@


@@ -66,7 +70,7 @@ INSTALL_SCRIPT  = @INSTALL@
 ########################### Flags #################################
 
 CPPFLAGS = ${APPEXTRACPPFLAGS} @CPPFLAGS@ @TOOLCHAIN_DEFS@@TOOLCHAIN_DLL_DEFS@ @WXDEBUG_DEFINE@
 ########################### Flags #################################
 
 CPPFLAGS = ${APPEXTRACPPFLAGS} @CPPFLAGS@ @TOOLCHAIN_DEFS@@TOOLCHAIN_DLL_DEFS@ @WXDEBUG_DEFINE@

-CFLAGS = ${APPEXTRACFLAGS} ${CPPFLAGS} @CODE_GEN_FLAGS@ @CFLAGS@
+CFLAGS = ${APPEXTRACFLAGS} ${CPPFLAGS}@CODE_GEN_FLAGS@ @CFLAGS@

 CXXFLAGS = ${APPEXTRACXXFLAGS} ${CPPFLAGS}@CODE_GEN_FLAGS@@CODE_GEN_FLAGS_CXX@ @CXXFLAGS@
 PICFLAGS = @PIC_FLAG@
 
 CXXFLAGS = ${APPEXTRACXXFLAGS} ${CPPFLAGS}@CODE_GEN_FLAGS@@CODE_GEN_FLAGS_CXX@ @CXXFLAGS@
 PICFLAGS = @PIC_FLAG@
 


@@ -75,3 +79,7 @@ PICFLAGS = @PIC_FLAG@
 # EXTRALIBS instead (see above)
 # LDFLAGS = @LDFLAGS@
 
 # EXTRALIBS instead (see above)
 # LDFLAGS = @LDFLAGS@
 

+# specific linker flags for when building executables since there
+# Mac OS X requires specific linker flags for executables linked
+# against dynamic shared libraries
+LDFLAGS_EXE = @LDFLAGS_EXE@