mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 13:20:08 +02:00
95 lines
3.0 KiB
Plaintext
95 lines
3.0 KiB
Plaintext
From 73e932983745bf071cc7e10fec607ab01b31d031 Mon Sep 17 00:00:00 2001
|
|
From: Calvin Hill <calvin@hakobaito.co.uk>
|
|
Date: Tue, 12 May 2020 17:26:53 +0000
|
|
Subject: codeblocks: Fix build by defining wxqt
|
|
|
|
|
|
diff --git a/src/src/app.h b/src/src/app.h
|
|
index 1107547..61acc07 100644
|
|
--- a/src/src/app.h
|
|
+++ b/src/src/app.h
|
|
@@ -18,7 +18,7 @@
|
|
#include <wx/docview.h> // recent files history
|
|
#endif
|
|
|
|
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
|
|
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__) || defined(__WXQT__)
|
|
#include "resources/icons/app.xpm"
|
|
#endif
|
|
|
|
--
|
|
2.51.0
|
|
|
|
|
|
From 18c4659ada73488707a890df14f4e27cf506c75e Mon Sep 17 00:00:00 2001
|
|
From: Calvin Hill <calvin@hakobaito.co.uk>
|
|
Date: Sat, 23 May 2020 02:29:41 +0100
|
|
Subject: codeblocks: Use /data/codeblocks to load resources.zip
|
|
|
|
|
|
diff --git a/src/src/app.cpp b/src/src/app.cpp
|
|
index 50668cb..6979ae4 100644
|
|
--- a/src/src/app.cpp
|
|
+++ b/src/src/app.cpp
|
|
@@ -404,7 +404,11 @@ bool CodeBlocksApp::LoadConfig()
|
|
data = env;
|
|
}
|
|
|
|
- data.append(_T("/share/codeblocks"));
|
|
+ #if defined(__HAIKU__)
|
|
+ data.append(_T("/data/codeblocks"));
|
|
+ #else
|
|
+ data.append(_T("/share/codeblocks"));
|
|
+ #endif
|
|
|
|
// Make sure the path to our resources is always an absolute path, because resource loading
|
|
// would fail with a relative path if some part of the code changes the current working
|
|
--
|
|
2.51.0
|
|
|
|
|
|
From f37b6038fae68529d17aef323077179bf97a7729 Mon Sep 17 00:00:00 2001
|
|
From: Luc Schrijvers <begasus@gmail.com>
|
|
Date: Tue, 21 Oct 2025 20:20:10 +0200
|
|
Subject: define NO_AR
|
|
|
|
|
|
diff --git a/src/plugins/compilergcc/depslib/src/fileunix.c b/src/plugins/compilergcc/depslib/src/fileunix.c
|
|
index dca5473..5db0be5 100644
|
|
--- a/src/plugins/compilergcc/depslib/src/fileunix.c
|
|
+++ b/src/plugins/compilergcc/depslib/src/fileunix.c
|
|
@@ -112,6 +112,7 @@ struct ar_hdr /* archive file member header - printable ascii */
|
|
|
|
# if defined( OS_QNX ) || \
|
|
defined( OS_BEOS ) || \
|
|
+ defined( __HAIKU__ ) || \
|
|
defined( OS_MPEIX )
|
|
# define NO_AR
|
|
# define HAVE_AR
|
|
--
|
|
2.51.0
|
|
|
|
|
|
From 2c0d1ccd761b1b42d95baa40f72a5cbcf0dc46c2 Mon Sep 17 00:00:00 2001
|
|
From: Luc Schrijvers <begasus@gmail.com>
|
|
Date: Wed, 22 Oct 2025 10:54:11 +0200
|
|
Subject: manually set path for plugins
|
|
|
|
|
|
diff --git a/src/sdk/configmanager.cpp b/src/sdk/configmanager.cpp
|
|
index 78ab5f9..27e5c19 100644
|
|
--- a/src/sdk/configmanager.cpp
|
|
+++ b/src/sdk/configmanager.cpp
|
|
@@ -1511,7 +1511,7 @@ void ConfigManager::InitPaths()
|
|
if (!wxDirExists(ConfigManager::plugin_path_global) && wxIsPlatform64Bit())
|
|
{
|
|
// if standard-path does not exist and we are on 64-bit system, use lib64 instead
|
|
- ConfigManager::plugin_path_global = ((const wxStandardPaths&)wxStandardPaths::Get()).GetInstallPrefix() + _T("/lib64/codeblocks/plugins");
|
|
+ ConfigManager::plugin_path_global = "/system/lib/codeblocks/plugins";
|
|
}
|
|
#endif // __WXGTK__
|
|
}
|
|
--
|
|
2.51.0
|
|
|