mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-08 21:00:05 +02:00
residualvm, drop obsolete (#11053)
This commit is contained in:
Schrijvers Luc
GitHub
@@ -1,47 +0,0 @@
|
||||
resource app_flags B_SINGLE_LAUNCH;
|
||||
|
||||
resource app_version {
|
||||
major = @MAJOR@,
|
||||
middle = @MIDDLE@,
|
||||
minor = @MINOR@,
|
||||
|
||||
variety = B_APPV_FINAL,
|
||||
internal = 0,
|
||||
|
||||
short_info = "ResidualVM",
|
||||
long_info = "@LONG_INFO@"
|
||||
};
|
||||
|
||||
resource app_signature "@APP_SIGNATURE@";
|
||||
|
||||
resource vector_icon array {
|
||||
$"6E636966080500020006023E49D7381134B904473F56ED492C32C167BA4DFFD2"
|
||||
$"7CE0BC7105057C020016023FF52DBA51F43A51F43FF52DC4F6A943DA80457EFF"
|
||||
$"3B020016033F89383CD898BCFC9B3FB5F544D3A5C63D8A66E8BD63F729040069"
|
||||
$"020006033F888E3E6438BE3DF53F50064958DEC50A0662FFFFFF93E4ED06FFAE"
|
||||
$"B40402001402A244FF2307040AF6FF0B2340482C51B783C5EAB822C751305230"
|
||||
$"C49930533358B8F056BC9CCA4F3B5FBD79CC623C5E424DC171C53A3F4C464EC1"
|
||||
$"7BC57E524B4F3CC5DDBEFEC593BD4249330209BB51C86AB8A0C76BBE01C969C0"
|
||||
$"4CC8D03C57C2FCC8B0C547C5A0C4B1C6F5C5D3C461C5A0C1D7C5E0C323C598C1"
|
||||
$"AFC6DFC0A5C608C15DC791C00CC903BF4DC86ABFCCC980BEE4C98FBCC3C9ABBD"
|
||||
$"5AC95CBBAAC71FB953C86ABA45C60AB88949B76EC395B76EC316B76E0213B7EE"
|
||||
$"BEA72F37B7ABBF47B6AFBF33B716BE66B66FBFB3B517C1F1B99CC38122C17EB2"
|
||||
$"A6C3E21FC316B2BAC520B4B1C65FB3FF50B4E3C671B6AFC87728C712B70AC976"
|
||||
$"BB37CC00B788CC26BBADCBFBBDCE5CBCC3CBB9BE81CA5BBF73C560BF73C560BF"
|
||||
$"73C560C04C54C04C54C04C54C0FEC7054252C171C71FC4D4C75EC3FB53C621C7"
|
||||
$"72C811C646C7ACC682C890C5F9C98FC4A1C969C5F9C9AAC3B0C778C230C7ACC3"
|
||||
$"5FC72BC072C8DDBF0DC842C042583C5839C967BD8DC944BCAC5234C92ABC17C5"
|
||||
$"86BA45332FBBFCB881273302105737502ECA23BDBCC910BFA6C910BEE7C910C0"
|
||||
$"13C791C20AC757C123C7EBC36F59C47BC969C3C8CA20C573C7EBC6B9C856C689"
|
||||
$"C77852C4C754C65FC798C37CC7D1C18B54C1FDC7D1C118C79EBECDC82ABECDC8"
|
||||
$"2ABECDC82ABE015CBF66C9E9BD14CB91BBAACC0DBC1FCC032BCC66B67CC890B6"
|
||||
$"EFC9F5B604C71AB47EC679B511C6A6B3D8C646B2734AB2734DB273C323B4CBC1"
|
||||
$"7EB38BC1A3B616442B3BB7A1BE412A39312FB7C62F382F0609BA99023F314635"
|
||||
$"483E4B38464242414C3B4842384631420605BA0245354837483BC3CEBCE3C211"
|
||||
$"BEA0433C40390608BAA24B3153365742C91EBE64C8B8C292534B4D4F49435E38"
|
||||
$"52070A000103123F84760000000000003F8476455E1242D5D401178400040A06"
|
||||
$"0102023F84760000000000003F8476455E1242D5D40A05010602400000000000"
|
||||
$"0000003FD27D0000004182D80A040100023FCB120000000000003FCB1244E7D0"
|
||||
$"BF8E810A0101040240B2553CC691BCEF0B408D214157F8C879850A0301041240"
|
||||
$"B2553CC691BCEF0B408D214157F8C8798501178300040A03010500"
|
||||
};
|
||||
@@ -1,149 +0,0 @@
|
||||
From b74acc13daf1c8591cce1ddb06d0e60b48d48166 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sat, 27 Oct 2018 18:51:08 +1000
|
||||
Subject: Use find_directory
|
||||
|
||||
|
||||
diff --git a/backends/platform/sdl/posix/posix.cpp b/backends/platform/sdl/posix/posix.cpp
|
||||
index abae7b1..5094bb7 100644
|
||||
--- a/backends/platform/sdl/posix/posix.cpp
|
||||
+++ b/backends/platform/sdl/posix/posix.cpp
|
||||
@@ -49,6 +49,10 @@
|
||||
#include <sys/wait.h>
|
||||
#include <unistd.h>
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+#include <FindDirectory.h>
|
||||
+#endif
|
||||
+
|
||||
OSystem_POSIX::OSystem_POSIX(Common::String baseConfigName)
|
||||
:
|
||||
_baseConfigName(baseConfigName) {
|
||||
@@ -93,6 +97,15 @@ Common::String OSystem_POSIX::getDefaultConfigFileName() {
|
||||
Common::String prefix;
|
||||
#ifdef MACOSX
|
||||
prefix = getenv("HOME");
|
||||
+#elif defined(__HAIKU__)
|
||||
+ static char settingsDir[PATH_MAX] = "";
|
||||
+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, settingsDir, sizeof(settingsDir)) == B_OK) {
|
||||
+ prefix = settingsDir;
|
||||
+ prefix += "/ResidualVM";
|
||||
+ } else {
|
||||
+ prefix = "/boot/home/config/settings/ResidualVM";
|
||||
+ }
|
||||
+ mkdir(prefix.c_str(), 0755);
|
||||
#elif !defined(SAMSUNGTV)
|
||||
const char *envVar;
|
||||
// Our old configuration file path for POSIX systems was ~/.residualvmrc.
|
||||
@@ -180,6 +193,14 @@ Common::WriteStream *OSystem_POSIX::createLogFile() {
|
||||
#elif SAMSUNGTV
|
||||
prefix = nullptr;
|
||||
logFile = "/mtd_ram";
|
||||
+#elif defined(__HAIKU__)
|
||||
+ static char cacheDir[PATH_MAX] = "";
|
||||
+ if (find_directory(B_USER_CACHE_DIRECTORY, -1, false, cacheDir, sizeof(cacheDir)) == B_OK) {
|
||||
+ prefix = cacheDir;
|
||||
+ } else {
|
||||
+ prefix = "/boot/home/config/cache";
|
||||
+ }
|
||||
+ logFile = "ResidualVM/logs";
|
||||
#else
|
||||
// On POSIX systems we follow the XDG Base Directory Specification for
|
||||
// where to store files. The version we based our code upon can be found
|
||||
@@ -268,6 +289,11 @@ bool OSystem_POSIX::displayLogFile() {
|
||||
bool OSystem_POSIX::openUrl(const Common::String &url) {
|
||||
// inspired by Qt's "qdesktopservices_x11.cpp"
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+ if (launchBrowser("open", url))
|
||||
+ return true;
|
||||
+#endif
|
||||
+
|
||||
// try "standards"
|
||||
if (launchBrowser("xdg-open", url))
|
||||
return true;
|
||||
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
|
||||
index 415eb36..130f02a 100644
|
||||
--- a/backends/platform/sdl/sdl.cpp
|
||||
+++ b/backends/platform/sdl/sdl.cpp
|
||||
@@ -426,8 +426,11 @@ void OSystem_SDL::launcherInitSize(uint w, uint h) {
|
||||
Graphics::RendererType matchingRendererType = Graphics::getBestMatchingAvailableRendererType(desiredRendererType);
|
||||
|
||||
bool fullscreen = ConfMan.getBool("fullscreen");
|
||||
-
|
||||
+#ifdef __HAIKU__
|
||||
+ setupScreen(w, h, fullscreen, false);
|
||||
+#else
|
||||
setupScreen(w, h, fullscreen, matchingRendererType != Graphics::kRendererTypeTinyGL);
|
||||
+#endif
|
||||
}
|
||||
// End of ResidualVM specific code
|
||||
|
||||
diff --git a/backends/saves/posix/posix-saves.cpp b/backends/saves/posix/posix-saves.cpp
|
||||
index 84be67b..0d8fd58 100644
|
||||
--- a/backends/saves/posix/posix-saves.cpp
|
||||
+++ b/backends/saves/posix/posix-saves.cpp
|
||||
@@ -44,6 +44,10 @@
|
||||
#include <errno.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+#include <FindDirectory.h>
|
||||
+#endif
|
||||
+
|
||||
POSIXSaveFileManager::POSIXSaveFileManager() {
|
||||
// Register default savepath.
|
||||
#if defined(SAMSUNGTV)
|
||||
@@ -59,7 +63,16 @@ POSIXSaveFileManager::POSIXSaveFileManager() {
|
||||
|
||||
ConfMan.registerDefault("savepath", savePath);
|
||||
}
|
||||
-
|
||||
+#elif defined(__HAIKU__)
|
||||
+ static char settingsDir[PATH_MAX] = "";
|
||||
+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, settingsDir, sizeof(settingsDir)) == B_OK) {
|
||||
+ savePath = settingsDir;
|
||||
+ savePath += "/ResidualVM/Savegames";
|
||||
+ } else {
|
||||
+ savePath = "/boot/home/config/settings/ResidualVM/Savegames";
|
||||
+ }
|
||||
+ mkdir(savePath.c_str(), 0755);
|
||||
+ ConfMan.registerDefault("savepath", savePath);
|
||||
#else
|
||||
const char *envVar;
|
||||
|
||||
--
|
||||
2.19.1
|
||||
|
||||
|
||||
From d8b6419feb7fb54603d72981bced53c8ddceede5 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sat, 27 Oct 2018 20:55:34 +1000
|
||||
Subject: Fix build for x86_gcc2
|
||||
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 7e0c930..be18bc2 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -5343,6 +5343,9 @@ $_config_h_data
|
||||
|
||||
/* Data types */
|
||||
typedef unsigned $type_1_byte byte;
|
||||
+#ifdef __HAIKU__
|
||||
+#include <SupportDefs.h>
|
||||
+#else
|
||||
typedef unsigned int uint;
|
||||
typedef unsigned $type_1_byte uint8;
|
||||
typedef unsigned $type_2_byte uint16;
|
||||
@@ -5350,6 +5353,7 @@ typedef unsigned $type_4_byte uint32;
|
||||
typedef signed $type_1_byte int8;
|
||||
typedef signed $type_2_byte int16;
|
||||
typedef signed $type_4_byte int32;
|
||||
+#endif
|
||||
EOF
|
||||
|
||||
if test -n "$_def_64bit_type_unsigned" ; then
|
||||
--
|
||||
2.19.1
|
||||
|
||||
@@ -1,188 +0,0 @@
|
||||
From 776540f0b19e30ac07f90fa7b6e54a68689c9aa4 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Mon, 6 Sep 2021 23:50:35 +1000
|
||||
Subject: Fixes for Haiku
|
||||
|
||||
|
||||
diff --git a/backends/platform/sdl/posix/posix.cpp b/backends/platform/sdl/posix/posix.cpp
|
||||
index 8a8aeaa..a192d89 100644
|
||||
--- a/backends/platform/sdl/posix/posix.cpp
|
||||
+++ b/backends/platform/sdl/posix/posix.cpp
|
||||
@@ -52,6 +52,10 @@
|
||||
#include <sys/wait.h>
|
||||
#include <unistd.h>
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+#include <FindDirectory.h>
|
||||
+#endif
|
||||
+
|
||||
#ifdef HAS_POSIX_SPAWN
|
||||
#include <spawn.h>
|
||||
#endif
|
||||
@@ -138,6 +142,16 @@ Common::String OSystem_POSIX::getDefaultConfigFileName() {
|
||||
// On POSIX systems we follow the XDG Base Directory Specification for
|
||||
// where to store files. The version we based our code upon can be found
|
||||
// over here: http://standards.freedesktop.org/basedir-spec/basedir-spec-0.8.html
|
||||
+#ifdef __HAIKU__
|
||||
+ static char settingsDir[PATH_MAX] = "";
|
||||
+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, settingsDir, sizeof(settingsDir)) == B_OK) {
|
||||
+ prefix = settingsDir;
|
||||
+ prefix += "/ResidualVM";
|
||||
+ } else {
|
||||
+ prefix = "/boot/home/config/settings/ResidualVM";
|
||||
+ }
|
||||
+ mkdir(prefix.c_str(), 0755);
|
||||
+#else
|
||||
envVar = getenv("XDG_CONFIG_HOME");
|
||||
if (!envVar || !*envVar) {
|
||||
envVar = getenv("HOME");
|
||||
@@ -156,6 +170,7 @@ Common::String OSystem_POSIX::getDefaultConfigFileName() {
|
||||
if (!prefix.empty() && Posix::assureDirectoryExists("residualvm", prefix.c_str())) {
|
||||
prefix += "/residualvm";
|
||||
}
|
||||
+#endif
|
||||
|
||||
if (!prefix.empty() && (prefix.size() + 1 + baseConfigName.size()) < MAXPATHLEN) {
|
||||
configFile = prefix;
|
||||
@@ -180,7 +195,15 @@ Common::String OSystem_POSIX::getXdgUserDir(const char *name) {
|
||||
|
||||
configHome = Common::String::format("%s/.config", home);
|
||||
}
|
||||
-
|
||||
+#if defined(__HAIKU__)
|
||||
+ static char settingsDir[PATH_MAX] = "";
|
||||
+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, settingsDir, sizeof(settingsDir)) == B_OK) {
|
||||
+ configHome = settingsDir;
|
||||
+ configHome += "/ResidualVM";
|
||||
+ } else {
|
||||
+ configHome = "/boot/home/config/settings/ResidualVM";
|
||||
+ }
|
||||
+#endif
|
||||
// Find the requested directory line in the xdg-user-dirs configuration file
|
||||
// Example line value: XDG_PICTURES_DIR="$HOME/Pictures"
|
||||
Common::FSNode userDirsFile(configHome + "/user-dirs.dirs");
|
||||
@@ -296,9 +319,17 @@ Common::String OSystem_POSIX::getDefaultLogFileName() {
|
||||
|
||||
logFile = ".cache/";
|
||||
}
|
||||
-
|
||||
+#if defined(__HAIKU__)
|
||||
+ static char cacheDir[PATH_MAX] = "";
|
||||
+ if (find_directory(B_USER_CACHE_DIRECTORY, -1, false, cacheDir, sizeof(cacheDir)) == B_OK) {
|
||||
+ prefix = cacheDir;
|
||||
+ } else {
|
||||
+ prefix = "/boot/home/config/cache";
|
||||
+ }
|
||||
+ logFile = "ResidualVM/logs";
|
||||
+#else
|
||||
logFile += "residualvm/logs";
|
||||
-
|
||||
+#endif
|
||||
if (!Posix::assureDirectoryExists(logFile, prefix)) {
|
||||
return Common::String();
|
||||
}
|
||||
@@ -361,6 +392,11 @@ bool OSystem_POSIX::openUrl(const Common::String &url) {
|
||||
#ifdef HAS_POSIX_SPAWN
|
||||
// inspired by Qt's "qdesktopservices_x11.cpp"
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+ if (launchBrowser("open", url))
|
||||
+ return true;
|
||||
+#endif
|
||||
+
|
||||
// try "standards"
|
||||
if (launchBrowser("xdg-open", url))
|
||||
return true;
|
||||
diff --git a/backends/saves/posix/posix-saves.cpp b/backends/saves/posix/posix-saves.cpp
|
||||
index 7b83154..8636b83 100644
|
||||
--- a/backends/saves/posix/posix-saves.cpp
|
||||
+++ b/backends/saves/posix/posix-saves.cpp
|
||||
@@ -26,7 +26,9 @@
|
||||
#define FORBIDDEN_SYMBOL_EXCEPTION_time_h //On IRIX, sys/stat.h includes sys/time.h
|
||||
#define FORBIDDEN_SYMBOL_EXCEPTION_mkdir
|
||||
#define FORBIDDEN_SYMBOL_EXCEPTION_getenv
|
||||
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
|
||||
|
||||
+#include "config.h"
|
||||
#include "common/scummsys.h"
|
||||
|
||||
#if defined(POSIX) && !defined(DISABLE_DEFAULT_SAVEFILEMANAGER)
|
||||
@@ -40,6 +42,10 @@
|
||||
|
||||
#include <sys/stat.h>
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+#include <FindDirectory.h>
|
||||
+#endif
|
||||
+
|
||||
POSIXSaveFileManager::POSIXSaveFileManager() {
|
||||
// Register default savepath.
|
||||
Common::String savePath;
|
||||
@@ -52,7 +58,16 @@ POSIXSaveFileManager::POSIXSaveFileManager() {
|
||||
|
||||
ConfMan.registerDefault("savepath", savePath);
|
||||
}
|
||||
-
|
||||
+#elif defined(__HAIKU__)
|
||||
+ static char settingsDir[PATH_MAX] = "";
|
||||
+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, settingsDir, sizeof(settingsDir)) == B_OK) {
|
||||
+ savePath = settingsDir;
|
||||
+ savePath += "/ResidualVM/Savegames";
|
||||
+ } else {
|
||||
+ savePath = "/boot/home/config/settings/ResidualVM/Savegames";
|
||||
+ }
|
||||
+ mkdir(savePath.c_str(), 0755);
|
||||
+ ConfMan.registerDefault("savepath", savePath);
|
||||
#else
|
||||
const char *envVar;
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index eb50f9e..c5f5a50 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -6220,6 +6220,9 @@ $_config_h_data
|
||||
/* Data types */
|
||||
#ifndef SCUMMVM_DONT_DEFINE_TYPES
|
||||
typedef unsigned $type_1_byte byte;
|
||||
+#ifdef __HAIKU__
|
||||
+#include <SupportDefs.h>
|
||||
+#else
|
||||
typedef unsigned int uint;
|
||||
typedef unsigned $type_1_byte uint8;
|
||||
typedef unsigned $type_2_byte uint16;
|
||||
@@ -6230,6 +6233,7 @@ typedef signed $type_2_byte int16;
|
||||
typedef signed $type_4_byte int32;
|
||||
typedef signed $type_8_byte int64;
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
typedef $type_ptr uintptr;
|
||||
|
||||
diff --git a/engines/icb/jpeg.h b/engines/icb/jpeg.h
|
||||
index 6c0f57b..0cb4a41 100644
|
||||
--- a/engines/icb/jpeg.h
|
||||
+++ b/engines/icb/jpeg.h
|
||||
@@ -40,6 +40,8 @@ static uint32 *_end_buf;
|
||||
|
||||
#ifdef _WIN32
|
||||
static __int64 safeMM0 = 0;
|
||||
+#elif defined(__HAIKU__)
|
||||
+static int64_t safeMM0 = 0;
|
||||
#else
|
||||
static __int64_t safeMM0 = 0;
|
||||
#endif
|
||||
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
|
||||
index 1a0ed7d..8928b70 100644
|
||||
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
|
||||
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
|
||||
@@ -28,6 +28,7 @@
|
||||
#include "engines/wintermute/base/gfx/3ds/light3d.h"
|
||||
#include "graphics/opengl/system_headers.h"
|
||||
#include "math/glmath.h"
|
||||
+#include <GL/glew.h>
|
||||
|
||||
#if defined(USE_OPENGL) && !defined(USE_GLES2)
|
||||
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -1,403 +0,0 @@
|
||||
diff --git a/engines/wintermute/ad/ad_actor_3dx.cpp b/engines/wintermute/ad/ad_actor_3dx.cpp
|
||||
index 90d7b97..b167e4b 100644
|
||||
--- a/engines/wintermute/ad/ad_actor_3dx.cpp
|
||||
+++ b/engines/wintermute/ad/ad_actor_3dx.cpp
|
||||
@@ -191,7 +191,7 @@ bool AdActor3DX::update() {
|
||||
Math::Matrix4 newWorldMat;
|
||||
getMatrix(&newWorldMat, &newPos);
|
||||
|
||||
- int newX, newY;
|
||||
+ int32 newX, newY;
|
||||
convert3DTo2D(&newWorldMat, &newX, &newY);
|
||||
canWalk = !scene->isBlockedAt(newX, newY, false, this);
|
||||
} else {
|
||||
@@ -1257,7 +1257,7 @@ void AdActor3DX::talk(const char *text, const char *sound, uint32 duration, cons
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
-int AdActor3DX::getHeight() {
|
||||
+int32 AdActor3DX::getHeight() {
|
||||
if (!_modelX) {
|
||||
return 0;
|
||||
} else {
|
||||
@@ -2262,13 +2262,13 @@ bool AdActor3DX::persist(BasePersistenceManager *persistMgr) {
|
||||
persistMgr->transferUint32(TMEMBER(_defaultStopTransTime));
|
||||
|
||||
if (persistMgr->getIsSaving()) {
|
||||
- int numItems = _transitionTimes.size();
|
||||
+ int32 numItems = _transitionTimes.size();
|
||||
persistMgr->transferSint32(TMEMBER(numItems));
|
||||
for (uint32 i = 0; i < _transitionTimes.size(); i++) {
|
||||
_transitionTimes[i]->persist(persistMgr);
|
||||
}
|
||||
} else {
|
||||
- int numItems = _transitionTimes.size();
|
||||
+ int32 numItems = _transitionTimes.size();
|
||||
persistMgr->transferSint32(TMEMBER(numItems));
|
||||
for (int i = 0; i < numItems; i++) {
|
||||
BaseAnimationTransitionTime *trans = new BaseAnimationTransitionTime();
|
||||
@@ -2441,7 +2441,7 @@ bool AdActor3DX::updatePartEmitter() {
|
||||
|
||||
Math::Vector3d bonePos;
|
||||
getBonePosition3D(_partBone.c_str(), &bonePos, &_partOffset);
|
||||
- int x = 0, y = 0;
|
||||
+ int32 x = 0, y = 0;
|
||||
static_cast<AdGame *>(_gameRef)->_scene->_sceneGeometry->convert3Dto2D(&bonePos, &x, &y);
|
||||
|
||||
_partEmitter->_posX = x - _gameRef->_renderer->_drawOffsetX;
|
||||
diff --git a/engines/wintermute/ad/ad_actor_3dx.h b/engines/wintermute/ad/ad_actor_3dx.h
|
||||
index ecac126..e87f29d 100644
|
||||
--- a/engines/wintermute/ad/ad_actor_3dx.h
|
||||
+++ b/engines/wintermute/ad/ad_actor_3dx.h
|
||||
@@ -51,9 +51,9 @@ public:
|
||||
bool displayShadowVolume();
|
||||
bool restoreDeviceObjects() override;
|
||||
bool invalidateDeviceObjects() override;
|
||||
- int _stateAnimChannel;
|
||||
+ int32 _stateAnimChannel;
|
||||
void talk(const char *text, const char *sound = nullptr, uint32 duration = 0, const char *stances = nullptr, TTextAlign align = TAL_CENTER) override;
|
||||
- int getHeight() override;
|
||||
+ int32 getHeight() override;
|
||||
bool playAnim3DX(const char *name, bool setState);
|
||||
bool playAnim3DX(int channel, const char *name, bool setState);
|
||||
|
||||
@@ -72,7 +72,7 @@ public:
|
||||
Common::String _turnLeftAnimName;
|
||||
Common::String _turnRightAnimName;
|
||||
|
||||
- int _talkAnimChannel;
|
||||
+ int32 _talkAnimChannel;
|
||||
|
||||
TDirectWalkMode _directWalkMode;
|
||||
TDirectTurnMode _directTurnMode;
|
||||
@@ -81,7 +81,7 @@ public:
|
||||
float _directWalkVelocity;
|
||||
float _directTurnVelocity;
|
||||
|
||||
- int _goToTolerance;
|
||||
+ int32 _goToTolerance;
|
||||
|
||||
DECLARE_PERSISTENT(AdActor3DX, AdObject3D)
|
||||
bool _turningLeft;
|
||||
diff --git a/engines/wintermute/ad/ad_object_3d.cpp b/engines/wintermute/ad/ad_object_3d.cpp
|
||||
index bf09452..08127da 100644
|
||||
--- a/engines/wintermute/ad/ad_object_3d.cpp
|
||||
+++ b/engines/wintermute/ad/ad_object_3d.cpp
|
||||
@@ -120,7 +120,7 @@ bool AdObject3D::update() {
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
-bool AdObject3D::convert3DTo2D(Math::Matrix4 *worldMat, int *posX, int *posY) {
|
||||
+bool AdObject3D::convert3DTo2D(Math::Matrix4 *worldMat, int32 *posX, int32 *posY) {
|
||||
Math::Vector3d origin(0.0f, 0.0f, 0.0f);
|
||||
_gameRef->_renderer3D->project(*worldMat, origin, *posX, *posY);
|
||||
|
||||
@@ -152,8 +152,8 @@ bool AdObject3D::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
if (strcmp(name, "SkipTo") == 0) {
|
||||
stack->correctParams(2);
|
||||
- int x = stack->pop()->getInt();
|
||||
- int y = stack->pop()->getInt();
|
||||
+ int32 x = stack->pop()->getInt();
|
||||
+ int32 y = stack->pop()->getInt();
|
||||
|
||||
skipTo(x, y);
|
||||
stack->pushNULL();
|
||||
@@ -180,7 +180,7 @@ bool AdObject3D::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta
|
||||
else if (strcmp(name, "GetBonePosition2D") == 0) {
|
||||
stack->correctParams(1);
|
||||
const char *boneName = stack->pop()->getString();
|
||||
- int x = 0, y = 0;
|
||||
+ int32 x = 0, y = 0;
|
||||
getBonePosition2D(boneName, &x, &y);
|
||||
|
||||
ScValue *val = stack->getPushValue();
|
||||
@@ -552,7 +552,7 @@ bool AdObject3D::persist(BasePersistenceManager *persistMgr) {
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
-bool AdObject3D::skipTo(int x, int y, bool tolerant) {
|
||||
+bool AdObject3D::skipTo(int32 x, int32 y, bool tolerant) {
|
||||
AdGame *adGame = (AdGame *)_gameRef;
|
||||
Math::Vector3d pos;
|
||||
|
||||
@@ -583,7 +583,7 @@ ShadowVolume *AdObject3D::getShadowVolume() {
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
-bool AdObject3D::getBonePosition2D(const char *boneName, int *x, int *y) {
|
||||
+bool AdObject3D::getBonePosition2D(const char *boneName, int32 *x, int32 *y) {
|
||||
if (!_modelX) {
|
||||
return false;
|
||||
}
|
||||
diff --git a/engines/wintermute/ad/ad_object_3d.h b/engines/wintermute/ad/ad_object_3d.h
|
||||
index f75db25..e683375 100644
|
||||
--- a/engines/wintermute/ad/ad_object_3d.h
|
||||
+++ b/engines/wintermute/ad/ad_object_3d.h
|
||||
@@ -40,8 +40,8 @@ class ShadowVolume;
|
||||
class AdObject3D : public AdObject {
|
||||
public:
|
||||
bool setupLights();
|
||||
- bool convert3DTo2D(Math::Matrix4 *worldMat, int *posX, int *posY);
|
||||
- bool skipTo(int x, int y, bool tolerant = false);
|
||||
+ bool convert3DTo2D(Math::Matrix4 *worldMat, int32 *posX, int32 *posY);
|
||||
+ bool skipTo(int32 x, int32 y, bool tolerant = false);
|
||||
char *_tempSkelAnim;
|
||||
Math::Vector3d _lastPosVector;
|
||||
DECLARE_PERSISTENT(AdObject3D, AdObject)
|
||||
@@ -50,7 +50,7 @@ public:
|
||||
bool update() override;
|
||||
AdObject3D(BaseGame *inGame);
|
||||
virtual ~AdObject3D();
|
||||
- bool getBonePosition2D(const char *boneName, int *x, int *y);
|
||||
+ bool getBonePosition2D(const char *boneName, int32 *x, int32 *y);
|
||||
bool getBonePosition3D(const char *boneName, Math::Vector3d *pos, Math::Vector3d *offset = nullptr);
|
||||
|
||||
float _velocity;
|
||||
diff --git a/engines/wintermute/ad/ad_path3d.cpp b/engines/wintermute/ad/ad_path3d.cpp
|
||||
index 697bb79..61d1e9a 100644
|
||||
--- a/engines/wintermute/ad/ad_path3d.cpp
|
||||
+++ b/engines/wintermute/ad/ad_path3d.cpp
|
||||
@@ -108,7 +108,7 @@ bool AdPath3D::persist(BasePersistenceManager *persistMgr) {
|
||||
persistMgr->transferBool(TMEMBER(_ready));
|
||||
|
||||
if (persistMgr->getIsSaving()) {
|
||||
- int j = _points.size();
|
||||
+ int32 j = _points.size();
|
||||
persistMgr->transferSint32("ArraySize", &j);
|
||||
for (int i = 0; i < j; i++) {
|
||||
persistMgr->transferFloat("x", &_points[i]->x());
|
||||
@@ -116,7 +116,7 @@ bool AdPath3D::persist(BasePersistenceManager *persistMgr) {
|
||||
persistMgr->transferFloat("z", &_points[i]->z());
|
||||
}
|
||||
} else {
|
||||
- int j = 0;
|
||||
+ int32 j = 0;
|
||||
persistMgr->transferSint32("ArraySize", &j);
|
||||
for (int i = 0; i < j; i++) {
|
||||
float x, y, z;
|
||||
diff --git a/engines/wintermute/ad/ad_path3d.h b/engines/wintermute/ad/ad_path3d.h
|
||||
index 2569ad8..e072e9c 100644
|
||||
--- a/engines/wintermute/ad/ad_path3d.h
|
||||
+++ b/engines/wintermute/ad/ad_path3d.h
|
||||
@@ -49,7 +49,7 @@ public:
|
||||
virtual ~AdPath3D();
|
||||
bool _ready;
|
||||
BaseArray<Math::Vector3d *> _points;
|
||||
- int _currIndex;
|
||||
+ int32 _currIndex;
|
||||
|
||||
DECLARE_PERSISTENT(AdPath3D, BaseClass)
|
||||
};
|
||||
diff --git a/engines/wintermute/ad/ad_scene_geometry.cpp b/engines/wintermute/ad/ad_scene_geometry.cpp
|
||||
index 1449863..9ae90a1 100644
|
||||
--- a/engines/wintermute/ad/ad_scene_geometry.cpp
|
||||
+++ b/engines/wintermute/ad/ad_scene_geometry.cpp
|
||||
@@ -555,7 +555,7 @@ Math::Vector3d AdSceneGeometry::getBlockIntersection(Math::Vector3d *p1, Math::V
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
-bool AdSceneGeometry::convert2Dto3DTolerant(int x, int y, Math::Vector3d *pos) {
|
||||
+bool AdSceneGeometry::convert2Dto3DTolerant(int32 x, int32 y, Math::Vector3d *pos) {
|
||||
bool Ret = convert2Dto3D(x, y, pos);
|
||||
if (Ret) {
|
||||
return Ret;
|
||||
@@ -639,7 +639,7 @@ bool AdSceneGeometry::convert2Dto3DTolerant(int x, int y, Math::Vector3d *pos) {
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
-bool AdSceneGeometry::convert2Dto3D(int x, int y, Math::Vector3d *pos) {
|
||||
+bool AdSceneGeometry::convert2Dto3D(int32 x, int32 y, Math::Vector3d *pos) {
|
||||
bool intFound = false;
|
||||
float minDist = FLT_MAX;
|
||||
|
||||
@@ -1167,7 +1167,7 @@ bool AdSceneGeometry::persist(BasePersistenceManager *persistMgr) {
|
||||
int i;
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
- int numLights = _lights.size();
|
||||
+ int32 numLights = _lights.size();
|
||||
persistMgr->transferSint32(TMEMBER(numLights));
|
||||
for (i = 0; i < numLights; i++) {
|
||||
if (persistMgr->getIsSaving()) {
|
||||
@@ -1200,7 +1200,7 @@ bool AdSceneGeometry::persist(BasePersistenceManager *persistMgr) {
|
||||
createLights();
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
- int numBlocks = _blocks.size();
|
||||
+ int32 numBlocks = _blocks.size();
|
||||
persistMgr->transferSint32(TMEMBER(numBlocks));
|
||||
for (i = 0; i < numBlocks; i++) {
|
||||
if (persistMgr->getIsSaving()) {
|
||||
@@ -1230,7 +1230,7 @@ bool AdSceneGeometry::persist(BasePersistenceManager *persistMgr) {
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
- int numPlanes = _planes.size();
|
||||
+ int32 numPlanes = _planes.size();
|
||||
persistMgr->transferSint32(TMEMBER(numPlanes));
|
||||
for (i = 0; i < numPlanes; i++) {
|
||||
if (persistMgr->getIsSaving()) {
|
||||
@@ -1260,7 +1260,7 @@ bool AdSceneGeometry::persist(BasePersistenceManager *persistMgr) {
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
- int numGenerics = _generics.size();
|
||||
+ int32 numGenerics = _generics.size();
|
||||
persistMgr->transferSint32(TMEMBER(numGenerics));
|
||||
for (i = 0; i < numGenerics; i++) {
|
||||
if (persistMgr->getIsSaving()) {
|
||||
@@ -1297,7 +1297,7 @@ bool AdSceneGeometry::persist(BasePersistenceManager *persistMgr) {
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
-bool AdSceneGeometry::convert3Dto2D(Math::Vector3d *pos, int *x, int *y) {
|
||||
+bool AdSceneGeometry::convert3Dto2D(Math::Vector3d *pos, int32 *x, int32 *y) {
|
||||
Math::Matrix4 worldMat;
|
||||
worldMat.setToIdentity();
|
||||
|
||||
diff --git a/engines/wintermute/ad/ad_scene_geometry.h b/engines/wintermute/ad/ad_scene_geometry.h
|
||||
index faae71f..e06c514 100644
|
||||
--- a/engines/wintermute/ad/ad_scene_geometry.h
|
||||
+++ b/engines/wintermute/ad/ad_scene_geometry.h
|
||||
@@ -79,9 +79,9 @@ public:
|
||||
float getPointsDist(Math::Vector3d p1, Math::Vector3d p2);
|
||||
void pathFinderStep();
|
||||
bool getPath(Math::Vector3d source, Math::Vector3d target, AdPath3D *path, bool rerun = false);
|
||||
- bool convert2Dto3D(int x, int y, Math::Vector3d *pos);
|
||||
- bool convert2Dto3DTolerant(int x, int y, Math::Vector3d *pos);
|
||||
- bool convert3Dto2D(Math::Vector3d *pos, int *x, int *y);
|
||||
+ bool convert2Dto3D(int32 x, int32 y, Math::Vector3d *pos);
|
||||
+ bool convert2Dto3DTolerant(int32 x, int32 y, Math::Vector3d *pos);
|
||||
+ bool convert3Dto2D(Math::Vector3d *pos, int32 *x, int32 *y);
|
||||
BaseSprite *_wptMarker;
|
||||
float _waypointHeight;
|
||||
bool directPathExists(Math::Vector3d *p1, Math::Vector3d *p2);
|
||||
@@ -98,11 +98,11 @@ public:
|
||||
//bool SetActiveCameraTwin(char* Camera);
|
||||
//bool SetActiveCameraTwin(int Camera);
|
||||
Camera3D *getActiveCamera();
|
||||
- int _activeCamera;
|
||||
+ int32 _activeCamera;
|
||||
|
||||
bool setActiveLight(char *light);
|
||||
bool setActiveLight(int light);
|
||||
- int _activeLight;
|
||||
+ int32 _activeLight;
|
||||
|
||||
void cleanup();
|
||||
AdSceneGeometry(BaseGame *inGame);
|
||||
diff --git a/engines/wintermute/base/gfx/base_renderer3d.cpp b/engines/wintermute/base/gfx/base_renderer3d.cpp
|
||||
index bc3d86a..12b5563 100644
|
||||
--- a/engines/wintermute/base/gfx/base_renderer3d.cpp
|
||||
+++ b/engines/wintermute/base/gfx/base_renderer3d.cpp
|
||||
@@ -45,7 +45,7 @@ bool BaseRenderer3D::setDefaultAmbientLightColor() {
|
||||
return true;
|
||||
}
|
||||
|
||||
-void BaseRenderer3D::project(const Math::Matrix4 &worldMatrix, const Math::Vector3d &point, int &x, int &y) {
|
||||
+void BaseRenderer3D::project(const Math::Matrix4 &worldMatrix, const Math::Vector3d &point, int32 &x, int32 &y) {
|
||||
Math::Matrix4 tmp = worldMatrix;
|
||||
tmp.transpose();
|
||||
Math::Vector3d windowCoords;
|
||||
diff --git a/engines/wintermute/base/gfx/base_renderer3d.h b/engines/wintermute/base/gfx/base_renderer3d.h
|
||||
index adca76c..0c6c7dd 100644
|
||||
--- a/engines/wintermute/base/gfx/base_renderer3d.h
|
||||
+++ b/engines/wintermute/base/gfx/base_renderer3d.h
|
||||
@@ -83,7 +83,7 @@ public:
|
||||
virtual void resetModelViewTransform() = 0;
|
||||
virtual void setWorldTransform(const Math::Matrix4 &transform) = 0;
|
||||
|
||||
- void project(const Math::Matrix4 &worldMatrix, const Math::Vector3d &point, int &x, int &y);
|
||||
+ void project(const Math::Matrix4 &worldMatrix, const Math::Vector3d &point, int32 &x, int32 &y);
|
||||
Math::Ray rayIntoScene(int x, int y);
|
||||
|
||||
Math::Matrix4 lastProjectionMatrix() {
|
||||
diff --git a/engines/wintermute/base/gfx/x/active_animation.h b/engines/wintermute/base/gfx/x/active_animation.h
|
||||
index fb2ac33..9e3ea50 100644
|
||||
--- a/engines/wintermute/base/gfx/x/active_animation.h
|
||||
+++ b/engines/wintermute/base/gfx/x/active_animation.h
|
||||
@@ -63,7 +63,7 @@ public:
|
||||
|
||||
private:
|
||||
ModelX *_model;
|
||||
- int _currentFrame;
|
||||
+ int32 _currentFrame;
|
||||
uint32 _startTime;
|
||||
bool _looping;
|
||||
bool _finished;
|
||||
diff --git a/engines/wintermute/base/gfx/x/animation_set.cpp b/engines/wintermute/base/gfx/x/animation_set.cpp
|
||||
index 8dec7dd..27d5b8d 100644
|
||||
--- a/engines/wintermute/base/gfx/x/animation_set.cpp
|
||||
+++ b/engines/wintermute/base/gfx/x/animation_set.cpp
|
||||
@@ -204,7 +204,7 @@ bool AnimationSet::persist(BasePersistenceManager *persistMgr) {
|
||||
persistMgr->transferBool(TMEMBER(_looping));
|
||||
|
||||
// persist events
|
||||
- int numEvents;
|
||||
+ int32 numEvents;
|
||||
if (persistMgr->getIsSaving()) {
|
||||
numEvents = _events.size();
|
||||
}
|
||||
diff --git a/engines/wintermute/base/gfx/x/modelx.cpp b/engines/wintermute/base/gfx/x/modelx.cpp
|
||||
index 4d47d6e..b2aaccc 100644
|
||||
--- a/engines/wintermute/base/gfx/x/modelx.cpp
|
||||
+++ b/engines/wintermute/base/gfx/x/modelx.cpp
|
||||
@@ -559,8 +559,8 @@ void ModelX::updateBoundingRect() {
|
||||
float z1 = _BBoxStart.z();
|
||||
float z2 = _BBoxEnd.z();
|
||||
|
||||
- int screenX = 0;
|
||||
- int screenY = 0;
|
||||
+ int32 screenX = 0;
|
||||
+ int32 screenY = 0;
|
||||
|
||||
_gameRef->_renderer3D->project(_lastWorldMat, Math::Vector3d(x1, y1, z1), screenX, screenY);
|
||||
updateRect(&_boundingRect, screenX, screenY);
|
||||
@@ -588,7 +588,7 @@ void ModelX::updateBoundingRect() {
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
-void ModelX::updateRect(Rect32 *rc, int x, int y) {
|
||||
+void ModelX::updateRect(Rect32 *rc, int32 x, int32 y) {
|
||||
rc->left = MIN(rc->left, x);
|
||||
rc->right = MAX(rc->right, x);
|
||||
rc->top = MIN(rc->top, y);
|
||||
@@ -855,7 +855,7 @@ bool ModelX::persist(BasePersistenceManager *persistMgr) {
|
||||
persistMgr->transferPtr(TMEMBER(_parentModel));
|
||||
|
||||
// animation properties
|
||||
- int numAnims;
|
||||
+ int32 numAnims;
|
||||
if (persistMgr->getIsSaving()) {
|
||||
numAnims = _animationSets.size();
|
||||
}
|
||||
@@ -893,7 +893,7 @@ bool ModelX::persist(BasePersistenceManager *persistMgr) {
|
||||
}
|
||||
|
||||
// persist material sprites
|
||||
- int numMatSprites;
|
||||
+ int32 numMatSprites;
|
||||
if (persistMgr->getIsSaving()) {
|
||||
numMatSprites = _matSprites.size();
|
||||
}
|
||||
diff --git a/engines/wintermute/base/gfx/x/modelx.h b/engines/wintermute/base/gfx/x/modelx.h
|
||||
index 7fc6133..674ad8a 100644
|
||||
--- a/engines/wintermute/base/gfx/x/modelx.h
|
||||
+++ b/engines/wintermute/base/gfx/x/modelx.h
|
||||
@@ -193,12 +193,12 @@ private:
|
||||
void parseFrameDuringMerge(XFileLexer &lexer, const Common::String &filename);
|
||||
|
||||
void updateBoundingRect();
|
||||
- void static inline updateRect(Rect32 *rc, int x, int y);
|
||||
+ void static inline updateRect(Rect32 *rc, int32 x, int32 y);
|
||||
Rect32 _drawingViewport;
|
||||
Math::Matrix4 _lastViewMat;
|
||||
Math::Matrix4 _lastProjMat;
|
||||
- int _lastOffsetX;
|
||||
- int _lastOffsetY;
|
||||
+ int32 _lastOffsetX;
|
||||
+ int32 _lastOffsetY;
|
||||
|
||||
Math::Vector3d _BBoxStart;
|
||||
Math::Vector3d _BBoxEnd;
|
||||
@@ -1,127 +0,0 @@
|
||||
SUMMARY="A cross-platform 3D game interpreter"
|
||||
DESCRIPTION="ResidualVM is a program which allows you to run certain classic \
|
||||
3D games, provided you already have their data files. ResidualVM just \
|
||||
replaces the executables shipped with the game, allowing you to play them on \
|
||||
systems for which they were never designed!"
|
||||
HOMEPAGE="https://www.residualvm.org/"
|
||||
COPYRIGHT="2003-2018 ResidualVM Team"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="7"
|
||||
SOURCE_URI="https://www.residualvm.org/downloads/release/$portVersion/residualvm-$portVersion-sources.tar.gz"
|
||||
CHECKSUM_SHA256="515b02129dd374bc9c0b732ddeaaaa3a342cc25ea0ea3c4ccf19141b5d362e1d"
|
||||
PATCHES="residualvm-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="residualvm.rdef.in"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
residualvm$secondaryArchSuffix = $portVersion
|
||||
app:ResidualVM$secondaryArchSuffix = $portVersion
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libbz2$secondaryArchSuffix
|
||||
lib:libcrypto$secondaryArchSuffix
|
||||
lib:libcurl$secondaryArchSuffix
|
||||
lib:libfaad$secondaryArchSuffix
|
||||
lib:libflac$secondaryArchSuffix
|
||||
lib:libfluidsynth$secondaryArchSuffix >= 1
|
||||
lib:libfreetype$secondaryArchSuffix
|
||||
lib:libgl$secondaryArchSuffix
|
||||
lib:libglu$secondaryArchSuffix
|
||||
lib:libiconv$secondaryArchSuffix
|
||||
lib:libintl$secondaryArchSuffix
|
||||
lib:libjpeg$secondaryArchSuffix
|
||||
lib:libmad$secondaryArchSuffix
|
||||
lib:libmpeg2$secondaryArchSuffix
|
||||
lib:libnghttp2$secondaryArchSuffix
|
||||
lib:libogg$secondaryArchSuffix
|
||||
lib:libpng16$secondaryArchSuffix
|
||||
lib:libreadline$secondaryArchSuffix
|
||||
lib:libSDL2_2.0$secondaryArchSuffix
|
||||
lib:libSDL2_net_2.0$secondaryArchSuffix
|
||||
lib:libssl$secondaryArchSuffix
|
||||
lib:libtheoradec$secondaryArchSuffix
|
||||
lib:libvorbis$secondaryArchSuffix
|
||||
lib:libvorbisfile$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libbz2$secondaryArchSuffix
|
||||
devel:libcrypto$secondaryArchSuffix
|
||||
devel:libcurl$secondaryArchSuffix
|
||||
devel:libfaad$secondaryArchSuffix
|
||||
devel:libflac$secondaryArchSuffix
|
||||
devel:libfluidsynth$secondaryArchSuffix >= 1
|
||||
devel:libfreetype$secondaryArchSuffix
|
||||
devel:libgl$secondaryArchSuffix
|
||||
devel:libglu$secondaryArchSuffix
|
||||
devel:libiconv$secondaryArchSuffix
|
||||
devel:libintl$secondaryArchSuffix
|
||||
devel:libjpeg$secondaryArchSuffix
|
||||
devel:libmad$secondaryArchSuffix
|
||||
devel:libmpeg2$secondaryArchSuffix
|
||||
devel:libnghttp2$secondaryArchSuffix
|
||||
devel:libogg$secondaryArchSuffix
|
||||
devel:libpng16$secondaryArchSuffix
|
||||
devel:libreadline$secondaryArchSuffix
|
||||
devel:libSDL2_2.0$secondaryArchSuffix
|
||||
devel:libSDL2_net_2.0$secondaryArchSuffix
|
||||
devel:libssl$secondaryArchSuffix
|
||||
devel:libtheoradec$secondaryArchSuffix
|
||||
devel:libvorbis$secondaryArchSuffix
|
||||
devel:libvorbisfile$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:nasm
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
CPPFLAGS=`freetype-config --cflags` ./configure --prefix=$appsDir/ResidualVM \
|
||||
--enable-all-engines \
|
||||
--enable-release \
|
||||
--enable-libcurl \
|
||||
--enable-fluidsynth \
|
||||
--enable-flac \
|
||||
--enable-faad \
|
||||
--enable-text-console \
|
||||
--enable-cloud \
|
||||
--disable-debug \
|
||||
--disable-updates
|
||||
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
mv $appsDir/ResidualVM/bin/residualvm $appsDir/ResidualVM/ResidualVM
|
||||
rm -R $appsDir/ResidualVM/bin
|
||||
|
||||
local APP_SIGNATURE="application/x-vnd.residualvm"
|
||||
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
|
||||
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
|
||||
local MINOR="`echo "$portVersion" | cut -d. -f2`"
|
||||
local LONG_INFO="$SUMMARY"
|
||||
sed \
|
||||
-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
|
||||
-e "s|@MAJOR@|$MAJOR|" \
|
||||
-e "s|@MIDDLE@|$MIDDLE|" \
|
||||
-e "s|@MINOR@|$MINOR|" \
|
||||
-e "s|@LONG_INFO@|$LONG_INFO|" \
|
||||
$portDir/additional-files/residualvm.rdef.in > $sourceDir/residualvm.rdef
|
||||
|
||||
addResourcesToBinaries $sourceDir/residualvm.rdef \
|
||||
$appsDir/ResidualVM/ResidualVM
|
||||
|
||||
addAppDeskbarSymlink $appsDir/ResidualVM/ResidualVM
|
||||
}
|
||||
@@ -1,134 +0,0 @@
|
||||
SUMMARY="A cross-platform 3D game interpreter"
|
||||
DESCRIPTION="ResidualVM is a program which allows you to run certain classic \
|
||||
3D games, provided you already have their data files. ResidualVM just \
|
||||
replaces the executables shipped with the game, allowing you to play them on \
|
||||
systems for which they were never designed!"
|
||||
HOMEPAGE="https://www.residualvm.org/"
|
||||
COPYRIGHT="2003-2020 ResidualVM Team"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="2"
|
||||
srcGitRev="48875a1d3dbc7bdbbc3d648a55c930cd3eb30583"
|
||||
SOURCE_URI="https://github.com/residualvm/residualvm/archive/$srcGitRev.tar.gz"
|
||||
SOURCE_DIR="residualvm-$srcGitRev"
|
||||
CHECKSUM_SHA256="d139389146d5cc373999cda7c581c5ca2f4059cc24c29f82ea7ac8c90c2e52c1"
|
||||
PATCHES="
|
||||
residualvm-$portVersion.patchset
|
||||
wintermute_int32_fix.patch
|
||||
"
|
||||
ADDITIONAL_FILES="residualvm.rdef.in"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
residualvm$secondaryArchSuffix = $portVersion
|
||||
app:ResidualVM$secondaryArchSuffix = $portVersion
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libbz2$secondaryArchSuffix
|
||||
lib:libcrypto$secondaryArchSuffix
|
||||
lib:libcurl$secondaryArchSuffix
|
||||
lib:libfaad$secondaryArchSuffix
|
||||
lib:libflac$secondaryArchSuffix
|
||||
lib:libfluidsynth$secondaryArchSuffix >= 2
|
||||
lib:libfreetype$secondaryArchSuffix
|
||||
lib:libgl$secondaryArchSuffix
|
||||
lib:libglew$secondaryArchSuffix
|
||||
lib:libglu$secondaryArchSuffix
|
||||
lib:libiconv$secondaryArchSuffix
|
||||
lib:libintl$secondaryArchSuffix
|
||||
lib:libjpeg$secondaryArchSuffix
|
||||
lib:libmad$secondaryArchSuffix
|
||||
lib:libmpeg2$secondaryArchSuffix
|
||||
lib:libnghttp2$secondaryArchSuffix
|
||||
lib:libogg$secondaryArchSuffix
|
||||
lib:libpng16$secondaryArchSuffix
|
||||
lib:libreadline$secondaryArchSuffix
|
||||
lib:libSDL2_2.0$secondaryArchSuffix
|
||||
lib:libSDL2_net_2.0$secondaryArchSuffix
|
||||
lib:libssl$secondaryArchSuffix
|
||||
lib:libtheoradec$secondaryArchSuffix
|
||||
lib:libvorbis$secondaryArchSuffix
|
||||
lib:libvorbisfile$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libbz2$secondaryArchSuffix
|
||||
devel:libcrypto$secondaryArchSuffix
|
||||
devel:libcurl$secondaryArchSuffix
|
||||
devel:libfaad$secondaryArchSuffix
|
||||
devel:libflac$secondaryArchSuffix
|
||||
devel:libfluidsynth$secondaryArchSuffix >= 2
|
||||
devel:libfreetype$secondaryArchSuffix
|
||||
devel:libgl$secondaryArchSuffix
|
||||
devel:libglew$secondaryArchSuffix
|
||||
devel:libglu$secondaryArchSuffix
|
||||
devel:libiconv$secondaryArchSuffix
|
||||
devel:libintl$secondaryArchSuffix
|
||||
devel:libjpeg$secondaryArchSuffix
|
||||
devel:libmad$secondaryArchSuffix
|
||||
devel:libmpeg2$secondaryArchSuffix
|
||||
devel:libnghttp2$secondaryArchSuffix
|
||||
devel:libogg$secondaryArchSuffix
|
||||
devel:libpng16$secondaryArchSuffix
|
||||
devel:libreadline$secondaryArchSuffix
|
||||
devel:libSDL2_2.0$secondaryArchSuffix
|
||||
devel:libSDL2_net_2.0$secondaryArchSuffix
|
||||
devel:libssl$secondaryArchSuffix
|
||||
devel:libtheoradec$secondaryArchSuffix
|
||||
devel:libvorbis$secondaryArchSuffix
|
||||
devel:libvorbisfile$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:nasm
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
CPPFLAGS=`freetype-config --cflags` ./configure --prefix=$appsDir/ResidualVM \
|
||||
--enable-all-engines \
|
||||
--enable-all-unstable-engines \
|
||||
--enable-release \
|
||||
--enable-libcurl \
|
||||
--enable-flac \
|
||||
--enable-faad \
|
||||
--enable-text-console \
|
||||
--enable-cloud \
|
||||
--disable-debug \
|
||||
--disable-updates
|
||||
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
mv $appsDir/ResidualVM/bin/residualvm $appsDir/ResidualVM/ResidualVM
|
||||
rm -R $appsDir/ResidualVM/bin
|
||||
|
||||
local APP_SIGNATURE="application/x-vnd.residualvm"
|
||||
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
|
||||
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
|
||||
local MINOR="`echo "$portVersion" | cut -d. -f3 | cut -d~ -f1`"
|
||||
local LONG_INFO="$SUMMARY"
|
||||
sed \
|
||||
-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
|
||||
-e "s|@MAJOR@|$MAJOR|" \
|
||||
-e "s|@MIDDLE@|$MIDDLE|" \
|
||||
-e "s|@MINOR@|$MINOR|" \
|
||||
-e "s|@LONG_INFO@|$LONG_INFO|" \
|
||||
$portDir/additional-files/residualvm.rdef.in > $sourceDir/residualvm.rdef
|
||||
|
||||
addResourcesToBinaries $sourceDir/residualvm.rdef \
|
||||
$appsDir/ResidualVM/ResidualVM
|
||||
|
||||
addAppDeskbarSymlink $appsDir/ResidualVM/ResidualVM
|
||||
}
|
||||
Reference in New Issue
Block a user