Replaced /'s with \'s as BCC requires \'s for path names

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

diff --git a/src/make.env.in b/src/make.env.in
index 3c5921b7840f1d3f6a7048c26b214109730e2cf1..c835ab3fab7fe20871710a69881b8dbef6061697 100644 (file)
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -10,9 +10,10 @@
 
 ####################### GENERAL SETTINGS ############################
 
 
 ####################### GENERAL SETTINGS ############################
 

-
-EXTRALIBS = @EXTRA_LIBS@
-LDLIBS = ${top_builddir}/lib/@WX_TARGET_LIBRARY@  $(EXTRA_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@
 TOOLKITDIR = @TOOLKIT_DIR@
 
 TOOLKIT = @TOOLKIT@
 TOOLKITDIR = @TOOLKIT_DIR@


@@ -26,10 +27,6 @@ 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 #################################
 
 # C++ compiler
 ########################### Programs #################################
 
 # C++ compiler


@@ -58,11 +55,24 @@ MAKEINFO    = @MAKEINFO@
 
 SHARED_LD   = @SHARED_LD@
 
 
 SHARED_LD   = @SHARED_LD@
 

+RESFLAGS    = @RESFLAGS@
+RESCOMP     = @RESCOMP@
+REZ         = @REZ@
+REZFLAGS    = @REZFLAGS@
+DEREZ       = @DEREZ@
+DEREZFLAGS  = @DEREZFLAGS@
+DLLTOOL     = @DLLTOOL@
+

 ########################### Flags #################################
 
 ########################### Flags #################################
 

-CFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CFLAGS@
-CPPFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CXXFLAGS@
+CPPFLAGS = ${APPEXTRACPPFLAGS} @CPPFLAGS@ @TOOLKIT_DEF@ @WXDEBUG_DEFINE@
+CFLAGS = ${APPEXTRACFLAGS} ${CPPFLAGS} @CODE_GEN_FLAGS@ @CFLAGS@
+CXXFLAGS = ${APPEXTRACXXFLAGS} ${CPPFLAGS} \
+           @CODE_GEN_FLAGS@ @CODE_GEN_FLAGS_CXX@ @CXXFLAGS@

 PICFLAGS = @PIC_FLAG@
 
 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@