 David Wimsey
|
41ff4e6162
Properly fix the Lua/check() macro collision
|
11 years ago |
|
David Wimsey
|
b0cc467d4a
Merge branch 'hotfix/sfml2-opengl-includes' into stable
|
11 years ago |
|
David Wimsey
|
c6feeac24b
This fix deals with selecting the right OpenGL headers based on operating system using the existing code in the shell library.
|
11 years ago |
|
David Wimsey
|
38ea8ef14c
Merge branch 'hotfix/osx-lua-check-builtin-macro-collision-fix'
|
11 years ago |
|
David Wimsey
|
637db9ba98
Merge branch 'hotfix/directx-skiplist-all'
|
11 years ago |
|
David Wimsey
|
a7781d94c3
Avoids building DirectX 10 sample properly
|
11 years ago |
|
David Wimsey
|
c395224d16
Fixes SKIP_DIRECTX_SAMPLES to actually skip building directx9 and directx10 samples
|
11 years ago |
|
David Wimsey
|
a431ca14ef
Fix to avoid naming collisions between macros defined in AssertMacros.h on OSX and LuaType::check
|
11 years ago |
|
David Wimsey
|
5c2558f69f
Merge pull request #173 from libRocket/feature/cmake-osx-lib-naming-convention
|
11 years ago |
|
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 years ago |
|
David Wimsey
|
7b3d201a37
Merge pull request #203 from libRocket/feature/cmake-samples
|
11 years ago |
|
David Wimsey
|
6669f3a2bd
Added default hint for SFML location in our dependancies directory
|
11 years ago |
|
David Wimsey
|
eb75a98e93
Switched to using FindSFML.cmake from SFML distribution
|
11 years ago |
|
David Wimsey
|
9c043cf763
Merge pull request #208 from libRocket/feature/osx-python-fixes
|
11 years ago |
|
David Wimsey
|
a3317ea5f3
Merge pull request #205 from bruceoutdoors/invaders-sample-fix
|
11 years ago |
 Lee Zhen Yong
|
f9d4f01685
fixed bug that cause invaders sample to be unable to run
|
11 years ago |
|
David Wimsey
|
f1076e0f18
Various fixes to resolve issues with building python modules on OSX
|
11 years ago |
|
David Wimsey
|
2150818ee6
Merge branch 'hotfix/issue-137' into stable
|
11 years ago |
|
David Wimsey
|
18a0c5db05
Merge branch 'hotfix/issue-137'
|
11 years ago |
|
David Wimsey
|
fea7fa35bc
Cleans up properties referring to a data source when the DataSource object is destroyed, fixes #137
|
11 years ago |
 Aleksey Kuleshov
|
409e96bbd7
satisfy CSS2 specification for LEFT, RIGHT, TOP, BOTTOM
|
11 years ago |
|
David Wimsey
|
96db5cc7ec
Merge branch 'doc-updates' of https://github.com/dwimsey/libRocket
|
11 years ago |
|
David Wimsey
|
8761d12977
Hack for functional non-compiled geometry in DirectX samples, this means the debugger will at least display now.
|
11 years ago |
|
David Wimsey
|
a63199d727
Update basic copyright info
|
11 years ago |
|
David Wimsey
|
b521c28567
Merge pull request #198 from libRocket/feature/resizable-samples-shell-windows
|
11 years ago |
|
David Wimsey
|
90cb3fe93c
Fix for GLEW enabled SFML builds
|
11 years ago |
|
David Wimsey
|
e2e42d2481
Added SFML cmake support, only builds the SFML sample related to the version of SFML detected
|
11 years ago |
|
David Wimsey
|
529a2f2c58
Added search for SDL in dependencies directory by default
|
11 years ago |
|
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 years ago |
|
David Wimsey
|
da1ee910f2
Added note for luainvaders sample
|
11 years ago |
