 David Wimsey
|
41ff4e6162
Properly fix the Lua/check() macro collision
|
11 роки тому |
|
David Wimsey
|
38ea8ef14c
Merge branch 'hotfix/osx-lua-check-builtin-macro-collision-fix'
|
11 роки тому |
|
David Wimsey
|
637db9ba98
Merge branch 'hotfix/directx-skiplist-all'
|
11 роки тому |
|
David Wimsey
|
a7781d94c3
Avoids building DirectX 10 sample properly
|
11 роки тому |
|
David Wimsey
|
c395224d16
Fixes SKIP_DIRECTX_SAMPLES to actually skip building directx9 and directx10 samples
|
11 роки тому |
|
David Wimsey
|
a431ca14ef
Fix to avoid naming collisions between macros defined in AssertMacros.h on OSX and LuaType::check
|
11 роки тому |
|
David Wimsey
|
5c2558f69f
Merge pull request #173 from libRocket/feature/cmake-osx-lib-naming-convention
|
11 роки тому |
|
David Wimsey
|
84a78d139c
Removed Debug suffix completely based on input from Tom Mason @wheybags and general usage within other projects. Continuous integration builds use separate directories for build configuration type which works as well as the name suffix
|
11 роки тому |
|
David Wimsey
|
7b3d201a37
Merge pull request #203 from libRocket/feature/cmake-samples
|
11 роки тому |
|
David Wimsey
|
6669f3a2bd
Added default hint for SFML location in our dependancies directory
|
11 роки тому |
|
David Wimsey
|
eb75a98e93
Switched to using FindSFML.cmake from SFML distribution
|
11 роки тому |
|
David Wimsey
|
f1076e0f18
Various fixes to resolve issues with building python modules on OSX
|
11 роки тому |
|
David Wimsey
|
90cb3fe93c
Fix for GLEW enabled SFML builds
|
11 роки тому |
|
David Wimsey
|
e2e42d2481
Added SFML cmake support, only builds the SFML sample related to the version of SFML detected
|
11 роки тому |
|
David Wimsey
|
529a2f2c58
Added search for SDL in dependencies directory by default
|
11 роки тому |
|
David Wimsey
|
f4f1669123
Added support for building SDL sample via cmake, CMake only looks for SDL 1, but by setting SDL_LIBRARY, SDL_INCLUDE_DIR, SDL_IMAGE_LIBRARY, SDL_IMAGE_INCLUDE_DIR manually, SDL2 can be used. This will need to be patched up to properly support SDL2
|
11 роки тому |
|
David Wimsey
|
6bdab16941
Fixed bad include path for v2-fixes modules
|
11 роки тому |
|
David Wimsey
|
b0df057567
Moved our custom FindLua.cmake into v2fixes directory and only use this version when not using CMake 3 or later, when using later versions of CMake the built in FindLua is used to ensure we're always using the latest version
|
11 роки тому |
|
David Wimsey
|
d264834bb3
Added workaround for bugs with CMake 2.x FindFreetype package, uses an included version from 3.0 now if running on earlier versions. If running on CMake 3.0 or newer, no override is done to ensure the latest version is used
|
11 роки тому |
|
David Wimsey
|
da2a0dcaba
Merge pull request #170 from feature/directx10-example
|
11 роки тому |
|
David Wimsey
|
7f18d2bf01
Added dependencies search path for Lua includes and library
|
11 роки тому |
|
David Wimsey
|
cfc40c41e7
Merge pull request #190 from dwimsey/feature/lua-scripting
|
11 роки тому |
|
David Wimsey
|
579dce51f3
Various fixes to sync Lua scripting with recent updates
|
11 роки тому |
|
David Wimsey
|
6a351c1efe
Merge pull request #186 from libRocket/feature/scan-dependencies-dir
|
11 роки тому |
|
David Wimsey
|
dcb7b7f33e
Minor fixes for clarity
|
11 роки тому |
|
David Wimsey
|
e148bd5dfc
Merge branch 'master' of http://github.com/Gambini/libRocket into feature/lua-scripting
|
11 роки тому |
|
David Wimsey
|
6f17a257a6
Merge pull request #171 from dwimsey/feature/python-with-static-librocket
|
11 роки тому |
|
David Wimsey
|
2003339477
Merge pull request #178 from dwimsey/feature/cmake-cleanup-projectfiles
|
11 роки тому |
|
David Wimsey
|
4c99586310
Splits public header files into separate groups to allow CMake to build OSX Frameworks with the proper directory structure
|
11 роки тому |
|
David Wimsey
|
455804140e
Check the Dependencies directory for Freetype and Boost
|
11 роки тому |
