projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed bug with wxPathExists('c:\') yet again
[wxWidgets.git]
/
src
/
make.env.in
diff --git
a/src/make.env.in
b/src/make.env.in
index d5ee1c213ea3967c5e6b679feb007b1910bc059b..356a9fbbab619aec6faca388644ddb58f977801b 100644
(file)
--- a/
src/make.env.in
+++ b/
src/make.env.in
@@
-10,9
+10,10
@@
####################### GENERAL SETTINGS ############################
####################### GENERAL SETTINGS ############################
-
-EXTRA_LIBS = @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@
@@
-56,6
+57,14
@@
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 #################################
#
@@
-65,9
+74,12
@@
SHARED_LD = @SHARED_LD@
# We *must* include CPPFLAGS in both of these, to make sure that all
# header files get found. (KB)
# We *must* include CPPFLAGS in both of these, to make sure that all
# header files get found. (KB)
-CFLAGS =
@TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CFLAGS@ @CPP
FLAGS@
-CPPFLAGS =
@TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS
@
+CFLAGS =
$(APPEXTRACFLAGS) $(APPEXTRACPPFLAGS) @TOOLKIT_DEF@ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @CFLAGS@ @CPPFLAGS@ @CODE_GEN_
FLAGS@
+CPPFLAGS =
$(APPEXTRACXXFLAGS) $(APPEXTRACPPFLAGS) @TOOLKIT_DEF@ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS@ @CODE_GEN_FLAGS_CXX
@
PICFLAGS = @PIC_FLAG@
PICFLAGS = @PIC_FLAG@
-LDFLAGS = @LDFLAGS@
+# 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@