Commit Graph

108 Commits

Author SHA1 Message Date
Yao Wei Tjong 姚伟忠
d31fbf2f45 Fix LuaJIT SSE2 detection on 32-bit MSVC build. 2015-10-29 21:49:34 +08:00
Yao Wei Tjong 姚伟忠
2e4a076e5e Fix LuaJIT SSE2 detection on 32-bit MinGW build. 2015-10-29 19:48:07 +08:00
Yao Wei Tjong 姚伟忠
566d0767e2 Fix Android and Rasperry-Pi cross-compiling build due to LuaJIT change.
[ci only: Android, RPI]
2015-09-26 13:12:08 +08:00
Yao Wei Tjong 姚伟忠
add1c2c67b Fix a typo which had caused wrong LuaJIT OS to be detected. 2015-09-26 12:50:50 +08:00
Yao Wei Tjong 姚伟忠
7a80b37c22 Fix URHO3D_PACKAGING build option on Windows platform with SHARED lib.
[ci scan]
2015-07-12 19:04:19 +08:00
Yao Wei Tjong 姚伟忠
6923bd0736 Install tools to the 'bin/tool' directory.
Related to commit 6b6447eb8c.
2015-06-10 18:39:39 +08:00
Yao Wei Tjong 姚伟忠
6125f08716 Fix MinGW build when PackageTool is built for both host and target. 2015-03-30 20:47:13 +08:00
Yao Wei Tjong 姚伟忠
10e477bbc8 Add flag to consider 'unresolved symbol' as an error. 2015-02-16 14:51:28 +08:00
Yao Wei Tjong 姚伟忠
a77e24d8ad Enable external project macro users to find and use PackageTool.
Adjust software packaging for Emscripten.
2015-02-13 21:31:59 +08:00
Lasse Öörni
bb2ebf7568 Bump copyright to 2015. 2015-01-31 21:03:53 +02:00
Yao Wei Tjong 姚伟忠
05dd995b85 Refactor all the codes and scripts to use the renamed 'bin' subdir. 2015-01-18 21:40:54 +08:00
Yao Wei Tjong 姚伟忠
d8c2d801d9 Update the comment on the build rule. [ci skip]
Related to commit 8682ba781a
2015-01-16 13:26:33 +08:00
Yao Wei Tjong 姚伟忠
8682ba781a Install header files for Lua/LuaJIT and tolua++ 3rd party libraries.
Fixes #610.
2015-01-16 13:20:44 +08:00
Yao Wei Tjong 姚伟忠
dc620f1f6a Code clean up. [ci skip] 2015-01-07 22:02:41 +08:00
Yao Wei Tjong 姚伟忠
35307869ee Clean up to remove unused CMake variables.
LIBS is now defunct. No more dual purpose usage.
INCLUDE_DIRS_ONLY is renamed to INCLUDE_DIRS.
LINK_LIBS_ONLY is renamed to LIBS.
2015-01-07 21:51:00 +08:00
Yao Wei Tjong 姚伟忠
4c17b03173 Remove existing include path abstraction.
Remove engine's sub-CMakeLists.txt.
2015-01-04 22:32:42 +08:00
Yao Wei Tjong 姚伟忠
a6a9e9891f Clean up the LuaJIT build script - use normal replace in escaping vars. 2015-01-04 22:32:39 +08:00
Yao Wei Tjong 姚伟忠
8e6fe0da14 Refactor LuaJIT build scripts - no more generated CMakeLists.txt. 2015-01-04 22:32:39 +08:00
Yao Wei Tjong 姚伟忠
67e415acc8 Fine tune LuaJIT target arch detection logic. 2015-01-04 22:32:39 +08:00
Yao Wei Tjong 姚伟忠
0af8a30650 Fix 32-bit LuaJIT build for Linux&OSX. Fix host tool building for iOS. 2015-01-04 22:32:39 +08:00
Yao Wei Tjong 姚伟忠
4db162eb62 Lua/LuaJIT host tool building while cross-compiling in one go.
For Travis CI - reenable CI build with Lua/LuaJIT build option turned on.
2015-01-04 22:32:39 +08:00
Yao Wei Tjong 姚伟忠
20e21050e9 Rename everything 'RASPI' to 'RPI'. [ci rebase] 2015-01-04 22:32:38 +08:00
Yao Wei Tjong 姚伟忠
d8a3b8b4f4 Make repo root is also CMake source tree for the Urho3D project.
Build tree location is now fully user defined. The build tree location could also be the same as source tree, although it is not recommended.
2015-01-04 22:32:38 +08:00
Yao Wei Tjong 姚伟忠
0fb99af9e4 Misc. fixes and enhancement for Android platform.
- Add initial support for ndk-gdb. Enable via new 'URHO3D_NDK_GDB' build option.
- Enhance rake android task: more effective loop to wait for Android device, ability to pick library to run from SampleLauncher from the adb shell.
- Fix "buildvm" tool name for Android to derive from the correct NDK ABI CMake's variable.
- Fix Android toolchain to copy shared STL library to the correct Android library output directory.
2014-11-19 21:50:37 +08:00
Yao Wei Tjong 姚伟忠
c711d450ed Name Android buildvm tool for LuaJIT library differently based on ABI. 2014-11-19 21:48:25 +08:00
Yao Wei Tjong 姚伟忠
c1b506ee54 Clean up build scripts to avoid code duplication. 2014-05-16 13:12:52 +08:00
Yao Wei Tjong 姚伟忠
b1fbab4953 Be explicit in setting the file permissions when installing.
Closes #352.
2014-05-15 21:14:09 +08:00
Yao Wei Tjong 姚伟忠
46285baf97 Refactor build scripts to group Urho3D specific build option.
Initial support of project configuration and generation via cmake-gui.
2014-04-05 00:20:56 +08:00
Yao Wei Tjong 姚伟忠
20edf417ce Fix LuaJIT search path which was broken after v2.0.3 update. 2014-03-27 14:09:40 +08:00
Yao Wei Tjong 姚伟忠
bceb1a9c61 Updated to LuaJIT 2.0.3. Closes #266. 2014-03-19 19:57:18 +08:00
aster2013
4a50e3d78d Add lua_getmainthread function to return main thread. 2014-02-27 19:04:11 +08:00
Yao Wei Tjong 姚伟忠
4d565aa401 Add new 'package' CMake built-in target for generating binary packages.
This is in preparation for setting up Travis CI build to upload binary packages to a central hosting server.
2014-02-21 15:43:31 +08:00
Yao Wei Tjong 姚伟忠
8ef4dc47eb Better integration of MinGW cross-compiling build process.
- Runtime and archive output directories change to mingw-Bin and mingw-Lib, respectively.
- Enable SCP_TO_TARGET build option for all cross-compiling build process (except Android).
- Enable LuaJIT support for MinGW cross-compiling build.
- Cache MinGW toolchain path and sysroot.
- Fix "object file is too big" issue when building Assimp library in debug build using MinGW.
- Reorder the build processes documentation section to match the Readme.txt file.
2014-02-15 13:34:42 +08:00
Yao Wei Tjong 姚伟忠
0c41be144f Use CMake path instead of native path. Closes #188. 2014-02-11 23:53:29 +08:00
Yao Wei Tjong 姚伟忠
327ab9af76 Minor tweak to link lua/luajit tool without Urho3D dependency libs.
These changes should also reduce prerequisite for building 32-bit luaJIT VM (for Android and RASPI) on 64-bit host/build system.
2014-02-11 13:47:36 +08:00
Yao Wei Tjong 姚伟忠
8c898864d4 Fix Android build. Closes #181. 2014-02-08 20:46:46 +08:00
Yao Wei Tjong 姚伟忠
c5fe4a5698 Fix LuaJIT build script to add dependency files for luajit executable.
The luajit executable should now be able to generate Lua bytecode files in Bin/ directory under the project root directory or in any directory when Urho3D SDK is installed in the filesystem.
2014-02-08 00:36:07 +08:00
Lasse Öörni
6d5ddc23e0 Bump the copyright for 2014. 2014-02-01 14:37:21 +02:00
Yao Wei Tjong 姚伟忠
e91307ce51 Clean up build scripts to adhere to format convention. 2014-01-13 17:36:00 +08:00
Yao Wei Tjong 姚伟忠
60dad27d5f Fix Mac OS X and iOS build from external CMake project.
Since the CMake minimum is bumped up, set the policy CMP0022 to NEW. Incidentally it is also required to be so to stop the static libraries dependency from being transitively get included to other targets that links to Urho3D shared library.
2013-12-17 08:00:11 +08:00
Yao Wei Tjong 姚伟忠
963c46d15b Refactor build scripts.
- Close issue #67, Urho3D iOS library should be built correctly now (either as single arch or as multiple archs Mach-O universal binary). Urho3D library build for Mac OS X and iOS platforms do not rely on CMake hack 'object-collecting' approach anymore. It uses Apple static linker 'ld' tool to merge all objects from third-party *.a directly.
- Add new custom target (Urho3D_universal) for iOS platform to build a single Mach-O universal binary library consists of both iphoneos (universal ARM archs) and iphonesimulator (i386 arch).
- Introduce PLATFORM_PREFIX (ios-, raspi-, android-) to prefix the build and output directories (Build, Bin, Lib).
- Correct Xcode-specific build setting for Mac OS X desktop build to use the latest OS X SDK but set deployment target to current OS X of the build system, unless CMAKE_OSX_DEPLOYMENT_TARGET is set explicitly to build for other target.
- Temporary workaround for CMake/Xcode generator bug where it always appends '/build' path element to SYMROOT attribute and as such the items in Products are always rendered as red as if they are not yet built.
- Change Assimp target to use setup_library() macro so that it gets the same settings (and workaround) as all other targets.
- Add a conditional check to prevent MSVC to build 'buildvm-android' target as it is not supported at this moment.
2013-12-15 18:25:00 +08:00
Yao Wei Tjong 姚伟忠
ac6d9f40b0 Fix documentation build on platforms that do not have tool targets.
- Prevent 'make clean' or its equivalent to remove the generated ScriptAPI.dox and LuaScriptAPI.dox in the 'Docs' subdirectory.
- Always refresh the generated API Doxygen files before building 'doc' target when the tools are available.
- Move document-build binary directory into the respective project main binary directory.
2013-11-27 18:14:45 +08:00
Yao Wei Tjong 姚伟忠
484f855127 Build Lua and LuaJIT standalone interpreter and bytecode compiler.
Use the internal standalone lua/luajit interpreter for dumping LuaScript API doxygen file.
2013-11-27 00:28:59 +08:00
Yao Wei Tjong 姚伟忠
c37ac56ec3 Added license notice. 2013-10-19 22:24:25 +08:00
Yao Wei Tjong 姚伟忠
cfe7ccf21c Replaced the logic to use VARIANT variable instead.
The CMAKE_CROSSCOMPILING variable cannot be used here because it will be always false since 'buildvm-*' is only built natively (not cross-compiling).
2013-10-16 00:44:57 +08:00
Yao Wei Tjong 姚伟忠
5896e52552 Filter target architecture information if the tool is available.
The initial target architecture detection for LuaJIT on Raspberry Pi native build was painfully slow due to the amount of output produced by compiler.
The filter reduces the number of output rows and speeds up the process significantly.
2013-10-14 10:39:31 +08:00
Yao Wei Tjong 姚伟忠
405e89b5f2 Fixed LuaJIT native build on Raspberry Pi.
Missed out one more condition check before applying -m32/64 flag.
2013-10-14 00:22:32 +08:00
Yao Wei Tjong 姚伟忠
441ab9e5d4 Fixed LuaJIT native build on Raspberry Pi.
Only set the assembler flag to either -m32 or -m64 when the target architecture is X64.
2013-10-13 21:46:58 +08:00
Yao Wei Tjong 姚伟忠
74601477fe Support LuaJIT amalgamated build.
Added new build option ENABLE_LUAJIT_AMALG.
2013-10-12 22:26:43 +08:00
Yao Wei Tjong
76ba362179 Rephrased instructions to overcome CMake error for LuaJIT cross-compilation build. 2013-10-09 00:59:19 +08:00
Yao Wei Tjong
756728d5d1 Fixed 32-bit LuaJIT compilation on Linux platform. 2013-10-08 23:26:02 +08:00
Lasse Öörni
f6213623ed Workaround for VS2008 64-bit mode. 2013-10-08 12:45:49 +03:00
Yao Wei Tjong
28ab693b6a Fixed LuaJIT CMake error on Windows platform. 2013-10-08 15:47:14 +08:00
Yao Wei Tjong
2b90804c6e Fixed LuaJIT build on Linux, both native and cross-compiling.
The following platforms should be now supported:
Windows, Linux, Mac OS X, IOS, Android, and Raspberry Pi. Not all platforms are fully tested yet.

Cross-compilation may work on GCC/CLang only.
2013-10-08 12:22:56 +08:00
Aster Jian
68a081f0b5 Fix minilua link error on Linux. 2013-10-01 05:58:11 +00:00
Aster Jian
11674b421a Fix LuaJIT CMakeLists.txt. 2013-09-30 05:09:44 +00:00
Aster Jian
eccf0fefdd Set generated file to CMAKE_CURRENT_BINARY_DIR/generated folder. 2013-09-29 15:01:28 +00:00
Aster Jian
a570bb8ad6 Add LuaJIT support in LuaScript module, please use ENABLE_LUA_JIT to enable it, just test on Windows. 2013-09-29 14:38:03 +00:00