diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 81 |
1 files changed, 63 insertions, 18 deletions
@@ -20,8 +20,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# $URL$ -# $Id$ # Save the current environment variables for next runs SAVED_CONFIGFLAGS=$@ @@ -174,7 +172,7 @@ _strip=strip _ar="ar cru" _as="as" _windres=windres -_win32path="C:/scummvm" +_win32path="build/x86" _aos4path="Games:ScummVM" _staticlibpath=/sw _sdlconfig=sdl-config @@ -654,7 +652,7 @@ Configuration: -h, --help display this help and exit --backend=BACKEND backend to build (android, dc, dingux, ds, gp2x, gph, iphone, linuxmoto, maemo, n64, null, openpandora, ps2, - psp, samsungtv, sdl, symbian, webos, wii, wince) [sdl] + psp, samsungtv, sdl, webos, wii, wince) [sdl] Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX @@ -1139,7 +1137,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' @@ -1591,9 +1595,9 @@ case $_host_os in if test "$_dynamic_modules" = no ; then LDFLAGS="$LDFLAGS -Wl,--gc-sections" else - LDFLAGS="$LDFLAGS -Wl,--no-gc-sections" - # TODO automate this required 2 step linking phase - # LDFLAGS="$LDFLAGS -Wl,--retain-symbols-file,ds.syms" + LDFLAGS="$LDFLAGS -Wl,--no-gc-sections" + # TODO automate this required 2 step linking phase + # LDFLAGS="$LDFLAGS -Wl,--retain-symbols-file,ds.syms" fi LDFLAGS="$LDFLAGS -L$DEVKITPRO/libnds/lib" LIBS="$LIBS -lnds9" @@ -1640,7 +1644,7 @@ case $_host_os in mingw*) DEFINES="$DEFINES -DWIN32 -D__USE_MINGW_ANSI_STDIO=0" LIBS="$LIBS -lmingw32 -lwinmm" - OBJS="$OBJS scummvmico.o" + OBJS="$OBJS scummvmwinres.o" add_line_to_config_mk 'WIN32 = 1' ;; mint*) @@ -1672,6 +1676,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" @@ -1693,8 +1698,8 @@ case $_host_os in fi ;; wince) - CXXFLAGS="$CXXFLAGS -O3 -fno-inline-functions -march=armv4 -mtune=xscale" - DEFINES="$DEFINES -D_WIN32_WCE=300 -D__ARM__ -D_ARM_ -DUNICODE -DFPM_DEFAULT -DNONSTANDARD_PORT" + CXXFLAGS="$CXXFLAGS -O3 -fno-inline-functions -march=armv4 -mtune=xscale -D_WIN32_WCE=300 " + DEFINES="$DEFINES -D__ARM__ -D_ARM_ -DUNICODE -DFPM_DEFAULT -DNONSTANDARD_PORT" DEFINES="$DEFINES -DWIN32 -Dcdecl= -D__cdecl__=" ;; # given this is a shell script assume some type of unix @@ -2050,7 +2055,7 @@ if test -n "$_host"; then add_line_to_config_h "#define USE_WII_KBD" ;; wince) - LDFLAGS="$LDFLAGS -Wl,-Map,scummvm.exe.map -Wl,--stack,65536" + LDFLAGS="$LDFLAGS -Wl,--stack,65536" _need_memalign=yes _arm_asm=yes _tremolo=yes @@ -2281,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" @@ -2315,6 +2320,24 @@ PRE_OBJS_FLAGS := -Wl,--whole-archive POST_OBJS_FLAGS := -Wl,--export-all-symbols -Wl,--no-whole-archive -Wl,--out-implib,./libscummvm.a ' ;; + wince) + DEFINES="$DEFINES -DUNCACHED_PLUGINS" + HOSTEXEEXT=".dll" +_def_plugin=' +#define PLUGIN_PREFIX "" +#define PLUGIN_SUFFIX ".dll" +' +_mak_plugins=' +DYNAMIC_MODULES := 1 +PLUGIN_PREFIX := +PLUGIN_SUFFIX := .dll +PLUGIN_EXTRA_DEPS = $(EXECUTABLE) +CXXFLAGS += -DDYNAMIC_MODULES +PLUGIN_LDFLAGS := -shared -lscummvm -L. +PRE_OBJS_FLAGS := -Wl,--whole-archive +POST_OBJS_FLAGS := -Wl,--export-all-symbols -Wl,--no-whole-archive -Wl,--out-implib,./libscummvm.a -shared +' + ;; ps2) _elf_loader=yes DEFINES="$DEFINES -DMIPS_TARGET" @@ -2331,6 +2354,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= @@ -2560,11 +2601,6 @@ fi define_in_config_if_yes "$_png" 'USE_PNG' echo "$_png" -if test `get_engine_build sword25` = yes && test ! "$_png" = yes ; then - echo "...disabling Broken Sword 2.5 engine. PNG is required" - engine_disable sword25 -fi - # # Check for Theora Decoder # @@ -2637,6 +2673,11 @@ fi define_in_config_if_yes "$_zlib" 'USE_ZLIB' echo "$_zlib" +if test `get_engine_build sword25` = yes && test ! "$_zlib" = yes ; then + echo "...disabling Broken Sword 2.5 engine. ZLib is required" + engine_disable sword25 +fi + # # Check for LibMPEG2 # @@ -2934,6 +2975,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\\\"" ;; *) @@ -3084,6 +3127,7 @@ case $_backend in INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`" LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`" LDFLAGS="$LDFLAGS" + DEFINES="$DEFINES -DSDL_BACKEND" ;; ps2) # TODO ps2 @@ -3114,7 +3158,8 @@ case $_backend in DEFINES="$DEFINES -DSDL_BACKEND" ;; webos) - LIBS="$LIBS -lSDL -lpdl" + # There is no sdl-config in the WebOS PDK so we don't use find_sdlconfig here. + LIBS="$LIBS -lSDL" DEFINES="$DEFINES -DSDL_BACKEND -DWEBOS" MODULES="$MODULES backends/platform/sdl" ;; |