Wizznic: fix recipe.

This commit is contained in:
Adrien Destugues
2014-07-17 16:41:23 +02:00
parent 2db725ed3e
commit 822c03f2ae
5 changed files with 114 additions and 3829 deletions

View File

@@ -1,12 +0,0 @@
diff -ur wizznic-0.9.9-src/Makefile wizznic-0.9.9-src-haiku/Makefile
--- wizznic-0.9.9-src/Makefile 2011-12-29 22:12:52.035651584 +0000
+++ wizznic-0.9.9-src-haiku/Makefile 2012-12-06 22:26:56.127926272 +0000
@@ -19,7 +19,7 @@
INCS = -I. -I/usr/include -I/usr/include/SDL
LDFLAGS=$(CFLAGS)
-LIBS = -lSDL -lSDL_image -lSDL_mixer -lpng -lm -lz -lpthread
+LIBS = -lSDL -lSDL_image -lSDL_mixer -lpng -lz
#Are we compiling with gl?
ifneq ($(WITH_OPENGL),false)

View File

@@ -0,0 +1,59 @@
From e79ecd9ea29e236288e30bf1a61fbc3404fb1edf Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Thu, 17 Jul 2014 15:46:58 +0200
Subject: Remove -lm -lpthread.
diff --git a/Makefile b/Makefile
index 3b87807..e9270a2 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ DEFS = $(PUF) -DDATADIR="\"$(DATADIR)\""
INCS = -I. -I/usr/include -I/usr/include/SDL
LDFLAGS=$(CFLAGS)
-LIBS = -lSDL -lSDL_image -lSDL_mixer -lpng -lm -lz -lpthread
+LIBS = -lSDL -lSDL_image -lSDL_mixer -lpng -lz
#Are we compiling with gl?
ifneq ($(WITH_OPENGL),false)
--
1.8.3.4
From 29e6ef655836fba865d2d9743400db28f8245655 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Thu, 17 Jul 2014 15:53:14 +0200
Subject: Fix home dir search path.
diff --git a/userfiles.c b/userfiles.c
index fae8eae..0e5538b 100644
--- a/userfiles.c
+++ b/userfiles.c
@@ -23,6 +23,10 @@
#include <string.h>
#include <stdlib.h>
+#ifdef __HAIKU__
+#include <FindDirectory.h>
+#endif
+
static char* strConfDir;
static char* strEditLvlDir;
static char* strHsDir;
@@ -32,6 +36,11 @@ void initUserPaths()
#ifdef PER_USER_FILES
//Generate directory string
+#ifdef __HAIKU__
+ strConfDir = malloc(PATH_MAX);
+ if (find_path(initUserPaths, B_FIND_PATH_SETTINGS_DIRECTORY, "wizznic",
+ strConfDir, PATH_MAX) != B_OK)
+#endif
if(getenv("XDG_CONFIG_HOME") != NULL)
{
strConfDir = malloc( sizeof(char)*(strlen(getenv("XDG_CONFIG_HOME"))+strlen("/wizznic"))+1 );
--
1.8.3.4

File diff suppressed because it is too large Load Diff

View File

@@ -1,31 +1,66 @@
DESCRIPTION="Wizznic!"
MESSAGE="Only compiles with gcc4, and only runs from terminal!"
SUMMARY="brick-matching puzzle-game, an improved version of Puzznic."
DESCRIPTION="
Wizznic! is a brick-matching puzzle-game, an improved version of Puzznic.
The challenge is to clear each level of bricks by moving the bricks next to \
each other, this sounds a lot easier than it is. The bricks are heavy, so you \
can only push them, not lift them up
"
HOMEPAGE="http://wizznic.sourceforge.net/"
SRC_URI="http://sourceforge.net/projects/wizznic/files/Source%20Releases/wizznic-0.9.9-src.tar.bz2/download"
CHECKSUM_MD5="1b017cd84903f40f2a3ae7aef9951e8d"
ARCHITECTURES=""
if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
# x86_gcc2 is fine as primary target architecture as long as we're building
# for a different secondary architecture.
ARCHITECTURES="$ARCHITECTURES x86_gcc2"
fi
SECONDARY_ARCHITECTURES="x86"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="media-lib/libsdl >= 1.2.14
media-lib/sdl-mixer >= 1.2.11
media-lib/sdl-image >= 1.2.10"
SRC_URI="http://sourceforge.net/projects/wizznic/files/Source%20Releases/wizznic-0.9.9-src.tar.bz2"
CHECKSUM_SHA256="2cf9462177474d7f5bfe95bbc21303ec7031ca86412b587b5e7d3ed531d5b16b"
SOURCE_DIR="wizznic-$portVersion-src"
PATCHES="wizznic-$portVersion.patchset"
PROVIDES="
wizznic$secondaryArchSuffix = $portVersion
cmd:wizznic$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
lib:libsdl$secondaryArchSuffix
lib:libsdl_mixer$secondaryArchSuffix
lib:libsdl_image$secondaryArchSuffix
lib:libpng$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
BUILD_REQUIRES="
devel:sdl_image$secondaryArchSuffix
devel:sdl_mixer$secondaryArchSuffix
devel:libpng$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
cmd:gcc$secondaryArchSuffix
cmd:make
cmd:sdl_config$secondaryArchSuffix
"
BUILD()
{
cd wizznic-0.9.9-src
make
DATADIR=$dataDir/ BINDIR=$binDir/ WITH_OPENGL=false \
CFLAGS=`sdl-config --cflags` make
}
INSTALL()
{
cd wizznic-0.9.9-src
GAMEDIR=`finddir B_APPS_DIRECTORY`/"Wizznic"
mkdir -p ${DESTDIR}/${GAMEDIR}
cp -af wizznic ${DESTDIR}/${GAMEDIR}
cp -af data ${DESTDIR}/${GAMEDIR}
cp -af editorlevels ${DESTDIR}/${GAMEDIR}
cp -af highscores ${DESTDIR}/${GAMEDIR}
cp -af packs ${DESTDIR}/${GAMEDIR}
DATADIR=$dataDir/ BINDIR=$binDir/ make install
addAppDeskbarSymlink $binDir/wizznic "WizzNic!"
}
LICENSE="GNU GPL v3"

View File

@@ -1,23 +0,0 @@
DESCRIPTION="Wizznic!"
HOMEPAGE="http://wizznic.sourceforge.net/"
SRC_URI="http://sourceforge.net/projects/wizznic/files/Source%20Releases/wizznic-0.9_feedback_version-src.tar.bz2/download"
CHECKSUM_MD5="75912476b87de95c990aaf21bb2fa247"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="media-lib/libsdl >= 1.2.14
media-lib/sdl-mixer >= 1.2.11
media-lib/sdl-image >= 1.2.10"
BUILD()
{
cd wizznic-0.9_feedback_version-src
make -f Makefile.haiku
}
INSTALL()
{
cd wizznic-0.9_feedback_version-src
make Makefile.haiku install
}
LICENSE="GNU GPL v3"
COPYRIGHT="2010 Jimmy Christensen"