Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
slight tweak to lua linking (that will break everything, i'm sure)
authorkoda
Tue, 25 Sep 2012 00:35:49 +0200
changeset 7704 b25add2fdfa6
parent 7703 78d2ac987f41
child 7705 15f5d3cd35c6
slight tweak to lua linking (that will break everything, i'm sure)
CMakeLists.txt file | annotate | diff | comparison | revisions
misc/liblua/CMakeLists.txt file | annotate | diff | comparison | revisions 
--- a/CMakeLists.txt	Sat Sep 22 19:14:58 2012 +0400
+++ b/CMakeLists.txt	Tue Sep 25 00:35:49 2012 +0200
@@ -217,11 +217,7 @@
     message(STATUS "Lua library not found, building bundled dependency")
     add_subdirectory(misc/liblua)
     #linking with liblua.a requires system readline -- this works everywhere, right?
-    if(WIN32)
-        set(pascal_flags "-k${CMAKE_BINARY_DIR}/bin/liblua.dll.a" "-k-lreadline" ${pascal_flags})
-    else()
-        set(pascal_flags "-k${CMAKE_BINARY_DIR}/bin/liblua.a" "-k-lreadline" ${pascal_flags})
-    endif()
+    set(pascal_flags "-k${EXECUTABLE_OUTPUT_PATH}/lib${LUA_LIBRARY}.a" "-k-lreadline" ${pascal_flags})
 endif()
 
 add_subdirectory(hedgewars)
--- a/misc/liblua/CMakeLists.txt	Sat Sep 22 19:14:58 2012 +0400
+++ b/misc/liblua/CMakeLists.txt	Tue Sep 25 00:35:49 2012 +0200
@@ -14,6 +14,7 @@
 else(WIN32)
     add_definitions(-DLUA_USE_LINUX)
     add_library(lua STATIC ${lua_src})
+    set(LUA_LIBRARY lua)
 endif(WIN32)
hedgewars