|
 |
2fe344e |
diff -uNr supertuxkart-0.9.orig/cmake/FindAngelscript.cmake supertuxkart-0.9/cmake/FindAngelscript.cmake
|
|
|
2fe344e |
--- supertuxkart-0.9.orig/cmake/FindAngelscript.cmake 1970-01-01 03:00:00.000000000 +0300
|
|
|
3bfd6f0 |
+++ supertuxkart-0.9/cmake/FindAngelscript.cmake 2015-05-18 17:04:56.631871672 +0300
|
|
|
2fe344e |
@@ -0,0 +1,34 @@
|
|
|
2fe344e |
+# - Try to find enet
|
|
|
2fe344e |
+# Once done this will define
|
|
|
2fe344e |
+#
|
|
|
2fe344e |
+# ANGELSCRIPT_FOUND - system has enet
|
|
|
2fe344e |
+# Angelscript_INCLUDE_DIRS - the enet include directory
|
|
|
2fe344e |
+# Angelscript_LIBRARIES - the libraries needed to use enet
|
|
|
2fe344e |
+#
|
|
|
2fe344e |
+
|
|
|
2fe344e |
+FIND_PATH(Angelscript_INCLUDE_DIRS angelscript.h
|
|
|
2fe344e |
+ PATHS
|
|
|
2fe344e |
+ /usr/local
|
|
|
2fe344e |
+ /usr
|
|
|
2fe344e |
+ PATH_SUFFIXES include
|
|
|
2fe344e |
+ )
|
|
|
2fe344e |
+
|
|
|
2fe344e |
+FIND_LIBRARY(Angelscript_LIBRARY
|
|
|
2fe344e |
+ NAMES angelscript
|
|
|
2fe344e |
+ PATHS
|
|
|
2fe344e |
+ /usr/local
|
|
|
2fe344e |
+ /usr
|
|
|
2fe344e |
+ PATH_SUFFIXES lib
|
|
|
2fe344e |
+ )
|
|
|
2fe344e |
+
|
|
|
2fe344e |
+# handle the QUIETLY and REQUIRED arguments and set ANGELSCRIPT_FOUND to TRUE if
|
|
|
2fe344e |
+# all listed variables are TRUE
|
|
|
2fe344e |
+INCLUDE(FindPackageHandleStandardArgs)
|
|
|
2fe344e |
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Angelscript DEFAULT_MSG Angelscript_LIBRARY Angelscript_INCLUDE_DIRS)
|
|
|
2fe344e |
+
|
|
|
2fe344e |
+IF (ANGELSCRIPT_FOUND)
|
|
|
2fe344e |
+ SET(Angelscript_LIBRARIES ${Angelscript_LIBRARY})
|
|
|
2fe344e |
+ENDIF (ANGELSCRIPT_FOUND)
|
|
|
2fe344e |
+
|
|
|
2fe344e |
+MARK_AS_ADVANCED(Angelscript_LIBRARY Angelscript_LIBRARIES Angelscript_INCLUDE_DIRS)
|
|
|
2fe344e |
+
|
|
|
2fe344e |
diff -uNr supertuxkart-0.9.orig/CMakeLists.txt supertuxkart-0.9/CMakeLists.txt
|
|
|
2fe344e |
--- supertuxkart-0.9.orig/CMakeLists.txt 2015-05-14 12:28:55.707748866 +0300
|
|
|
3bfd6f0 |
+++ supertuxkart-0.9/CMakeLists.txt 2015-05-18 17:04:56.631871672 +0300
|
|
|
2fe344e |
@@ -119,10 +119,9 @@
|
|
|
2fe344e |
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") # Enable multi-processor compilation (faster)
|
|
|
2fe344e |
endif()
|
|
|
2fe344e |
|
|
|
2fe344e |
-
|
|
|
2fe344e |
-# Build the angelscript library
|
|
|
2fe344e |
-add_subdirectory("${PROJECT_SOURCE_DIR}/lib/angelscript/projects/cmake")
|
|
|
2fe344e |
-include_directories("${PROJECT_SOURCE_DIR}/lib/angelscript/include")
|
|
|
2fe344e |
+# Angelscript
|
|
|
2fe344e |
+find_package(Angelscript REQUIRED)
|
|
|
2fe344e |
+include_directories(${Angelscript_INCLUDE_DIRS})
|
|
|
2fe344e |
|
|
|
2fe344e |
# OpenAL
|
|
|
2fe344e |
if(APPLE)
|
|
|
2fe344e |
@@ -309,7 +308,7 @@
|
|
|
2fe344e |
${ENet_LIBRARIES}
|
|
|
2fe344e |
glew
|
|
|
2fe344e |
stkirrlicht
|
|
|
2fe344e |
- angelscript
|
|
|
2fe344e |
+ ${Angelscript_LIBRARIES}
|
|
|
2fe344e |
${CURL_LIBRARIES}
|
|
|
2fe344e |
${OGGVORBIS_LIBRARIES}
|
|
|
2fe344e |
${OPENAL_LIBRARY}
|
|
|
3bfd6f0 |
diff -uNr supertuxkart-0.9.orig/src/scriptengine/scriptarray.cpp supertuxkart-0.9/src/scriptengine/scriptarray.cpp
|
|
|
3bfd6f0 |
--- supertuxkart-0.9.orig/src/scriptengine/scriptarray.cpp 2015-04-21 14:32:22.244216774 +0300
|
|
|
3bfd6f0 |
+++ supertuxkart-0.9/src/scriptengine/scriptarray.cpp 2015-05-18 17:06:44.849918355 +0300
|
|
|
3bfd6f0 |
@@ -1496,7 +1496,8 @@
|
|
|
3bfd6f0 |
continue;
|
|
|
3bfd6f0 |
|
|
|
3bfd6f0 |
// The parameter must either be a reference to the subtype or a handle to the subtype
|
|
|
3bfd6f0 |
- int paramTypeId = func->GetParamTypeId(0, &flags);
|
|
|
3bfd6f0 |
+ int paramTypeId;
|
|
|
3bfd6f0 |
+ func->GetParam(0, ¶mTypeId, &flags, NULL, NULL);
|
|
|
3bfd6f0 |
|
|
|
3bfd6f0 |
if( (paramTypeId & ~(asTYPEID_OBJHANDLE|asTYPEID_HANDLETOCONST)) != (subTypeId & ~(asTYPEID_OBJHANDLE|asTYPEID_HANDLETOCONST)) )
|
|
|
3bfd6f0 |
continue;
|