haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Boxedwine: use system GLEW

Browse Source
This commit is contained in:
Gerasim Troeglazov
2021-09-24 14:10:12 +10:00
parent 06ba959b5b
commit 9da8d68acf
2 changed files with 65 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app-emulation/boxedwine/boxedwine-21.0.1.recipe
View File

@@ -46,7 +46,7 @@ BUILD_REQUIRES="
devel:libcrypto$secondaryArchSuffix
devel:libcurl$secondaryArchSuffix
devel:libgl$secondaryArchSuffix
devel:libglew$secondaryArchSuffix
devel:libglew$secondaryArchSuffix >= 2.2
devel:libglu$secondaryArchSuffix
devel:libminizip$secondaryArchSuffix
devel:libSDL2_2.0$secondaryArchSuffix

67
app-emulation/boxedwine/patches/boxedwine-21.0.1.patchset
View File

@@ -1,4 +1,4 @@
From 017b9026420efbbd66a10c5f4463eab3cabb5922 Mon Sep 17 00:00:00 2001
From 31078b4655db11a17af10d097b49c43f1686a190 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 24 Sep 2021 00:04:13 +1000
Subject: Fix build for Haiku
@@ -713,7 +713,7 @@ index c1f5f60..fd94771 100644
2.30.2
From 5dec799bd2851faba35fa77706e0812ee3e34480 Mon Sep 17 00:00:00 2001
From 05cab0820bcba981b058338e8e1c2cf7c668ec88 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 24 Sep 2021 11:57:35 +1000
Subject: Add makefile for Haiku build
@@ -983,7 +983,7 @@ index 0000000..a18debb
2.30.2
From a6542ccc3782596df2cc5d871c11142e73829ed5 Mon Sep 17 00:00:00 2001
From 99715b62145c418da38883fdb9e80baf2543e8c5 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 24 Sep 2021 13:19:50 +1000
Subject: Use system settings dir
@@ -1072,3 +1072,64 @@ index 232b1ed..d164793 100644
--
2.30.2
From be0024e15b82c4fae949ca1876376cfad307ea56 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 24 Sep 2021 14:00:34 +1000
Subject: Use system GLEW
diff --git a/project/haiku/Makefile b/project/haiku/Makefile
index d164793..1797876 100644
--- a/project/haiku/Makefile
+++ b/project/haiku/Makefile
@@ -2,7 +2,7 @@ NAME = Boxedwine
TYPE = APP
APP_MIME_SIG = application/x-vnd.boxedwine
-SRCS = ../../lib/glew/src/glew.cpp \
+SRCS = \
../../lib/imgui/addon/imguitinyfiledialogs.cpp \
../../lib/imgui/examples/imgui_impl_opengl2.cpp \
../../lib/imgui/examples/imgui_impl_sdl.cpp \
@@ -165,6 +165,7 @@ LIBS = \
bsd \
crypto \
GL \
+ GLEW \
GLU \
SDL2 \
minizip \
@@ -192,7 +193,6 @@ LOCAL_INCLUDE_PATHS = \
../../lib/poco/Util/include \
../../lib/poco/Foundation/include \
../../lib/poco/NetSSL_OpenSSL/include \
- ../../lib/glew/include \
../../lib/imgui
OPTIMIZE := FULL
--
2.30.2
From 8787574e1f77550efefd7999f362a500a74d687a Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 24 Sep 2021 14:02:19 +1000
Subject: Add SDL2 include for x86 arch
diff --git a/project/haiku/Makefile b/project/haiku/Makefile
index 1797876..55f6ff1 100644
--- a/project/haiku/Makefile
+++ b/project/haiku/Makefile
@@ -184,6 +184,7 @@ LIBPATHS = poco_build/lib
SYSTEM_INCLUDE_PATHS = \
/system/develop/headers/SDL2 \
+ /system/develop/headers/x86/SDL2 \
../../lib/imgui
LOCAL_INCLUDE_PATHS = \
--
2.30.2