diff --git a/project/jni/application/hexen2/AndroidAppSettings.cfg b/project/jni/application/hexen2/AndroidAppSettings.cfg new file mode 100644 index 000000000..479bac03e --- /dev/null +++ b/project/jni/application/hexen2/AndroidAppSettings.cfg @@ -0,0 +1,33 @@ +# The application settings for Android libSDL port +AppSettingVersion=15 +LibSdlVersion=1.2 +AppName="Hexen2" +AppFullName=org.hexen2.sdl +ScreenOrientation=h +InhibitSuspend=y +AppDataDownloadUrl="Data size is 1 Mb|hexen2-data.zip" +SdlVideoResize=y +SdlVideoResizeKeepAspect=n +NeedDepthBuffer=n +AppUsesMouse=y +AppNeedsTwoButtonMouse=n +AppNeedsArrowKeys=y +AppNeedsTextInput=y +AppUsesJoystick=n +AppHandlesJoystickSensitivity=y +AppUsesMultitouch=n +NonBlockingSwapBuffers=n +RedefinedKeys="SPACE RETURN PLUS MINUS TAB ESCAPE DELETE" +AppTouchscreenKeyboardKeysAmount=0 +AppTouchscreenKeyboardKeysAmountAutoFire=0 +MultiABI=n +AppVersionCode=0908501 +AppVersionName="0.90.85.01" +CompiledLibraries="jpeg png" +CustomBuildScript=y +AppCflags='' +AppLdflags='' +AppSubdirsBuild='' +AppUseCrystaXToolchain=y +AppCmdline='-basedir=.' +ReadmeText='^You may press "Home" now - the data will be downloaded in background' diff --git a/project/jni/application/hexen2/AndroidBuild.sh b/project/jni/application/hexen2/AndroidBuild.sh new file mode 100755 index 000000000..2c834a5e8 --- /dev/null +++ b/project/jni/application/hexen2/AndroidBuild.sh @@ -0,0 +1,9 @@ +#!/bin/sh + + +LOCAL_PATH=`dirname $0` +LOCAL_PATH=`cd $LOCAL_PATH && pwd` + +ln -sf libsdl-1.2.so $LOCAL_PATH/../../../obj/local/armeabi/libSDL.so + +../setEnvironment.sh sh -c "cd hexen2source-1.4.3/hexen2 && make -j1 h2 MACH_TYPE=arm TARGET_OS=unix VERBOSE=1 STRIP='' LIBS='-lsdl-1.2 -lpng -lgcc -lz -lc -lstdc++'" && mv -f hexen2source-1.4.3/hexen2/hexen2 libapplication.so diff --git a/project/jni/application/hexen2/AndroidData/hexen2-data.zip b/project/jni/application/hexen2/AndroidData/hexen2-data.zip new file mode 100644 index 000000000..15cb0ecb3 Binary files /dev/null and b/project/jni/application/hexen2/AndroidData/hexen2-data.zip differ diff --git a/project/jni/application/hexen2/hexen2-pelyasdl.diff b/project/jni/application/hexen2/hexen2-pelyasdl.diff new file mode 100644 index 000000000..4999445ea --- /dev/null +++ b/project/jni/application/hexen2/hexen2-pelyasdl.diff @@ -0,0 +1,171 @@ +diff -ru orig/hexen2source-1.4.3/hexen2/Makefile hexen2source-1.4.3/hexen2/Makefile +--- orig/hexen2source-1.4.3/hexen2/Makefile 2008-04-03 19:37:23.000000000 -0400 ++++ hexen2source-1.4.3/hexen2/Makefile 2010-12-03 14:35:44.000000000 -0500 +@@ -107,26 +107,27 @@ + # + # if building a debug version : make DEBUG=1 [other stuff] + # +- ++MYFLAGS=$(CFLAGS) -DPLATFORM_UNIX ++MYLDFLAGS=$(LDFLAGS) + # Path settings: + # main uhexen2 relative path + UHEXEN2_TOP:=.. + + # General options (see explanations at the top) + USE_SOUND=yes +-USE_ALSA=yes +-USE_OSS=yes +-USE_SUNAUDIO=yes ++USE_ALSA=no ++USE_OSS=no ++USE_SUNAUDIO=no + USE_SDLAUDIO=yes +-USE_MIDI=yes +-USE_CDAUDIO=yes ++USE_MIDI=no ++USE_CDAUDIO=no + USE_SDLCD=no + WITH_SPLASHES=yes + LINK_DIRECTX=no +-OPT_EXTRA=yes ++OPT_EXTRA=no + LINK_GL_LIBS=no +-USE_3DFXGAMMA=yes +-USE_X86_ASM=yes ++USE_3DFXGAMMA=no ++USE_X86_ASM=no + COMPILE_32BITS=no + + # include the common dirty stuff +@@ -179,7 +180,7 @@ + + else + +-CFLAGS := $(CPUFLAGS) -O2 -Wall -ffast-math -fexpensive-optimizations ++CFLAGS := $(CPUFLAGS) -O2 -Wall -ffast-math -fexpensive-optimizations $(MYFLAGS) + + ifdef NO_UNIT_AT_A_TIME + CFLAGS := $(CFLAGS) $(call check_gcc,-fno-unit-at-a-time,) +@@ -227,8 +228,8 @@ + endif + ifeq ($(TARGET_OS),unix) + # Main unix specific includes and flags +-INCLUDES:= -I$(X11BASE)/include -I. +-LDFLAGS := $(LIBSOCKET) ++INCLUDES:= -I. ++LDFLAGS := $(LIBSOCKET) $(MYLDFLAGS) + endif + + ifeq ($(COMPILE_32BITS),yes) +Only in hexen2source-1.4.3/hexen2: Makefile~ +Only in hexen2source-1.4.3/hexen2: cd_null.o +Only in hexen2source-1.4.3/hexen2: cfgfile.o +Only in hexen2source-1.4.3/hexen2: chase.o +Only in hexen2source-1.4.3/hexen2: cl_cmd.o +Only in hexen2source-1.4.3/hexen2: cl_demo.o +Only in hexen2source-1.4.3/hexen2: cl_effect.o +Only in hexen2source-1.4.3/hexen2: cl_input.o +Only in hexen2source-1.4.3/hexen2: cl_main.o +Only in hexen2source-1.4.3/hexen2: cl_parse.o +Only in hexen2source-1.4.3/hexen2: cl_tent.o +Only in hexen2source-1.4.3/hexen2: cmd.o +diff -ru orig/hexen2source-1.4.3/hexen2/common.h hexen2source-1.4.3/hexen2/common.h +--- orig/hexen2source-1.4.3/hexen2/common.h 2008-01-29 05:47:01.000000000 -0500 ++++ hexen2source-1.4.3/hexen2/common.h 2010-12-03 14:26:50.000000000 -0500 +@@ -28,6 +28,14 @@ + #define F_OK 0 /* Test for existence. */ + #endif + ++#if defined(ANDROID) && !defined(F_OK) ++// values for the mode argument of access(). MS does not define them ++#define R_OK 4 /* Test for read permission. */ ++#define W_OK 2 /* Test for write permission. */ ++#define X_OK 1 /* Test for execute permission. */ ++#define F_OK 0 /* Test for existence. */ ++#endif ++ + #if defined(PLATFORM_WINDOWS) + #define q_strncasecmp _strnicmp + #define q_strcasecmp _stricmp +Only in hexen2source-1.4.3/hexen2: common.h~ +Only in hexen2source-1.4.3/hexen2: common.o +Only in hexen2source-1.4.3/hexen2: console.o +Only in hexen2source-1.4.3/hexen2: crc.o +Only in hexen2source-1.4.3/hexen2: cvar.o +Only in hexen2source-1.4.3/hexen2: d_edge.o +Only in hexen2source-1.4.3/hexen2: d_fill.o +Only in hexen2source-1.4.3/hexen2: d_init.o +Only in hexen2source-1.4.3/hexen2: d_modech.o +Only in hexen2source-1.4.3/hexen2: d_part.o +Only in hexen2source-1.4.3/hexen2: d_polyse.o +Only in hexen2source-1.4.3/hexen2: d_scan.o +Only in hexen2source-1.4.3/hexen2: d_sky.o +Only in hexen2source-1.4.3/hexen2: d_sprite.o +Only in hexen2source-1.4.3/hexen2: d_surf.o +Only in hexen2source-1.4.3/hexen2: d_vars.o +Only in hexen2source-1.4.3/hexen2: d_zpoint.o +Only in hexen2source-1.4.3/hexen2: debuglog.o +Only in hexen2source-1.4.3/hexen2: draw.o +Only in hexen2source-1.4.3/hexen2: host.o +Only in hexen2source-1.4.3/hexen2: host_cmd.o +Only in hexen2source-1.4.3/hexen2: in_sdl.o +Only in hexen2source-1.4.3/hexen2: keys.o +Only in hexen2source-1.4.3/hexen2: link_ops.o +Only in hexen2source-1.4.3/hexen2: mathlib.o +Only in hexen2source-1.4.3/hexen2: menu.o +Only in hexen2source-1.4.3/hexen2: midi_nul.o +Only in hexen2source-1.4.3/hexen2: model.o +Only in hexen2source-1.4.3/hexen2: msg_io.o +Only in hexen2source-1.4.3/hexen2: net_bsd.o +Only in hexen2source-1.4.3/hexen2: net_dgrm.o +Only in hexen2source-1.4.3/hexen2: net_loop.o +Only in hexen2source-1.4.3/hexen2: net_main.o +Only in hexen2source-1.4.3/hexen2: net_udp.c~ +Only in hexen2source-1.4.3/hexen2: net_udp.h~ +Only in hexen2source-1.4.3/hexen2: net_udp.o +Only in hexen2source-1.4.3/hexen2: pr_cmds.o +Only in hexen2source-1.4.3/hexen2: pr_edict.o +Only in hexen2source-1.4.3/hexen2: pr_exec.o +Only in hexen2source-1.4.3/hexen2: pr_strng.o +Only in hexen2source-1.4.3/hexen2: q_endian.o +Only in hexen2source-1.4.3/hexen2: quakefs.o +Only in hexen2source-1.4.3/hexen2: r_aclip.o +Only in hexen2source-1.4.3/hexen2: r_alias.o +Only in hexen2source-1.4.3/hexen2: r_bsp.o +Only in hexen2source-1.4.3/hexen2: r_draw.o +Only in hexen2source-1.4.3/hexen2: r_edge.o +Only in hexen2source-1.4.3/hexen2: r_efrag.o +Only in hexen2source-1.4.3/hexen2: r_light.o +Only in hexen2source-1.4.3/hexen2: r_main.o +Only in hexen2source-1.4.3/hexen2: r_misc.o +Only in hexen2source-1.4.3/hexen2: r_part.o +Only in hexen2source-1.4.3/hexen2: r_sky.o +Only in hexen2source-1.4.3/hexen2: r_sprite.o +Only in hexen2source-1.4.3/hexen2: r_surf.o +Only in hexen2source-1.4.3/hexen2: r_vars.o +Only in hexen2source-1.4.3/hexen2: sbar.o +Only in hexen2source-1.4.3/hexen2: screen.o +Only in hexen2source-1.4.3/hexen2: sizebuf.o +Only in hexen2source-1.4.3/hexen2: snd_alsa.o +Only in hexen2source-1.4.3/hexen2: snd_dma.o +Only in hexen2source-1.4.3/hexen2: snd_mem.o +Only in hexen2source-1.4.3/hexen2: snd_mix.o +Only in hexen2source-1.4.3/hexen2: snd_oss.o +Only in hexen2source-1.4.3/hexen2: snd_sdl2.o +Only in hexen2source-1.4.3/hexen2: snd_sun.o +Only in hexen2source-1.4.3/hexen2: snd_sys.o +Only in hexen2source-1.4.3/hexen2: strlcat.o +Only in hexen2source-1.4.3/hexen2: strlcpy.o +Only in hexen2source-1.4.3/hexen2: sv_effect.o +Only in hexen2source-1.4.3/hexen2: sv_main.o +Only in hexen2source-1.4.3/hexen2: sv_move.o +Only in hexen2source-1.4.3/hexen2: sv_phys.o +Only in hexen2source-1.4.3/hexen2: sv_user.o +Only in hexen2source-1.4.3/hexen2: sys_unix.o +Only in hexen2source-1.4.3/hexen2: vid_sdl.c~ +Only in hexen2source-1.4.3/hexen2: vid_sdl.o +Only in hexen2source-1.4.3/hexen2: view.o +Only in hexen2source-1.4.3/hexen2: wad.o +Only in hexen2source-1.4.3/hexen2: world.o +Only in hexen2source-1.4.3/hexen2: zone.o diff --git a/project/jni/application/hexen2/icon.png b/project/jni/application/hexen2/icon.png new file mode 100644 index 000000000..a829c38b9 Binary files /dev/null and b/project/jni/application/hexen2/icon.png differ diff --git a/project/jni/application/hheretic/AndroidAppSettings.cfg b/project/jni/application/hheretic/AndroidAppSettings.cfg new file mode 100644 index 000000000..3872d2480 --- /dev/null +++ b/project/jni/application/hheretic/AndroidAppSettings.cfg @@ -0,0 +1,33 @@ +# The application settings for Android libSDL port +AppSettingVersion=15 +LibSdlVersion=1.2 +AppName="hHeretic" +AppFullName=net.hheretic.sdl +ScreenOrientation=h +InhibitSuspend=n +AppDataDownloadUrl="Data files size is 19 Mb|https://sites.google.com/site/andgamdev/heretic-data.zip?attredirects=0&d=1" +SdlVideoResize=y +SdlVideoResizeKeepAspect=n +NeedDepthBuffer=n +AppUsesMouse=y +AppNeedsTwoButtonMouse=n +AppNeedsArrowKeys=y +AppNeedsTextInput=y +AppUsesJoystick=n +AppHandlesJoystickSensitivity=n +AppUsesMultitouch=n +NonBlockingSwapBuffers=n +RedefinedKeys="SPACE RETURN TAB LCTRL SPACE" +AppTouchscreenKeyboardKeysAmount=3 +AppTouchscreenKeyboardKeysAmountAutoFire=0 +MultiABI=n +AppVersionCode=02201 +AppVersionName="0.2.2.01" +CompiledLibraries="jpeg png sdl_mixer" +CustomBuildScript=y +AppCflags='' +AppLdflags='' +AppSubdirsBuild='' +AppUseCrystaXToolchain=n +AppCmdline=' -waddir .' +ReadmeText='^You may press "Home" now - the data will be downloaded in background' diff --git a/project/jni/application/hheretic/AndroidBuild.sh b/project/jni/application/hheretic/AndroidBuild.sh new file mode 100755 index 000000000..d353e8e3a --- /dev/null +++ b/project/jni/application/hheretic/AndroidBuild.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +LOCAL_PATH=`dirname $0` +LOCAL_PATH=`cd $LOCAL_PATH && pwd` + +ln -sf libsdl_mixer.so $LOCAL_PATH/../../../obj/local/armeabi/libSDL_mixer.so + +cd hheretic-0.2.2-src +if [ \! -f Makefile ] ; then + ../../launchConfigure.sh --disable-gl +fi +rm -f ../libapplication.so +make +mv -f hheretic-sdl ../libapplication.so diff --git a/project/jni/application/hheretic/icon.png b/project/jni/application/hheretic/icon.png new file mode 100644 index 000000000..fb3d62cd5 Binary files /dev/null and b/project/jni/application/hheretic/icon.png differ diff --git a/project/jni/application/hhexen/AndroidAppSettings.cfg b/project/jni/application/hhexen/AndroidAppSettings.cfg new file mode 100644 index 000000000..38ab579a4 --- /dev/null +++ b/project/jni/application/hhexen/AndroidAppSettings.cfg @@ -0,0 +1,33 @@ +# The application settings for Android libSDL port +AppSettingVersion=15 +LibSdlVersion=1.2 +AppName="hHexen" +AppFullName=net.hhexen.sdl +ScreenOrientation=h +InhibitSuspend=n +AppDataDownloadUrl="Data files size is 19 Mb|https://sites.google.com/site/andgamdev/hexen-data.zip?attredirects=0&d=1" +SdlVideoResize=y +SdlVideoResizeKeepAspect=n +NeedDepthBuffer=n +AppUsesMouse=y +AppNeedsTwoButtonMouse=n +AppNeedsArrowKeys=y +AppNeedsTextInput=y +AppUsesJoystick=n +AppHandlesJoystickSensitivity=n +AppUsesMultitouch=n +NonBlockingSwapBuffers=n +RedefinedKeys="SPACE RETURN TAB LCTRL SPACE" +AppTouchscreenKeyboardKeysAmount=3 +AppTouchscreenKeyboardKeysAmountAutoFire=0 +MultiABI=n +AppVersionCode=16201 +AppVersionName="1.6.2.01" +CompiledLibraries="jpeg png sdl_mixer" +CustomBuildScript=y +AppCflags='' +AppLdflags='' +AppSubdirsBuild='' +AppUseCrystaXToolchain=n +AppCmdline=' -waddir .' +ReadmeText='^You may press "Home" now - the data will be downloaded in background' diff --git a/project/jni/application/hhexen/AndroidBuild.sh b/project/jni/application/hhexen/AndroidBuild.sh new file mode 100755 index 000000000..83253fa2f --- /dev/null +++ b/project/jni/application/hhexen/AndroidBuild.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +LOCAL_PATH=`dirname $0` +LOCAL_PATH=`cd $LOCAL_PATH && pwd` + +ln -sf libsdl_mixer.so $LOCAL_PATH/../../../obj/local/armeabi/libSDL_mixer.so + +cd hhexen-1.6.2-src +if [ \! -f Makefile ] ; then + ../../launchConfigure.sh --disable-gl +fi +rm -f ../libapplication.so +make +mv -f hhexen-sdl ../libapplication.so diff --git a/project/jni/application/hhexen/icon.png b/project/jni/application/hhexen/icon.png new file mode 100644 index 000000000..36df86be4 Binary files /dev/null and b/project/jni/application/hhexen/icon.png differ diff --git a/project/jni/application/milkytracker/AndroidAppSettings.cfg b/project/jni/application/milkytracker/AndroidAppSettings.cfg new file mode 100644 index 000000000..8beebe34d --- /dev/null +++ b/project/jni/application/milkytracker/AndroidAppSettings.cfg @@ -0,0 +1,33 @@ +# The application settings for Android libSDL port +AppSettingVersion=15 +LibSdlVersion=1.2 +AppName="Milkytracker" +AppFullName=org.milkytracker.sdl +ScreenOrientation=h +InhibitSuspend=y +AppDataDownloadUrl="Data size is 1 Mb|milkytracker-data.zip" +SdlVideoResize=y +SdlVideoResizeKeepAspect=n +NeedDepthBuffer=n +AppUsesMouse=y +AppNeedsTwoButtonMouse=y +AppNeedsArrowKeys=n +AppNeedsTextInput=y +AppUsesJoystick=n +AppHandlesJoystickSensitivity=y +AppUsesMultitouch=n +NonBlockingSwapBuffers=n +RedefinedKeys="SPACE RETURN PLUS MINUS TAB ESCAPE DELETE" +AppTouchscreenKeyboardKeysAmount=0 +AppTouchscreenKeyboardKeysAmountAutoFire=0 +MultiABI=n +AppVersionCode=0908501 +AppVersionName="0.90.85.01" +CompiledLibraries="jpeg png zzip" +CustomBuildScript=y +AppCflags='' +AppLdflags='' +AppSubdirsBuild='' +AppUseCrystaXToolchain=n +AppCmdline='' +ReadmeText='^You may press "Home" now - the data will be downloaded in background' diff --git a/project/jni/application/milkytracker/AndroidBuild.sh b/project/jni/application/milkytracker/AndroidBuild.sh new file mode 100755 index 000000000..fdecf2ed3 --- /dev/null +++ b/project/jni/application/milkytracker/AndroidBuild.sh @@ -0,0 +1,17 @@ +#!/bin/sh + + +LOCAL_PATH=`dirname $0` +LOCAL_PATH=`cd $LOCAL_PATH && pwd` + +ln -sf libsdl-1.2.so $LOCAL_PATH/../../../obj/local/armeabi/libSDL.so + +if [ \! -f milkytracker-0.90.85/configure ] ; then + sh -c "cd milkytracker-0.90.85 && ./autogen.sh" +fi + +if [ \! -f milkytracker-0.90.85/Makefile ] ; then + ../setEnvironment.sh sh -c "cd milkytracker-0.90.85 && ZZIP_CFLAGS='-I$LOCAL_PATH/../../zzip/include' ZZIP_LIBS='-L$LOCAL_PATH/../../../obj/local/armeabi -lzzip' ./configure --host=arm-eabi " +fi + +make -C milkytracker-0.90.85 && mv -f milkytracker-0.90.85/src/tracker/milkytracker libapplication.so diff --git a/project/jni/application/milkytracker/AndroidData/milkytracker-data.zip b/project/jni/application/milkytracker/AndroidData/milkytracker-data.zip new file mode 100644 index 000000000..15cb0ecb3 Binary files /dev/null and b/project/jni/application/milkytracker/AndroidData/milkytracker-data.zip differ diff --git a/project/jni/application/milkytracker/icon.png b/project/jni/application/milkytracker/icon.png new file mode 100644 index 000000000..a829c38b9 Binary files /dev/null and b/project/jni/application/milkytracker/icon.png differ diff --git a/project/jni/application/milkytracker/milkytrackey-0.90.85-android.diff b/project/jni/application/milkytracker/milkytrackey-0.90.85-android.diff new file mode 100644 index 000000000..a0e7d8b7c --- /dev/null +++ b/project/jni/application/milkytracker/milkytrackey-0.90.85-android.diff @@ -0,0 +1,109 @@ +diff -ru orig/milkytracker-0.90.85/configure milkytracker-0.90.85/configure +--- orig/milkytracker-0.90.85/configure 2010-01-01 19:03:37.000000000 -0500 ++++ milkytracker-0.90.85/configure 2010-11-29 11:37:25.000000000 -0500 +@@ -5431,95 +5431,9 @@ + fi + + pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZZIP" >&5 +-$as_echo_n "checking for ZZIP... " >&6; } +- +-if test -n "$PKG_CONFIG"; then +- if test -n "$ZZIP_CFLAGS"; then +- pkg_cv_ZZIP_CFLAGS="$ZZIP_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zziplib >= 0.10.75\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "zziplib >= 0.10.75") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_ZZIP_CFLAGS=`$PKG_CONFIG --cflags "zziplib >= 0.10.75" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- fi +-else +- pkg_failed=untried +-fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$ZZIP_LIBS"; then +- pkg_cv_ZZIP_LIBS="$ZZIP_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zziplib >= 0.10.75\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "zziplib >= 0.10.75") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_ZZIP_LIBS=`$PKG_CONFIG --libs "zziplib >= 0.10.75" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- fi +-else +- pkg_failed=untried +-fi +- +- +- +-if test $pkg_failed = yes; then +- +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi +- if test $_pkg_short_errors_supported = yes; then +- ZZIP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "zziplib >= 0.10.75"` +- else +- ZZIP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "zziplib >= 0.10.75"` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$ZZIP_PKG_ERRORS" >&5 +- +- as_fn_error "Package requirements (zziplib >= 0.10.75) were not met: + + $ZZIP_PKG_ERRORS + +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. +- +-Alternatively, you may set the environment variables ZZIP_CFLAGS +-and ZZIP_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" "$LINENO" 5 +-elif test $pkg_failed = untried; then +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. +- +-Alternatively, you may set the environment variables ZZIP_CFLAGS +-and ZZIP_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +- +-To get pkg-config, see . +-See \`config.log' for more details." "$LINENO" 5; } +-else +- ZZIP_CFLAGS=$pkg_cv_ZZIP_CFLAGS +- ZZIP_LIBS=$pkg_cv_ZZIP_LIBS +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- : +-fi +- + SDL_VERSION=1.2.0 + + # Check whether --with-sdl-prefix was given. +@@ -5774,7 +5688,7 @@ + + rm -f conf.sdltest + +-CPPFLAGS="$CPPFLAGS -D__FORCE_SDL_AUDIO__" ++CPPFLAGS="$CPPFLAGS -D__FORCE_SDL_AUDIO__ -D__LOWRES__" + + # Check that SDL supports the X11 wm + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether SDL supports X11" >&5 +Only in milkytracker-0.90.85: configure~