[Scummvm-cvs-logs] SF.net SVN: scummvm: [29701] scummvm/trunk/configure

knakos at users.sourceforge.net knakos at users.sourceforge.net
Sun Dec 2 13:11:59 CET 2007


Revision: 29701
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29701&view=rev
Author:   knakos
Date:     2007-12-02 04:11:59 -0800 (Sun, 02 Dec 2007)

Log Message:
-----------
fixes for cygwin build. In particular: move the _mak_plugins environment after LDFLAGS has been defined in config.mk, to allow building in case of non-standard lib paths (thru LDFLAGS). Also, silenced a nasm warning.

Modified Paths:
--------------
    scummvm/trunk/configure

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2007-12-02 12:08:45 UTC (rev 29700)
+++ scummvm/trunk/configure	2007-12-02 12:11:59 UTC (rev 29701)
@@ -308,7 +308,7 @@
 	else
 		case $_host_os in
 			mingw* | cygwin*)
-				NASMFLAGS="-f win32"
+				NASMFLAGS="-f win32 -w-orphan-labels"
 			;;
 			darwin*)
 				NASMFLAGS="-f macho"
@@ -1220,7 +1220,7 @@
 LIBS            += -ldl
 '
 		;;
-	*mingw32*)
+	*mingw32* | cygwin*)
 _def_plugin='
 #define PLUGIN_PREFIX	""
 #define PLUGIN_SUFFIX	".dll"
@@ -1231,7 +1231,7 @@
 PLUGIN_SUFFIX		:= .dll
 PLUGIN_EXTRA_DEPS	= $(EXECUTABLE)
 CXXFLAGS			+= -DDYNAMIC_MODULES
-PLUGIN_LDFLAGS		:= -shared ./libscummvm.a $(LIBS)
+PLUGIN_LDFLAGS		:= -shared ./libscummvm.a $(LIBS) $(LDFLAGS)
 PRE_OBJS_FLAGS		:= -Wl,--whole-archive
 POST_OBJS_FLAGS		:= -Wl,--export-all-symbols -Wl,--no-whole-archive -Wl,--out-implib,./libscummvm.a
 '
@@ -1645,8 +1645,6 @@
 MANDIR := $_mandir
 DATADIR := $_datadir
 
-$_mak_plugins
-
 $_config_mk_data
 
 INCLUDES += $INCLUDES
@@ -1654,6 +1652,8 @@
 DEFINES += $DEFINES
 LDFLAGS += $LDFLAGS
 
+$_mak_plugins
+
 SAVED_CONFIGFLAGS := $SAVED_CONFIGFLAGS
 SAVED_LDFLAGS     := $SAVED_LDFLAGS
 SAVED_CXX         := $SAVED_CXX


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list