Skip to content
Snippets Groups Projects
Commit 4777241e authored by Roman Tsisyk's avatar Roman Tsisyk
Browse files

Add luajit as a submodule and fix cmake/luajit.cmake

parent 94477bdc
No related branches found
No related tags found
No related merge requests found
[submodule "third_party/luajit"]
path = third_party/luajit
url = http://luajit.org/git/luajit-2.0.git
......@@ -152,9 +152,6 @@ macro(luajit_build)
add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/third_party/luajit/src/libluajit.a
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/third_party/luajit
COMMAND $(MAKE) clean
COMMAND $(MAKE) -C src -t buildvm_x86.h buildvm_arm.h
buildvm_x64.h buildvm_x64win.h buildvm_ppc.h
buildvm_ppcspe.h
COMMAND $(MAKE) -C src ${luajit_buildoptions}
DEPENDS ${CMAKE_SOURCE_DIR}/CMakeCache.txt
)
......@@ -166,9 +163,6 @@ macro(luajit_build)
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/third_party/luajit
COMMAND cp -r ${PROJECT_SOURCE_DIR}/third_party/luajit/* .
COMMAND $(MAKE) clean
COMMAND $(MAKE) -C src -t buildvm_x86.h buildvm_arm.h
buildvm_x64.h buildvm_x64win.h buildvm_ppc.h
buildvm_ppcspe.h
COMMAND $(MAKE) -C src ${luajit_buildoptions}
DEPENDS ${PROJECT_BINARY_DIR}/CMakeCache.txt ${PROJECT_BINARY_DIR}/third_party/luajit
)
......
......@@ -11,11 +11,8 @@ cvs up
How to update luajit
====================
- download the latest release source tarball
- replace the contents of the luajit directory
with the contents of the tarball
- merge the original Makefile and the Makefile
from the new tarball.
Run from project root dir:
git submodule update --reference v2.0.1-fixed -- third_party/luajit
How to update libobjc2
======================
......
luajit @ e7633dba
Subproject commit e7633dba1e446763454a7969ce7e27139debc6cd
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment