blob: 071c1b053f7ac53def085bd6901706862ed8488b (
plain)
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
|
gentoo specific hacks because we unbundle the
deps of irrlicht
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09edd58..1f51a30 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,6 @@ add_subdirectory("${PROJECT_SOURCE_DIR}/lib/enet")
include_directories("${PROJECT_SOURCE_DIR}/lib/enet/include")
# Build the irrlicht library
-add_subdirectory("${PROJECT_SOURCE_DIR}/lib/irrlicht")
include_directories("${PROJECT_SOURCE_DIR}/lib/irrlicht/include")
# Build the Wiiuse library
@@ -137,6 +136,13 @@ else()
endif()
+# Irrlicht
+if (APPLE)
+ set(IRRLICHT_LIBRARY "/Library/Frameworks/IrrFramework.framework")
+else()
+ set(IRRLICHT_LIBRARY ${PROJECT_SOURCE_DIR}/lib/irrlicht/lib/Linux/libIrrlicht.a)
+endif()
+
# Set some compiler options
if(UNIX)
@@ -226,12 +232,17 @@ target_link_libraries(supertuxkart
bulletcollision
bulletmath
enet
- stkirrlicht
${CURL_LIBRARIES}
+ ${IRRLICHT_LIBRARIES}
${OGGVORBIS_LIBRARIES}
+ ${IRRLICHT_LIBRARY}
${IRRLICHT_XF86VM_LIBRARY}
${OPENAL_LIBRARY}
- ${OPENGL_LIBRARIES})
+ ${OPENGL_LIBRARIES}
+ png
+ jpeg
+ bz2
+ z)
if(APPLE)
# In theory it would be cleaner to let CMake detect the right dependencies. In practice, this means that if a OSX user has
|
GitWeb
