mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-08 21:00:05 +02:00
Bugdom: bump version, disable rpath
This commit is contained in:
Gerasim Troeglazov
@@ -14,56 +14,95 @@ resource app_version {
|
||||
|
||||
resource app_signature "@APP_SIGNATURE@";
|
||||
|
||||
resource mini_icon array {
|
||||
$"FFFFFF08948E8E6E6E6D6EDEFFFFFFFF"
|
||||
$"FFFFFF95B41D1B74741717B6FFFFFFFF"
|
||||
$"FFFFFF011DFF1D1D1F1D1D15FFFFFFFF"
|
||||
$"FFFFFF111B7E1D1D1F1D1715FFFFFFFF"
|
||||
$"FFFFFF0E94027F1D1D00061504FFFFFF"
|
||||
$"FFFFFF1DDE007F1B150000150AFFFFFF"
|
||||
$"FFFFB61D7E331D1B1B0A00170CFFFFFF"
|
||||
$"FFFFB66F1B9349691D1D1B6FB6FFFFFF"
|
||||
$"FF26B64F684968496969696F7529FFFF"
|
||||
$"29297E6949696969696A9090B525FFFF"
|
||||
$"252695B6696969696F90B608DC2627FF"
|
||||
$"26DD7EDEB796706F909EDFDF94262529"
|
||||
$"2626947F3C043DDF0102047F94272625"
|
||||
$"27DD947FDE3CDE9E9EDEDEB594262626"
|
||||
$"DD94747395DD2902DE7F948E947FDD26"
|
||||
$"2222946E6E6EB5B6B56E6E7394222225"
|
||||
};
|
||||
|
||||
resource large_icon array {
|
||||
$"FFFFFFFFFFFFFFFF948F8E6E8E6E6E686E4D686D6D6EFFFFFFFFFFFFFFFFFFFF"
|
||||
$"FFFFFFFFFFFFFF086E6D6E6E4E6E6E6E4E686D486E4D8EFFFFFFFFFFFFFFFFFF"
|
||||
$"FFFFFFFFFFFFFF95B48F948E746E6D746D746E946E944EFFFFFFFFFFFFFFFFFF"
|
||||
$"FFFFFFFFFFFFFF8E19401D1D1B676E6E68671719178E94B6FFFFFFFFFFFFFFFF"
|
||||
$"FFFFFFFFFFFFFF191D1F1F1F1F1D40671F1F1F1D1F411506FFFFFFFFFFFFFFFF"
|
||||
$"FFFFFFFFFFFF011F1F1F1F1F1F1F1D1D1F1F1F1F1F1D1B0CFFFFFFFFFFFFFFFF"
|
||||
$"FFFFFFFFFFFF0C1F1F1D8E8E1D1F1F1D1F1F1D8E8D1B1915FFFFFFFFFFFFFFFF"
|
||||
$"FFFFFFFFFFFF111F1B40677E941F1F1D1F1FB4746D176717FFFFFFFFFFFFFFFF"
|
||||
$"FFFFFFFFFFFF0E1F8E4611027E191F1D1F1994DD8267DE17FFFFFFFFFFFFFFFF"
|
||||
$"FFFFFFFFFFFF1D1F94B506337F6E1D1D1D8E7F0006B57F1504FFFFFFFFFFFFFF"
|
||||
$"FFFFFFFFFFFF1F1F7EDE00007FAE1D1B1F8E7F0000297E170AFFFFFFFFFFFFFF"
|
||||
$"FFFFFFFFFFFF1D1F94DE00025F8F1D1B1B157E00007FB5150AFFFFFFFFFFFFFF"
|
||||
$"FFFFFFFFFFB61D1D947E338F931D1D1B1D1B730A00948E170CFFFFFFFFFFFFFF"
|
||||
$"FFFFFFFFFF95681F8E937F738E1F1D1D1D1D8E6D7F9313686EFFFFFFFFFFFFFF"
|
||||
$"FFFFFFFFFF6E6F411BB593941F1F1F421D1D1D7E7E13196E6FB6FFFFFFFFFFFF"
|
||||
$"FFFFFFFFB66F6F6F1F1FFE624249496949496842FE1B416F6FB5FFFFFFFFFFFF"
|
||||
$"FFFFFFFFB66E4F49494949494968494349694949694969496F8FFFFFFFFFFFFF"
|
||||
$"FFFFFF26B44F69484968494249434949694849694969696F697529FFFFFFFFFF"
|
||||
$"FFFF2924D54F496948494969494943494963496969706F6F6F0C24FFFFFFFFFF"
|
||||
$"FF2924F57E6E694849494943694969496949696A8F908F908FB52526FFFFFFFF"
|
||||
$"28F4DC2694956F49496949494969496949696F6F90B690968FDCD52325FFFFFF"
|
||||
$"25DC24F59494B67569496949694969696F697090B0B6B6089EB42624D427FFFF"
|
||||
$"F425F4DD9495B5B69669496949696F496A6F90B0B6D7DFDE95B525D5242429FF"
|
||||
$"2526DDD4947E95DEB6B796906F70696A6F90B09ED7DFDEB6B594D526F4252529"
|
||||
$"2626267F94947FB6DE3CD7B7B6B6909690B63DD73D04B67F94B4DC2726DD2526"
|
||||
$"DD2626B494949495DEB6DE043DD7DFB6DF01D702B6DE7FB49494D5DD2626F425"
|
||||
$"2626DD949494947FB5DEB63C069EB7D7B6969EB6DEB6B59594947E2626262625"
|
||||
$"DD27DD9494736E9495B5DEB6DEB79E969EB6DE069EB59473949494B5DD26DD25"
|
||||
$"DDDD9494748D736E949595DDB629D7DED7DEB67F8F946E8E7494947FDDD52625"
|
||||
$"D5DC9494736E6D6D6E6D6E95B5B6DE027FB6B56E946E8E6E6D949494DCDDDD25"
|
||||
$"22BFF4946E736D6D676E6E6E6EB5B5B6B5956E6E6E6E6D738E74B422F3BF2325"
|
||||
$"D32222D494736E6D6E4E674E8E6E95958F6E6E6E6E6E6E8E7494D322BF22BED3"
|
||||
resource vector_icon array {
|
||||
$"6E63696605020106023DE0000000000000003E20004A600048C00000702424FF"
|
||||
$"4423230300BF0005FF050104016E230002C540C3C3C540C3C3C5A7C469C673C5"
|
||||
$"B5C60DC50FC673C5B50002C5ECC5F1C5ECC5F1C68AC5B3C7C6C536C728C574C7"
|
||||
$"C6C5360002C3FDC443C3FDC443C3DEC4E0C39EC619C3BEC57CC39EC6190002C3"
|
||||
$"2EC5D9C32EC5D9C3C4C621C4F1C6B0C45AC669C4F1C6B00002B7F5C423B7F5C4"
|
||||
$"23B825C4C6B885C60DB855C56AB885C60D0002B821C661B821C661B8CDC622BA"
|
||||
$"23C5A5B978C5E4BA23C5A50002B697C3D7B697C3D7B650C47DB5C4C5C9B60AC5"
|
||||
$"23B5C4C5C90002B55CC586B55CC586B5F6C5F0B72AC6C4B690C65AB72AC6C406"
|
||||
$"08FF7FBE89B94ABE89B94AB8FFB94AB481C2EEB481BD9BB481C343B48FC3EAB4"
|
||||
$"86C397B746C48BBE0EC4EABA8AC4EAC201C4EAC88AC3AAC5A5C472C88FC36CC8"
|
||||
$"92C2EEC892C32DC892BD9BBE89B94AC414B94ABE89B94AB94A0606FF0731C18B"
|
||||
$"31C18B31C28FB7EFC362B8F3C362B6EBC362B618C18BB618C28FB618C087B7EF"
|
||||
$"BFB4B6EBBFB4B8F3BFB431C18B31C08731C18BC18B0606FF0731C18B31C18B31"
|
||||
$"C28FB7EFC362B8F3C362B6EBC362B618C18BB618C28FB618C087B7EFBFB4B6EB"
|
||||
$"BFB4B8F3BFB431C18B31C08731C18BC18B0606FF07BEFEBC71BEFEBC71BEFEBD"
|
||||
$"75BD27BE48BE2BBE48BC22BE48BB50BC71BB50BD75BB50BB6DBD27BA9ABC22BA"
|
||||
$"9ABE2BBA9ABEFEBC71BEFEBB6DBEFEBC71BC710606FF07BEFEBC71BEFEBC71BE"
|
||||
$"FEBD75BD27BE48BE2BBE48BC22BE48BB50BC71BB50BD75BB50BB6DBD27BA9ABC"
|
||||
$"22BA9ABE2BBA9ABEFEBC71BEFEBB6DBEFEBC71BC710606FF07C2D1C1F1C2D1C1"
|
||||
$"F1C2D1C2F5C0FAC3C8C1FEC3C8BFF6C3C8BF23C1F1BF23C2F5BF23C0EDC0FAC0"
|
||||
$"1ABFF6C01AC1FEC01AC2D1C1F1C2D1C0EDC2D1C1F1C1F10606FF07C2D1C1F1C2"
|
||||
$"D1C1F1C2D1C2F5C0FAC3C8C1FEC3C8BFF6C3C8BF23C1F1BF23C2F5BF23C0EDC0"
|
||||
$"FAC01ABFF6C01AC1FEC01AC2D1C1F1C2D1C0EDC2D1C1F1C1F10606FF07C73BB4"
|
||||
$"68C73BB468C73BB4C2C697B50CC6F1B50CC63CB50CC5F3B468C5F3B4C2C5F3B4"
|
||||
$"0DC697B3C4C63CB3C4C6F1B3C4C73BB468C73BB40DC73BB468B4680606FF07C7"
|
||||
$"3BB468C73BB468C73BB4C2C697B50CC6F1B50CC63CB50CC5F3B468C5F3B4C2C5"
|
||||
$"F3B40DC697B3C4C63CB3C4C6F1B3C4C73BB468C73BB40DC73BB468B4680606FF"
|
||||
$"07CAF1B50FCAF1B50FCAF1B56ACA4DB5B3CAA7B5B3C9F2B5B3C9A8B50FC9A8B5"
|
||||
$"6AC9A8B4B4CA4DB46BC9F2B46BCAA7B46BCAF1B50FCAF1B4B4CAF1B50FB50F06"
|
||||
$"06FF07CAF1B50FCAF1B50FCAF1B56ACA4DB5B3CAA7B5B3C9F2B5B3C9A8B50FC9"
|
||||
$"A8B56AC9A8B4B4CA4DB46BC9F2B46BCAA7B46BCAF1B50FCAF1B4B4CAF1B50FB5"
|
||||
$"0F0206C1AEB7F9C1AEB7F9C3A4B638C8A4B766C674B63ECBFDB935C860BEFDCA"
|
||||
$"49BDA5C63AC08AC2ECBF1BC462C06FC169BDD7C1AEB7F9BF84BA49C1AEB7F9C1"
|
||||
$"AEB7F9C1AEB7F9C1AEB7F90206C1AEB7F9C1AEB7F9C3A4B638C8A4B766C674B6"
|
||||
$"3ECBFDB935C860BEFDCA49BDA5C63AC08AC2ECBF1BC462C06FC169BDD7C1AEB7"
|
||||
$"F9BF84BA49C1AEB7F9C1AEB7F9C1AEB7F9C1AEB7F90606FF07CA05BA00CA05BA"
|
||||
$"00CA05BB02C832BBD2C934BBD2C730BBD2C65FBA00C65FBB02C65FB8FEC832B8"
|
||||
$"2DC730B82DC934B82DCA05BA00CA05B8FECA05BA00BA000606FF07C964B9F4C9"
|
||||
$"64B9F4C964BAB9C82CBB58C8D9BB58C780BB58C6F4B9F4C6F4BAB9C6F4B930C8"
|
||||
$"2CB890C780B890C8D9B890C964B9F4C964B930C964B9F4B9F40606FF07C964B9"
|
||||
$"F4C964B9F4C964BAB9C82CBB58C8D9BB58C780BB58C6F4B9F4C6F4BAB9C6F4B9"
|
||||
$"30C82CB890C780B890C8D9B890C964B9F4C964B930C964B9F4B9F40606FF07C8"
|
||||
$"CBB940C8CBB940C8CBB980C856B9B5C897B9B5C816B9B5C7E1B940C7E1B980C7"
|
||||
$"E1B8FFC856B8CBC816B8CBC897B8CBC8CBB940C8CBB8FFC8CBB940B9400606FF"
|
||||
$"07C8CBB940C8CBB940C8CBB980C856B9B5C897B9B5C816B9B5C7E1B940C7E1B9"
|
||||
$"80C7E1B8FFC856B8CBC816B8CBC897B8CBC8CBB940C8CBB8FFC8CBB940B94006"
|
||||
$"06FF07C5C3BA00C5C3BA00C5C3BB02C3F0BBD2C4F2BBD2C2EFBBD2C21EBA00C2"
|
||||
$"1EBB02C21EB8FEC3F0B82DC2EFB82DC4F2B82DC5C3BA00C5C3B8FEC5C3BA00BA"
|
||||
$"000606FF07C523B9F4C523B9F4C523BAB9C3EABB58C497BB58C33EBB58C2B2B9"
|
||||
$"F4C2B2BAB9C2B2B930C3EAB890C33EB890C497B890C523B9F4C523B930C523B9"
|
||||
$"F4B9F40606FF07C523B9F4C523B9F4C523BAB9C3EABB58C497BB58C33EBB58C2"
|
||||
$"B2B9F4C2B2BAB9C2B2B930C3EAB890C33EB890C497B890C523B9F4C523B930C5"
|
||||
$"23B9F4B9F40606FF07C48AB940C48AB940C48AB980C415B9B5C455B9B5C3D4B9"
|
||||
$"B5C3A0B940C3A0B980C3A0B8FFC415B8CBC3D4B8CBC455B8CBC48AB940C48AB8"
|
||||
$"FFC48AB940B9400606FF07C48AB940C48AB940C48AB980C415B9B5C455B9B5C3"
|
||||
$"D4B9B5C3A0B940C3A0B980C3A0B8FFC415B8CBC3D4B8CBC455B8CBC48AB940C4"
|
||||
$"8AB8FFC48AB940B9400002C442BDD2C442BDD2C5A7BEDDC7F4BDD2C6D6BE8CC7"
|
||||
$"F4BDD20002C411B6E5C411B6E5C471B4F3C66CB43EC470B209C66CB43E0002C7"
|
||||
$"29B6AEC729B6AEC818B4EFCA32B4D9C8F5B226CA32B4D902044030C34530BC3A"
|
||||
$"30304030BC3A30C3454050BC3A50C34550504050C34550BC3A240A0401220241"
|
||||
$"90000000000000003EA000C8D00049F0000A0312000102030405060708090A11"
|
||||
$"120F10132120123FAB1B0000000000004000003A5D4D41FFFF01178422040A00"
|
||||
$"0100123FAB1B0000000000004000003A5D4D41FFFF01178200040A000101123F"
|
||||
$"AB1B0000000000004000003A5D4D41FFFF01178200040A000102123FAB1B0000"
|
||||
$"000000004000003A5D4D41FFFF01178200040A000103123FAB1B000000000000"
|
||||
$"4000003A5D4D41FFFF01178200040A000104123FAB1B0000000000004000003A"
|
||||
$"5D4D41FFFF01178200040A000105123FAB1B0000000000004000003A5D4D41FF"
|
||||
$"FF01178200040A000106123FAB1B0000000000004000003A5D4D41FFFF011782"
|
||||
$"00040A000107123FAB1B0000000000004000003A5D4D41FFFF01178200040A01"
|
||||
$"0108023FAB1B0000000000004000003A5D4D41FFFF0A000109023FAB1B000000"
|
||||
$"0000004000003A5D4D41FFFF0A00010A123FAB1B0000000000004000003A5D4D"
|
||||
$"41FFFF01178122040A00010B023FAB1B0000000000004000003A5D4D41FFFF0A"
|
||||
$"00010C123FAB1B0000000000004000003A5D4D41FFFF01178122040A00010D02"
|
||||
$"3FAB1B0000000000004000003A5D4D41FFFF0A00010E123FAB1B000000000000"
|
||||
$"4000003A5D4D41FFFF01178122040A00010F023FAB1B0000000000004000003A"
|
||||
$"5D4D41FFFF0A000110123FAB1B0000000000004000003A5D4D41FFFF01178122"
|
||||
$"040A000111023FAB1B0000000000004000003A5D4D41FFFF0A000112123FAB1B"
|
||||
$"0000000000004000003A5D4D41FFFF01178122040A000113023FAB1B00000000"
|
||||
$"00004000003A5D4D41FFFF0A000114123FAB1B0000000000004000003A5D4D41"
|
||||
$"FFFF01178000040A020115023FAB1B0000000000004000003A5D4D41FFFF0A00"
|
||||
$"0116023FAB1B0000000000004000003A5D4D41FFFF0A000117123FAB1B000000"
|
||||
$"0000004000003A5D4D41FFFF01178000040A020118023FAB1B00000000000040"
|
||||
$"00003A5D4D41FFFF0A000119123FAB1B0000000000004000003A5D4D41FFFF01"
|
||||
$"178000040A02011A023FAB1B0000000000004000003A5D4D41FFFF0A00011B02"
|
||||
$"3FAB1B0000000000004000003A5D4D41FFFF0A00011C123FAB1B000000000000"
|
||||
$"4000003A5D4D41FFFF01178000040A02011D023FAB1B0000000000004000003A"
|
||||
$"5D4D41FFFF0A00011E123FAB1B0000000000004000003A5D4D41FFFF01178000"
|
||||
$"040A02011F123FAB1B0000000000004000003A5D4D41FFFF01178022040A0001"
|
||||
$"20123FAB1B0000000000004000003A5D4D41FFFF01178222040A000121123FAB"
|
||||
$"1B0000000000004000003A5D4D41FFFF0117822204"
|
||||
};
|
||||
|
||||
@@ -13,12 +13,12 @@ LICENSE="CC-BY-NC-SA-4.0"
|
||||
REVISION="1"
|
||||
|
||||
SOURCE_URI="https://github.com/jorio/Bugdom/archive/refs/tags/$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="64f266f7f749d9346b1202fdd191a0e445f6bb90372e32c7250b4fb679150523"
|
||||
CHECKSUM_SHA256="7ec27f7e438588b56da9797310b83bcf7bb31cc3343b0df8644ee1e4216710a8"
|
||||
SOURCE_DIR="Bugdom-$portVersion"
|
||||
PATCHES="bugdom-$portVersion.patchset"
|
||||
srcGitRev2="b9ddab06cdc0b9e4a8085e50974213b6c9625436"
|
||||
srcGitRev2="ef94150e2dcec522e3099f4d03a4e8f2639f7232"
|
||||
SOURCE_URI_2="https://github.com/jorio/Pomme/archive/$srcGitRev2.tar.gz"
|
||||
CHECKSUM_SHA256_2="96be755cbbcc2f4a3677dd4388599bad4b5cc771a55d927bb8ebe646d7142b52"
|
||||
CHECKSUM_SHA256_2="69faf616449c0737e238367883e36230f15d13c261e18d6e4d4c69e2edd0b002"
|
||||
SOURCE_FILENAME_2="Pomme-$srcGitRev2.tar.gz"
|
||||
SOURCE_DIR_2="Pomme-$srcGitRev2"
|
||||
PATCHES_2="bugdom-$portVersion-source2.patchset"
|
||||
@@ -54,7 +54,9 @@ BUILD()
|
||||
rm -rf extern/Pomme
|
||||
ln -s $sourceDir2 extern/Pomme
|
||||
# building
|
||||
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release
|
||||
cmake -S . -B build \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_SKIP_RPATH=ON
|
||||
cd build
|
||||
make $jobArgs
|
||||
}
|
||||
@@ -1,11 +1,11 @@
|
||||
From 792f76994bf09c2199ab3dc9706fb47b50803c69 Mon Sep 17 00:00:00 2001
|
||||
From 75d5582c109ef772719359d6585770781639af6d Mon Sep 17 00:00:00 2001
|
||||
From: Ivan Holmes <ivan@ivanholmes.co.uk>
|
||||
Date: Sat, 7 May 2022 00:34:04 +0100
|
||||
Subject: Use Haiku user settings dir
|
||||
|
||||
|
||||
diff --git a/src/Files/Files.cpp b/src/Files/Files.cpp
|
||||
index fac01b7..7bd15f8 100644
|
||||
index 301431e..c540aad 100644
|
||||
--- a/src/Files/Files.cpp
|
||||
+++ b/src/Files/Files.cpp
|
||||
@@ -12,6 +12,9 @@
|
||||
@@ -18,7 +18,7 @@ index fac01b7..7bd15f8 100644
|
||||
#endif
|
||||
|
||||
using namespace Pomme;
|
||||
@@ -179,6 +182,10 @@ OSErr FindFolder(short vRefNum, OSType folderType, Boolean createFolder, short*
|
||||
@@ -182,6 +185,10 @@ OSErr FindFolder(short vRefNum, OSType folderType, Boolean createFolder, short*
|
||||
return fnfErr;
|
||||
}
|
||||
path = fs::path(home) / "Library" / "Preferences";
|
||||
@@ -29,13 +29,6 @@ index fac01b7..7bd15f8 100644
|
||||
#else
|
||||
const char* home = getenv("XDG_CONFIG_HOME");
|
||||
if (home)
|
||||
@@ -400,4 +407,4 @@ OSErr SetFPos(short refNum, short posMode, long filePos)
|
||||
FSSpec Pomme::Files::HostPathToFSSpec(const fs::path& fullPath)
|
||||
{
|
||||
return dynamic_cast<HostVolume*>(volumes[0].get())->ToFSSpec(fullPath);
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
--
|
||||
2.30.2
|
||||
2.48.1
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
From 98ddda1eb217c7b29160e9b4bf1d059d487640cb Mon Sep 17 00:00:00 2001
|
||||
From caee2c30aec23eb07bd6dada075b826a9b350dce Mon Sep 17 00:00:00 2001
|
||||
From: Ivan Holmes <ivan@ivanholmes.co.uk>
|
||||
Date: Sun, 8 May 2022 23:47:25 +0100
|
||||
Subject: Add SDL2 header directory
|
||||
|
||||
|
||||
diff --git a/cmake/FindSDL2.cmake b/cmake/FindSDL2.cmake
|
||||
index e712dc3..bd22a3d 100644
|
||||
index f205218..35714f5 100644
|
||||
--- a/cmake/FindSDL2.cmake
|
||||
+++ b/cmake/FindSDL2.cmake
|
||||
@@ -55,7 +55,7 @@ elseif(APPLE)
|
||||
@@ -58,7 +58,7 @@ elseif(APPLE)
|
||||
else()
|
||||
find_path(SDL2_INCLUDE_DIRS "SDL.h"
|
||||
HINTS $ENV{SDL2DIR}
|
||||
@@ -18,20 +18,20 @@ index e712dc3..bd22a3d 100644
|
||||
)
|
||||
|
||||
--
|
||||
2.30.2
|
||||
2.48.1
|
||||
|
||||
|
||||
From 1430e364142efe2cd76b75cfe837b17c4af1ae5d Mon Sep 17 00:00:00 2001
|
||||
From ed8f266bcd59acaa0aebe95847576273ef9b960e Mon Sep 17 00:00:00 2001
|
||||
From: Ivan Holmes <ivan@ivanholmes.co.uk>
|
||||
Date: Sun, 8 May 2022 23:50:41 +0100
|
||||
Subject: Link with libbe
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 639c859..675a580 100644
|
||||
index 620a07a..76c4c95 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -93,6 +93,11 @@ elseif(APPLE)
|
||||
@@ -113,6 +113,11 @@ elseif(APPLE)
|
||||
${GAME_MAC_ICNS}
|
||||
${SDL2_LIBRARIES}
|
||||
)
|
||||
@@ -44,47 +44,53 @@ index 639c859..675a580 100644
|
||||
# Math lib, explicitly required on some Linux systems
|
||||
list(APPEND GAME_LIBRARIES m)
|
||||
--
|
||||
2.30.2
|
||||
2.48.1
|
||||
|
||||
|
||||
From bfccbbacef7e45f92c59b3578d153b5f276ad188 Mon Sep 17 00:00:00 2001
|
||||
From ad7babdeef194d89e4999f6f087795b12ebfb2d4 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Roberts <cpr420@gmail.com>
|
||||
Date: Sun, 8 May 2022 23:54:54 +0100
|
||||
Subject: locate data directory relative to the app on Haiku
|
||||
|
||||
|
||||
diff --git a/src/Main.cpp b/src/Main.cpp
|
||||
index d59905c..7bc444c 100644
|
||||
--- a/src/Main.cpp
|
||||
+++ b/src/Main.cpp
|
||||
@@ -17,6 +17,8 @@
|
||||
#include "killmacmouseacceleration.h"
|
||||
#include <libproc.h>
|
||||
#include <unistd.h>
|
||||
+#elif defined(__HAIKU__)
|
||||
diff --git a/src/Boot.cpp b/src/Boot.cpp
|
||||
index a9078a2..4770e3f 100644
|
||||
--- a/src/Boot.cpp
|
||||
+++ b/src/Boot.cpp
|
||||
@@ -13,6 +13,10 @@
|
||||
#include "game.h"
|
||||
#include "version.h"
|
||||
|
||||
+#if defined(__HAIKU__)
|
||||
+#include <image.h>
|
||||
#endif
|
||||
|
||||
+#endif
|
||||
+
|
||||
extern "C"
|
||||
@@ -51,6 +53,18 @@ static fs::path FindGameData()
|
||||
{
|
||||
// bare minimum to satisfy externs in game code
|
||||
@@ -229,7 +233,22 @@ int main(int argc, char** argv)
|
||||
std::string finalErrorMessage = "";
|
||||
bool showFinalErrorMessage = false;
|
||||
|
||||
dataPath = pathbuf;
|
||||
dataPath = dataPath.parent_path().parent_path() / "Resources";
|
||||
+#elif defined(__HAIKU__)
|
||||
+#if defined(__HAIKU__)
|
||||
+ char* executablePath = NULL;
|
||||
+
|
||||
+ int32 cookie = 0;
|
||||
+ image_info info;
|
||||
+ while (get_next_image_info(B_CURRENT_TEAM, &cookie, &info) == B_OK)
|
||||
+ {
|
||||
+ if (info.type == B_APP_IMAGE)
|
||||
+ {
|
||||
+ dataPath = info.name;
|
||||
+ dataPath = dataPath.parent_path() / "Data";
|
||||
+ executablePath = info.name;
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
#else
|
||||
dataPath = "Data";
|
||||
#endif
|
||||
+#else
|
||||
const char* executablePath = argc > 0 ? argv[0] : NULL;
|
||||
+#endif
|
||||
|
||||
// Start the game
|
||||
try
|
||||
--
|
||||
2.30.2
|
||||
2.48.1
|
||||
|
||||
Reference in New Issue
Block a user