1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
From: =?utf-8?q?=22IOhannes_m_zm=C3=B6lnig_=28Debian/GNU=29=22?=
<umlaeute@debian.org>
Date: Fri, 27 Mar 2020 09:15:56 +0100
Subject: Use system provided STB image loading
Origin: Debian
Forwarded: not-needed
Last-Update: 2019-10-17
Last-Update: 2019-10-17
---
code/CMakeLists.txt | 20 ++++++++++----------
.../SimpleTexturedOpenGL/src/model_loading.cpp | 2 +-
2 files changed, 11 insertions(+), 11 deletions(-)
--- assimp.orig/code/CMakeLists.txt
+++ assimp/code/CMakeLists.txt
@@ -1232,16 +1232,16 @@
ENDIF()
# stb
-IF(ASSIMP_HUNTER_ENABLED)
- hunter_add_package(stb)
- find_package(stb CONFIG REQUIRED)
-ELSE()
- SET( stb_SRCS
- ../contrib/stb/stb_image.h
- )
- INCLUDE_DIRECTORIES("../contrib")
- SOURCE_GROUP( Contrib\\stb FILES ${stb_SRCS})
-ENDIF()
+#IF(ASSIMP_HUNTER_ENABLED)
+# hunter_add_package(stb)
+# find_package(stb CONFIG REQUIRED)
+#ELSE()
+# SET( stb_SRCS
+# ../contrib/stb/stb_image.h
+# )
+# INCLUDE_DIRECTORIES("../contrib")
+# SOURCE_GROUP( Contrib\\stb FILES ${stb_SRCS})
+#ENDIF()
# VC2010 fixes
if(MSVC10)
--- assimp.orig/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp
+++ assimp/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp
@@ -24,7 +24,7 @@
#endif // _MSC_VER
#define STB_IMAGE_IMPLEMENTATION
-#include "contrib/stb/stb_image.h"
+#include "stb/stb_image.h"
#ifdef _MSC_VER
#pragma warning(default: 4100) // Enable warning 'unreferenced formal parameter'
|
