haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

simutrans/makeobj-nightly patchsets removed, changes got upstreamed

Browse Source
This commit is contained in:
taos
2015-07-03 02:11:04 +02:00
parent 64bec26b5e
commit 1fe41da0a3
4 changed files with 2 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
games-simulation/simutrans/patches/simutrans-nightly.patchset
View File

@@ -1,76 +0,0 @@
From 03547db5cb4f0ee90d5fa739eabbc182c4445772 Mon Sep 17 00:00:00 2001
From: none <user@shredder>
Date: Fri, 29 May 2015 08:17:51 +0200
Subject: adjust Makefile for Haiku x86_64 and prepare configure.ac for
enabling multithread in Haiku
diff --git a/Makefile b/Makefile
index aa0d57b..1df85ca 100644
--- a/Makefile
+++ b/Makefile
@@ -53,8 +53,7 @@ else
else
# Haiku (needs to activate the GCC 4x)
ifeq ($(OSTYPE),haiku)
- setarch x86
- LIBS += -lnetwork -lbe -llocale
+ LIBS += -lnetwork -lbe
endif
endif
endif
@@ -114,7 +113,9 @@ ifneq ($(MULTI_THREAD),)
#use lpthreadGC2d for debug alternatively
LDFLAGS += -lpthreadGC2
else
- LDFLAGS += -lpthread
+ ifneq ($(OSTYPE),haiku)
+ LDFLAGS += -lpthread
+ endif
endif
endif
endif
diff --git a/configure.ac b/configure.ac
index 85d5afd..d1e9b83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ AC_CHECK_LIB(bz2, BZ2_bzReadOpen, [], [AC_MSG_WARN([Error, libbz2 is missing!])]
AC_CHECK_LIB(freetype2, load_FT_font, [AC_SUBST(freetype2, '-DUSE_FREETYPE')], [AC_SUBST(freetype2, '')] )
# optional (but highly recommended) multithreading
-AC_CHECK_LIB(pthread, pthread_mutex_destroy, [AC_SUBST(multithread, 1)], [AC_SUBST(multithread, 0)] )
+AC_SEARCH_LIBS(pthread_mutex_destroy, pthread, [AC_SUBST(multithread, 1)], [AC_SUBST(multithread, 0)] )
# find OS and backend by libs ...
AC_CHECK_LIB(SDL2, SDL_GetRenderDriverInfo)
diff --git a/simsys.cc b/simsys.cc
index e4dc228..2ef7bac 100644
--- a/simsys.cc
+++ b/simsys.cc
@@ -7,7 +7,9 @@
#ifdef __HAIKU__
#include <Message.h>
#include <LocaleRoster.h>
+#include <SupportDefs.h>
#define NO_UINT32_TYPES
+#define NO_UINT64_TYPES
#endif
#include "macros.h"
diff --git a/simtypes.h b/simtypes.h
index cedbbec..912e95d 100644
--- a/simtypes.h
+++ b/simtypes.h
@@ -131,7 +131,9 @@ typedef unsigned long uint32;
#endif
#endif
typedef signed long long sint64;
+#ifndef NO_UINT64_TYPES
typedef unsigned long long uint64;
+#endif
#ifdef _MSC_VER
# define GCC_PACKED
# define GCC_ALIGN(a)
--
1.8.3.4

3
games-simulation/simutrans/simutrans-nightly.recipe
View File

@@ -16,7 +16,7 @@ SOURCE_DIR="trunk"
COPYRIGHT="1997-2004 Hj. Malthaner
2005-2015 The Simutrans Team"
LICENSE="Artistic"
REVISION="1"
REVISION="2"
ARCHITECTURES="?x86 x86_64"
if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -24,7 +24,6 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
ARCHITECTURES="$ARCHITECTURES x86_gcc2"
fi
SECONDARY_ARCHITECTURES="x86"
PATCHES="simutrans-$portVersion.patchset"
PROVIDES="
simutrans$secondaryArchSuffix = $portVersion
"

3
games-util/makeobj/makeobj-nightly.recipe
View File

@@ -11,7 +11,7 @@ SOURCE_DIR="trunk"
COPYRIGHT="1997-2004 Hj. Malthaner
2005-2015 The Simutrans Team"
LICENSE="Artistic"
REVISION="1"
REVISION="2"
ARCHITECTURES="?x86 x86_64"
if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -19,7 +19,6 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
ARCHITECTURES="$ARCHITECTURES x86_gcc2"
fi
SECONDARY_ARCHITECTURES="x86"
PATCHES="makeobj-$portVersion.patchset"
PROVIDES="
makeobj$secondaryArchSuffix = $portVersion
cmd:makeobj$secondaryArchSuffix = 55.4

76
games-util/makeobj/patches/makeobj-nightly.patchset
View File

@@ -1,76 +0,0 @@
From 03547db5cb4f0ee90d5fa739eabbc182c4445772 Mon Sep 17 00:00:00 2001
From: none <user@shredder>
Date: Fri, 29 May 2015 08:17:51 +0200
Subject: adjust Makefile for Haiku x86_64 and prepare configure.ac for
enabling multithread in Haiku
diff --git a/Makefile b/Makefile
index aa0d57b..1df85ca 100644
--- a/Makefile
+++ b/Makefile
@@ -53,8 +53,7 @@ else
else
# Haiku (needs to activate the GCC 4x)
ifeq ($(OSTYPE),haiku)
- setarch x86
- LIBS += -lnetwork -lbe -llocale
+ LIBS += -lnetwork -lbe
endif
endif
endif
@@ -114,7 +113,9 @@ ifneq ($(MULTI_THREAD),)
#use lpthreadGC2d for debug alternatively
LDFLAGS += -lpthreadGC2
else
- LDFLAGS += -lpthread
+ ifneq ($(OSTYPE),haiku)
+ LDFLAGS += -lpthread
+ endif
endif
endif
endif
diff --git a/configure.ac b/configure.ac
index 85d5afd..d1e9b83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ AC_CHECK_LIB(bz2, BZ2_bzReadOpen, [], [AC_MSG_WARN([Error, libbz2 is missing!])]
AC_CHECK_LIB(freetype2, load_FT_font, [AC_SUBST(freetype2, '-DUSE_FREETYPE')], [AC_SUBST(freetype2, '')] )
# optional (but highly recommended) multithreading
-AC_CHECK_LIB(pthread, pthread_mutex_destroy, [AC_SUBST(multithread, 1)], [AC_SUBST(multithread, 0)] )
+AC_SEARCH_LIBS(pthread_mutex_destroy, pthread, [AC_SUBST(multithread, 1)], [AC_SUBST(multithread, 0)] )
# find OS and backend by libs ...
AC_CHECK_LIB(SDL2, SDL_GetRenderDriverInfo)
diff --git a/simsys.cc b/simsys.cc
index e4dc228..2ef7bac 100644
--- a/simsys.cc
+++ b/simsys.cc
@@ -7,7 +7,9 @@
#ifdef __HAIKU__
#include <Message.h>
#include <LocaleRoster.h>
+#include <SupportDefs.h>
#define NO_UINT32_TYPES
+#define NO_UINT64_TYPES
#endif
#include "macros.h"
diff --git a/simtypes.h b/simtypes.h
index cedbbec..912e95d 100644
--- a/simtypes.h
+++ b/simtypes.h
@@ -131,7 +131,9 @@ typedef unsigned long uint32;
#endif
#endif
typedef signed long long sint64;
+#ifndef NO_UINT64_TYPES
typedef unsigned long long uint64;
+#endif
#ifdef _MSC_VER
# define GCC_PACKED
# define GCC_ALIGN(a)
--
1.8.3.4