mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 14:38:51 +02:00
45 lines
1.2 KiB
Plaintext
45 lines
1.2 KiB
Plaintext
From 0bd024622a84da627e47b0fbc0da26359f7e2e79 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
|
Date: Sun, 10 Dec 2017 11:27:28 +0100
|
|
Subject: Platform fixes
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 3920896..254a4db 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -337,7 +337,7 @@ endif()
|
|
if(NOT NO_CUDA)
|
|
find_package(CUDA 4.0)
|
|
endif()
|
|
-if(NOT NO_GLFW AND NOT NO_OPENGL AND NOT ANDROID AND NOT IOS)
|
|
+if(NOT NO_GLFW AND NOT NO_OPENGL AND NOT ANDROID AND NOT IOS AND NOT HAIKU)
|
|
find_package(GLFW 3.0.0)
|
|
endif()
|
|
if(NOT NO_PTEX)
|
|
--
|
|
2.16.1
|
|
|
|
|
|
From da6fa9031b56dada1b92902b38c50b90e2b5f4f8 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
|
Date: Sat, 30 Dec 2017 19:18:39 +0100
|
|
Subject: GLEW detection
|
|
|
|
|
|
diff --git a/cmake/FindGLEW.cmake b/cmake/FindGLEW.cmake
|
|
index 6fa8e89..bcd5252 100644
|
|
--- a/cmake/FindGLEW.cmake
|
|
+++ b/cmake/FindGLEW.cmake
|
|
@@ -73,6 +73,7 @@ if (${CMAKE_HOST_UNIX})
|
|
HINTS
|
|
"${GLEW_LOCATION}/include"
|
|
"$ENV{GLEW_LOCATION}/include"
|
|
+ "$ENV{GLEW_INC_LOCATION}"
|
|
PATHS
|
|
/usr/include
|
|
/usr/local/include
|
|
--
|
|
2.16.1
|
|
|