[Scummvm-cvs-logs] scummvm master -> 42fa23ff1626e3232ce6ec240dc93b119c079c60

hkzlab hkzlabnet at gmail.com
Tue May 31 15:18:02 CEST 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
42fa23ff16 CONFIGURE: move some libs required by n64 port


Commit: 42fa23ff1626e3232ce6ec240dc93b119c079c60
    https://github.com/scummvm/scummvm/commit/42fa23ff1626e3232ce6ec240dc93b119c079c60
Author: Fabio Battaglia (hkzlabnet at gmail.com)
Date: 2011-05-31T06:16:25-07:00

Commit Message:
CONFIGURE: move some libs required by n64 port

Some system libs weren't found during link stage, this should fix it

Changed paths:
    configure



diff --git a/configure b/configure
index c8cb455..fe5784c 100755
--- a/configure
+++ b/configure
@@ -2249,7 +2249,7 @@ case $_backend in
 		INCLUDES="$INCLUDES "'-I$(N64SDK)/hkz-libn64'
 		INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/n64'
 		LIBS="$LIBS -lpakfs -lframfs -ln64 -ln64utils -lromfs"
-		LIBS="$LIBS -lm -lstdc++ -lc -lgcc -lz -lnosys"
+		LIBS="$LIBS -lm -lstdc++ -lz"
 		;;
 	null)
 		DEFINES="$DEFINES -DUSE_NULL_DRIVER"
@@ -3208,6 +3208,11 @@ case $_backend in
 		# than pick up anything unhygenic from the Android libs.
 		LIBS="-Wl,-Bstatic $static_libs -Wl,-Bdynamic -lgcc $system_libs -llog -lGLESv1_CM"
 		;;
+	n64)
+		# Move some libs down here, otherwise some symbols requires by libvorbis aren't found 
+		# during linking stage
+		LIBS="$LIBS -lc -lgcc -lnosys"
+		;;
 esac
 
 






More information about the Scummvm-git-logs mailing list