[Scummvm-cvs-logs] scummvm master -> a6dc1712556f8170378dc1b1c67f3f6ebcf7658d

[kayahr]

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

Summary:
c7b4818025 WEBOS: Added comments to explain some WebOS compile settings.
77817a8be8 WEBOS: Moved webos plugin build configuration into its own block so it can be configured separately from the generic lin
8d7baf9ffa WEBOS: Removed unused libpdl linking.
a6dc171255 WEBOS: Added comment for Palm Pixi specific compiler options.


Commit: c7b481802535744aeeffd973afadb5d492057518
    https://github.com/scummvm/scummvm/commit/c7b481802535744aeeffd973afadb5d492057518
Author: Klaus Reimer (k at ailis.de)
Date: 2011-05-08T08:39:25-07:00

Commit Message:
WEBOS: Added comments to explain some WebOS compile settings.

Changed paths:
    configure



diff --git a/configure b/configure
index b45c271..62c8a11 100755
--- a/configure
+++ b/configure
@@ -1138,7 +1138,13 @@ webos)
 	_host_os=webos
 	_host_cpu=arm
 	_host_alias=arm-none-linux-gnueabi
+	# The prefix is always the same on WebOS so we hardcode the default
+	# here. It is still possible to define a custom prefix which is
+	# needed when packaging the app with a user-specific app ID.
 	test "x$prefix" = xNONE && prefix=/media/cryptofs/apps/usr/palm/applications/org.scummvm.scummvm
+	# WebOS apps are installed into app-specific directories. The 
+	# default directory structure of ScummVM makes no sense here so we
+	# hardcode WebOS specific directories here.
 	datarootdir='${prefix}/data'
 	datadir='${datarootdir}'
 	docdir='${prefix}/doc'
@@ -2933,6 +2939,8 @@ case $_backend in
 		DEFINES="$DEFINES -DPLUGIN_DIRECTORY=\\\"../plugins\\\""
 		;;
 	webos)
+		# The WebOS app wants the plugins in the "lib" directory
+		# without a scummvm sub directory.
 		DEFINES="$DEFINES -DPLUGIN_DIRECTORY=\\\"$libdir\\\""
 		;;
 	*)
@@ -3114,6 +3122,7 @@ case $_backend in
 		DEFINES="$DEFINES -DSDL_BACKEND"
 		;;
 	webos)
+		# There is no sdl-config in the WebOS PDK so we don't use find_sdlconfig here.
 		LIBS="$LIBS -lSDL -lpdl"
 		DEFINES="$DEFINES -DSDL_BACKEND -DWEBOS"
 		MODULES="$MODULES backends/platform/sdl"


Commit: 77817a8be8881fee3d89c2e48a3fccbc0df81baf
    https://github.com/scummvm/scummvm/commit/77817a8be8881fee3d89c2e48a3fccbc0df81baf
Author: Klaus Reimer (k at ailis.de)
Date: 2011-05-08T08:39:26-07:00

Commit Message:
WEBOS: Moved webos plugin build configuration into its own block so it can be configured separately from the generic linux configuration.

Changed paths:
    configure



diff --git a/configure b/configure
index 62c8a11..573dd6b 100755
--- a/configure
+++ b/configure
@@ -2286,7 +2286,7 @@ POST_OBJS_FLAGS := -Wl,-no-whole-archive
 LIBS            += -ldl
 '
 		;;
-	linux* | webos)
+	linux*)
 _def_plugin='
 #define PLUGIN_PREFIX	"lib"
 #define PLUGIN_SUFFIX	".so"
@@ -2336,6 +2336,24 @@ LDFLAGS				+= -Wl,-T$(srcdir)/backends/plugins/psp/main_prog.ld
 PLUGIN_LDFLAGS		+= -Wl,-T$(srcdir)/backends/plugins/psp/plugin.ld -lstdc++ -lc
 '
 		;;
+	webos)
+_def_plugin='
+#define PLUGIN_PREFIX	"lib"
+#define PLUGIN_SUFFIX	".so"
+'
+_mak_plugins='
+DYNAMIC_MODULES := 1
+PLUGIN_PREFIX := lib
+PLUGIN_SUFFIX := .so
+PLUGIN_EXTRA_DEPS =
+CXXFLAGS        += -DDYNAMIC_MODULES
+CXXFLAGS        += -fpic
+PLUGIN_LDFLAGS  += -shared $(LDFLAGS)
+PRE_OBJS_FLAGS  := -Wl,-export-dynamic -Wl,-whole-archive
+POST_OBJS_FLAGS := -Wl,-no-whole-archive
+LIBS            += -ldl
+'
+		;;
 	*)
 		_dynamic_modules=no
 		_mak_plugins=


Commit: 8d7baf9ffa8ed111882cba0ad0150a7c4ab33be8
    https://github.com/scummvm/scummvm/commit/8d7baf9ffa8ed111882cba0ad0150a7c4ab33be8
Author: Klaus Reimer (k at ailis.de)
Date: 2011-05-08T08:39:26-07:00

Commit Message:
WEBOS: Removed unused libpdl linking.

Changed paths:
    configure



diff --git a/configure b/configure
index 573dd6b..9188e0b 100755
--- a/configure
+++ b/configure
@@ -3141,7 +3141,7 @@ case $_backend in
 		;;
 	webos)
 		# There is no sdl-config in the WebOS PDK so we don't use find_sdlconfig here.
-		LIBS="$LIBS -lSDL -lpdl"
+		LIBS="$LIBS -lSDL"
 		DEFINES="$DEFINES -DSDL_BACKEND -DWEBOS"
 		MODULES="$MODULES backends/platform/sdl"
 		;;


Commit: a6dc1712556f8170378dc1b1c67f3f6ebcf7658d
    https://github.com/scummvm/scummvm/commit/a6dc1712556f8170378dc1b1c67f3f6ebcf7658d
Author: Klaus Reimer (k at ailis.de)
Date: 2011-05-08T08:39:26-07:00

Commit Message:
WEBOS: Added comment for Palm Pixi specific compiler options.

Changed paths:
    configure



diff --git a/configure b/configure
index 9188e0b..e5ca5aa 100755
--- a/configure
+++ b/configure
@@ -1677,6 +1677,7 @@ case $_host_os in
 		;;
 	webos)
 		CXXFLAGS="$CXXFLAGS -I$WEBOS_PDK/include -I$WEBOS_PDK/include/SDL -I$WEBOS_PDK/device/usr/include"
+		# These compiler options are needed to support the Palm Pixi
 		CXXFLAGS="$CXXFLAGS -mcpu=arm1136jf-s -mfpu=vfp -mfloat-abi=softfp"
 		LDFLAGS="$LDFLAGS -L$WEBOS_PDK/device/lib -L$WEBOS_PDK/device/usr/lib"
 		LDFLAGS="$LDFLAGS -Wl,--allow-shlib-undefined"