[Scummvm-cvs-logs] SF.net SVN: scummvm:[52937] scummvm/branches/branch-1-2-0/configure

[djwillis at users.sourceforge.net]

Revision: 52937
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52937&view=rev
Author:   djwillis
Date:     2010-09-28 21:31:37 +0000 (Tue, 28 Sep 2010)

Log Message:
-----------
CONFIGURE: Wrap PLUGIN_DIRECTORY define so the OpenPandora backend can set the value.

Modified Paths:
--------------
    scummvm/branches/branch-1-2-0/configure

Modified: scummvm/branches/branch-1-2-0/configure
===================================================================
--- scummvm/branches/branch-1-2-0/configure	2010-09-28 20:31:17 UTC (rev 52936)
+++ scummvm/branches/branch-1-2-0/configure	2010-09-28 21:31:37 UTC (rev 52937)
@@ -1819,7 +1819,7 @@
 		openpandora)
 			DEFINES="$DEFINES -DOPENPANDORA -DREDUCE_MEMORY_USAGE"
 			# Disable DOSBOX OPL for now.
-			DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL"			
+			DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL"
 			if test "$_release_build" = no; then
 				DEFINES="$DEFINES -DOP_DEBUG"
 			else
@@ -2563,8 +2563,16 @@
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
 DEFINES="$DEFINES -DDATA_PATH=\\\"$datadir\\\""
-DEFINES="$DEFINES -DPLUGIN_DIRECTORY=\\\"$libdir/scummvm\\\""
 
+case $_backend in
+	openpandora)
+		# Add ../plugins as a path so plugins can be found when running from a .PND.
+		DEFINES="$DEFINES -DPLUGIN_DIRECTORY=\\\"../plugins\\\""
+		;;
+	*)
+		DEFINES="$DEFINES -DPLUGIN_DIRECTORY=\\\"$libdir/scummvm\\\""
+		;;
+esac
 
 #
 # Set variables for profiling.


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