mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-15 08:10:07 +02:00
codeblocks: new recipe (#5009)
* codeblocks: new recipe * codeblocks, disable for all architectures --------- Co-authored-by: Schrijvers Luc <begasus@gmail.com>
This commit is contained in:
50
dev-util/codeblocks/patches/codeblocks-20.03.patchset
Normal file
50
dev-util/codeblocks/patches/codeblocks-20.03.patchset
Normal file
@@ -0,0 +1,50 @@
|
||||
From 90a82a200e423868a2b6e607b02c933c2cd7576a 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 d9808a9..f89dd51 100644
|
||||
--- a/src/src/app.h
|
||||
+++ b/src/src/app.h
|
||||
@@ -22,7 +22,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.26.0
|
||||
|
||||
|
||||
From f6bf52b28d6702629a153a4df2a0b74156d91cfd 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 4ec80b1..a1370b7 100644
|
||||
--- a/src/src/app.cpp
|
||||
+++ b/src/src/app.cpp
|
||||
@@ -412,7 +412,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.26.0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user