Dosbox: enable dynamic-cores (#1442)

* Dosbox: enable dynamic-cores

* Missing patchset
This commit is contained in:
miqlas
2017-06-18 11:04:40 +02:00
committed by diversys
parent a2014f0021
commit ffea174175
3 changed files with 55 additions and 23 deletions

View File

@@ -9,13 +9,13 @@ older games...
You can re-live the good old days with the help of DOSBox, it can run plenty \ You can re-live the good old days with the help of DOSBox, it can run plenty \
of the old classics that don't run on your new computer! of the old classics that don't run on your new computer!
DOSBox is totally free of charge and OpenSource." DOSBox is totally free of charge and OpenSource."
HOMEPAGE="http://www.dosbox.com" HOMEPAGE="http://www.dosbox.com/"
COPYRIGHT="2002-2013 The DosBox Team" COPYRIGHT="2002-2013 The DosBox Team"
LICENSE="GNU GPL v2" LICENSE="GNU GPL v2"
REVISION="4" REVISION="5"
SOURCE_URI="http://sourceforge.net/projects/dosbox/files/dosbox/$portVersion/dosbox-$portVersion.tar.gz" SOURCE_URI="http://sourceforge.net/projects/dosbox/files/dosbox/$portVersion/dosbox-$portVersion.tar.gz"
CHECKSUM_SHA256="13f74916e2d4002bad1978e55727f302ff6df3d9be2f9b0e271501bd0a938e05" CHECKSUM_SHA256="13f74916e2d4002bad1978e55727f302ff6df3d9be2f9b0e271501bd0a938e05"
PATCHES="powf.patch" PATCHES="dosbox-$portVersion.patchset"
ADDITIONAL_FILES="dosbox.rdef" ADDITIONAL_FILES="dosbox.rdef"
ARCHITECTURES="!x86_gcc2 x86 x86_64" ARCHITECTURES="!x86_gcc2 x86 x86_64"
@@ -57,7 +57,16 @@ BUILD_PREREQUIRES="
BUILD() BUILD()
{ {
LDFLAGS=-lnetwork runConfigure ./configure --disable-dynamic-core # Dynamic core x86 and fpu-x86 available on on x86 cpu
LDFLAGS=-lnetwork runConfigure ./configure \
--enable-core-inline \
--enable-dynamic-core \
--enable-dynamic-x86 \
--enable-dynrec \
--enable-fpu \
--enable-fpu-x86 \
--enable-unaligned_memory \
--enable-opengl
make $jobArgs make $jobArgs
} }
@@ -65,6 +74,8 @@ INSTALL()
{ {
make install make install
strip $binDir/dosbox
addResourcesToBinaries $portDir/additional-files/dosbox.rdef $binDir/dosbox addResourcesToBinaries $portDir/additional-files/dosbox.rdef $binDir/dosbox
addAppDeskbarSymlink $binDir/dosbox "DOSBox" addAppDeskbarSymlink $binDir/dosbox "DOSBox"
} }

View File

@@ -0,0 +1,40 @@
From cb39e660b74da8cc799da8512b24dff0146bd1eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sun, 18 Jun 2017 10:23:41 +0200
Subject: [PATCH] Config file location
---
src/gui/sdlmain.cpp | 16 +++++++++-------
src/misc/cross.cpp | 3 +++
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/gui/sdlmain.cpp b/src/gui/sdlmain.cpp
index 6bbc24c..59fd732 100644
--- a/src/gui/sdlmain.cpp
+++ b/src/gui/sdlmain.cpp
@@ -117,6 +117,8 @@ struct private_hwdata {
#define DEFAULT_CONFIG_FILE "/dosbox.conf"
#elif defined(MACOSX)
#define DEFAULT_CONFIG_FILE "/Library/Preferences/DOSBox Preferences"
+#elif defined(__HAIKU__)
+#define DEFAULT_CONFIG_FILE "~/config/settings/dosbox/dosboxrc"
#else /*linux freebsd*/
#define DEFAULT_CONFIG_FILE "/.dosboxrc"
#endif
diff --git a/src/misc/cross.cpp b/src/misc/cross.cpp
index bc4557e..d5f0e65 100644
--- a/src/misc/cross.cpp
+++ b/src/misc/cross.cpp
@@ -62,6 +62,9 @@ void Cross::GetPlatformConfigDir(std::string& in) {
#elif defined(MACOSX)
in = "~/Library/Preferences";
ResolveHomedir(in);
+#elif defined(__HAIKU__)
+ in = "~/config/settings/dosbox/";
+ ResolveHomedir(in);
#else
in = "~/.dosbox";
ResolveHomedir(in);
--
2.12.2

View File

@@ -1,19 +0,0 @@
diff --git a/configure.in b/configure.in
index 016ea95..f222548 100644
--- a/configure.in
+++ b/configure.in
@@ -121,13 +121,7 @@ d_test.d_type = 0;
dnl Check for powf
-AC_MSG_CHECKING(for powf in libm);
-LIBS_BACKUP=$LIBS;
-LIBS="$LIBS -lm";
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <math.h>]],[[
- powf(1.0f, 1.0f);
-]])], [AC_MSG_RESULT(yes)], [AC_DEFINE([DB_HAVE_NO_POWF],[1],[libm doesn't include powf])])
-LIBS=$LIBS_BACKUP
+AC_SEARCH_LIBS([powf],[m], [AC_MSG_RESULT(yes)], [AC_DEFINE([DB_HAVE_NO_POWF],[1],[no powf function avalible])])
dnl Checks for libraries.