Commit Graph

53 Commits

Author SHA1 Message Date
Yao Wei Tjong 姚伟忠
3ba62f036e
Fix the STATIC and SHARED build for VS and Xcode.
Cleanup comments.
2020-05-10 23:30:59 +08:00
Yao Wei Tjong 姚伟忠
0e4d095cfa
Shed off old construct since our CMake minimum required is 3.10.2 now. 2020-05-10 15:53:52 +08:00
Modanung
2650e38855 Reduced minimum required cmake version to 3.10.2 2020-01-22 22:27:07 +08:00
Yao Wei Tjong 姚伟忠
46c6894d78
Bump CMake minimum required version to 3.14.5. 2020-01-12 12:37:22 +08:00
urho3d-travis-ci
1151b8a2d6 Travis CI: bump copyright to 2020. 2020-01-05 06:21:40 +00:00
urho3d-travis-ci
a476f0c401 Travis CI: bump copyright to 2019. 2019-01-12 01:00:16 +00:00
Eugene Kozlov
4862785ab7 Fix PackageTool build. 2018-06-04 18:05:16 +03:00
Yao Wei Tjong 姚伟忠
6d08bcd8c0
Clang-Tidy - hicpp-member-init. 2018-02-25 23:32:38 +08:00
urho3d-travis-ci
70049ba582 Travis CI: bump copyright to 2018.
[cache clear]
2018-01-01 05:35:37 +00:00
Yao Wei Tjong 姚伟忠
ca97fd9b9b Clang-Tidy - modernize-use-auto. 2017-12-31 12:46:26 +08:00
Yao Wei Tjong 姚伟忠
ec84cfdfd1 Remove the usage of add_compiler_export_flags() deprecated function.
Fix #1945.
2017-07-13 23:17:09 +08:00
Yao Wei Tjong
108530ff45 Merge pull request #1921 from cosmy1/libs-update
Libs update
2017-04-28 09:36:14 +08:00
cosmy
7902fba3b9 Replace deprecated LZ4 functions in Urho3D. 2017-04-26 20:15:04 +02:00
Svyatoslav
128230d462 PackageTool.cpp: PVS-Studio: fixed conditional expression of the loop.
Signed-off-by: Svyatoslav <razmyslov@viva64.com>
2017-04-25 18:25:02 +03:00
Yao Wei Tjong 姚伟忠
f32cbb72b0 Rename Urho3D-CMake-common.cmake module to UrhoCommon.cmake.
To be consistent with the other modules. Drop the '3D' simply because it sticks out in 'Urho3DCommon'.
2017-03-05 08:45:39 +08:00
Yao Wei Tjong 姚伟忠
73c97d9f64 Only add defines at the scope they are actually required. 2017-03-05 08:45:38 +08:00
Yao Wei Tjong 姚伟忠
9f19d51c08 Remove older constructs that have been earmarked previously. 2017-03-05 08:34:41 +08:00
Yao Wei Tjong 姚伟忠
3475afba54 Bump the CMake minimum version in the CMakeLists.txt files. 2017-03-05 08:34:41 +08:00
urho3d-travis-ci
ee054a1507 Travis CI: bump copyright to 2017.
[ccache clear]
2017-01-01 13:01:31 +00:00
Yao Wei Tjong 姚伟忠
f1d1b757b8 Change all CMakeLists.txt to use LF for consistency sake. 2016-12-05 22:33:59 +08:00
Lasse Öörni
939e7c9fd3 Revert "String + number operator". Remove String + operator with char parameter to prevent accidental truncation and replace with string literal concatenation where needed.
This reverts commit fafd921f32.
2016-08-07 18:18:27 +03:00
Yao Wei Tjong 姚伟忠
d15553fce9 Fix building of PackageTool target due to inclusion of new class. 2016-05-21 12:02:53 +08:00
Yao Wei Tjong 姚伟忠
4f72a673d9 Fix the compression ratio calculation. Suppress compilation warnings. 2016-05-14 22:57:14 +08:00
Yao Wei Tjong 姚伟忠
c28634c206 Minor enhancement on the PackageTool to have output option. 2016-05-14 15:07:14 +08:00
Yao Wei Tjong 姚伟忠
f5fcfc48f1 Set CMake minimum version to 3.2.3 for Windows platform.
This is in preparation to use optional components feature of find_package() command for FindDirectX.cmake module (was FindDirect3D).
2016-03-16 01:45:08 +08:00
urho3d-travis-ci
c4f6f315ff Travis CI: bump copyright to 2016.
[ccache clear]
2016-01-26 13:55:03 +00:00
Yao Wei Tjong 姚伟忠
44e7322e4e Enable LuaJIT universal binary build on OSX platform.
Enable universal binary executables by default when targeting 64-bit OSX platform.
2016-01-21 10:56:58 +08:00
Lasse Öörni
4a6d39beee Implement missing applying of basepath to package file entries. Closes #1147. 2016-01-11 16:23:21 +02:00
Yao Wei Tjong 姚伟忠
21b01fcd5b Refactor how the EXE and SHARED linker flags are being setup. 2016-01-06 16:38:59 +08:00
Yao Wei Tjong 姚伟忠
1cd242273e Verify found Urho3D library has matching ABI with the chosen compiler.
Check the CMake minimum version before setting project name as recommended by CMake.
Minor documentation update on how to setup downstream projects using Urho3D library as external library.
For AppVeyor - attempt to add scaffolding test using Urho3D SDK.
2015-12-14 22:43:00 +08:00
Yao Wei Tjong 姚伟忠
55286eb820 Fix host-tool building.
[skip appveyor]
2015-12-13 17:43:54 +08:00
Yao Wei Tjong 姚伟忠
32fb97b5c9 Avoid SDL dependency when building mini Urho for PackageTool target.
[skip appveyor] [ci only: Emscripten]
2015-11-26 19:56:13 +08:00
Yao Wei Tjong 姚伟忠
353ee7f870 Remove force include as now export header is auto-included once again. 2015-09-03 22:40:13 +08:00
Yao Wei Tjong 姚伟忠
c2471a240a Reorganize includes for Samples and Extras.
Since the URHO3D_PCH build option is made available to support non-PCH build, our build system does not rely on precompiled header to include the Urho3D.h export header anymore. The export header is auto-included by one of Urho3D headers when it is required using the right format with the help of URHO3D_IS_BUILDING compiler define. As such, there is no need to explicitly include Urho3D.h in external project too. Sorry for the flip-flop.
2015-08-27 18:07:20 +08:00
Yao Wei Tjong 姚伟忠
5fb6482e14 Add dependent C++ source file when building PackageTool for Emscripten.
[ci only: Emscripten]
2015-08-10 01:51:26 +08:00
Yao Wei Tjong 姚伟忠
41d9ab29a9 For Travis CI - add CI build jobs for Direct3D 11.
Fix Emscripten build due to earlier faulty fix on MinGW build to support building of PackageTool for both host and target systems.
2015-03-30 23:02:01 +08:00
Yao Wei Tjong 姚伟忠
a66df72ff5 Fix host tool building and relinking dependency.
Also fix an issue with CMake reconfiguration where the internal cache work against the regeneration of the custom RESOURCE_CHECK target.
2015-02-13 21:31:59 +08:00
Yao Wei Tjong 姚伟忠
8471dcf3e4 Add option to package resource dirs and treat those dirs as build deps.
Fix static library building using emar instead of ar (from host compiler toolchain).
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 姚伟忠
ed214bbeb3 Avoid the include dirs hack for finding the Urho3D.h header.
It is now a library user own's responsibility to include the Urho3D.h in their source code. Or to include it as part of their own precompiled header similar to what Urho3D project has done.
2015-01-20 18:15:29 +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 姚伟忠
359efb2d37 Move the DebugNew.h from Urho3D/Container subdir to Urho3D subdir. 2015-01-05 22:31:32 +08:00
Yao Wei Tjong 姚伟忠
b51e419c88 Change impl. file to include the header file from corresponding subdir.
Change header file to use relative pathspec when including other files.
2015-01-04 22:40:40 +08:00
Yao Wei Tjong 姚伟忠
4feb135281 Clean up SDK include dirs. Refactor FindUrho3D CMake module.
For Travis CI - add new steps to install the Urho3D SDK and to reference Urho3D library from the installed SDK.
2015-01-04 22:32:41 +08:00
Yao Wei Tjong 姚伟忠
0425358f5c Fix GCC Makefile build on Mac OS X platform. 2014-04-12 19:31:19 +08:00
Lasse Öörni
6d5ddc23e0 Bump the copyright for 2014. 2014-02-01 14:37:21 +02:00
Lasse Öörni
c057b29dba Unify how command line options are shown in utilities.
Added note in documentation about lack of space between command line option and its parameter.
Prepend Materials/ to the material list written by OgreImporter (assume "standard" materials subdirectory.)
2013-10-30 18:49:27 +02:00
Yao Wei Tjong 姚伟忠
e423a26461 Refactor CMake build scripts.
Changes:
- Avoid globbing engine source files twice.
- Setup folder group for VS and Xcode. Also group object files according to 3rd-party library name.
- New define_source_files() macro.
2013-10-28 18:21:18 +08:00
Lasse Öörni
02df5b2d02 Write package file size to the end of package files. If package signature is not found from the file beginning, seek to file end and read the size, then seek backward to check if the package file is concatenated eg. in the executable. Alternatively the start offset can be specified manually when opening a package file. Closes #27. 2013-10-24 00:06:19 +03:00
Yao Wei Tjong 姚伟忠
d33ac02538 Refactor build scripts to build Urho3D library as main target.
Other changes in the commit:
- Change build option from URHO3D_BUILD_TYPE to URHO3D_LIB_TYPE. Default value is STATIC.
- Automatically add compiler definition 'URHO3D_STATIC_DEFINE' when linking with Urho3D library statically.
- Move LuaScript subsystem from Extra/ to Engine/.
- Enable FindUrho3D module to also detect Urho3D library target when the FindUrho3D module is being used internally by Urho3D project.
- Configure to build all the samples for iOS and Android platforms also when option to build samples is enabled.
- Export all the Register*Library() global functions.
- Rewrite all the tools, samples, and extras targets to link against Urho3D library.

TODOs:
- Combine engine sub-libraries into one.
- Test builds on non-Linux platforms.
2013-10-21 02:28:29 +08:00