blob: 87f8198c27e813edee2cd3a0e942624724d0cbfb (
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
|
diff -Naur xbmc-9.11-8.4/configure.in xbmc-9.11-8.5/configure.in
--- xbmc-9.11-8.4/configure.in 2010-01-24 06:05:15.000000000 +0100
+++ xbmc-9.11-8.5/configure.in 2010-01-24 06:41:46.000000000 +0100
@@ -1329,7 +1329,13 @@
if test "$host_vendor" = "apple" ; then
rm -f CMakeCache.txt && CC="" CXX="" cmake -D CMAKE_C_FLAGS:STRING="-fno-common" -D CMAKE_CXX_FLAGS:STRING="-fno-common" -D CMAKE_BUILD_TYPE:STRING=RelWithDebInfo -D USE_FTGL:BOOL=OFF .
else
- rm -f CMakeCache.txt && CC="" CXX="" cmake -D CMAKE_BUILD_TYPE:STRING=RelWithDebInfo -D USE_FTGL:BOOL=OFF .
+set -x
+ rm -f CMakeCache.txt && cmake -DCMAKE_BUILD_TYPE=None -DUSE_FTGL:BOOL=OFF \
+ -DCMAKE_C_FLAGS="${CFLAGS}" -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
+ -DCMAKE_INSTALL_PREFIX="${prefix}" -DCMAKE_INSTALL_LIBDIR:PATH="${libdir}" \
+ -DINCLUDE_INSTALL_DIR:PATH="${includedir}" -DLIB_INSTALL_DIR:PATH="${_libdir}" \
+ -DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" -DSHARE_INSTALL_PREFIX:PATH="${datadir}" .
+set +x
fi
], [0])
diff -Naur xbmc-9.11-8.4/xbmc/visualizations/XBMCProjectM/libprojectM/CMakeLists.txt xbmc-9.11-8.5/xbmc/visualizations/XBMCProjectM/libprojectM/CMakeLists.txt
--- xbmc-9.11-8.4/xbmc/visualizations/XBMCProjectM/libprojectM/CMakeLists.txt 2009-12-08 04:05:05.000000000 +0100
+++ xbmc-9.11-8.5/xbmc/visualizations/XBMCProjectM/libprojectM/CMakeLists.txt 2010-01-24 06:41:46.000000000 +0100
@@ -116,7 +116,7 @@
ENDIF(FTGL_FOUND)
# todo: change this because its obscure and probably not being used
- set (FTGL_INCLUDE_DIRS "/opt/local/include")
+# set (FTGL_INCLUDE_DIRS "/opt/local/include")
set (FTGL_LINK_DIRS)
set (FTGL_LINK_TARGETS )
ENDIF(USE_FTGL)
|
