Commit graph

18 commits

Author SHA1 Message Date
Philipp Zabel
b6f3b7614b Fix compilation of multithreading example on Debian with CMake 3.5.1
Compilation of the multithreading example on Debian with CMake 3.5.1 would
fail with the following error because ${PTHREAD} was not set:
    [ 61%] Linking CXX executable bin/multithreading
    /usr/bin/ld: CMakeFiles/multithreading.dir/multithreading/multithreading.cpp.o: undefined reference to symbol 'pthread_create@@GLIBC_2.2.5'
This patch uses ${CMAKE_THREAD_LIB_INIT} [1] instead, initialized using
find_package(Threads REQUIRED).

[1] https://cmake.org/cmake/help/v2.8.12/cmake.html#module:FindThreads
2016-04-03 11:14:47 +02:00
saschawillems
52ffbb59bb Added multi threading example to cmake and android build 2016-04-02 12:08:19 +02:00
saschawillems
1e3dcb98b6 Added multisampling example to cmake and android build 2016-03-29 21:41:56 +02:00
saschawillems
fb9bbb1ce7 Added raytracing example to cmakelists and android build batches 2016-03-28 11:15:25 +02:00
Sascha Willems
6a4345c3e1 Merge pull request #101 from 1ace/remove-vk-prototype
Remove VK_PROTOTYPES define
2016-03-27 13:30:31 +02:00
Sascha Willems
0871de25bd Merge pull request #83 from dcbaker/pr/cmake-find-assimp
cmake: Add FindASSIMP.cmake
2016-03-27 13:19:00 +02:00
Eric Engestrom
caabf520f2 Remove VK_PROTOTYPES
This guard macro was inverted shortly before the release;
use VK_NO_PROTOTYPES when you do *not* want the prototypes.
2016-03-22 00:25:50 +00:00
Dylan Baker
35275bf8ef cmake: Add FindASSIMP.cmake
This find module addresses the problem raised by debian (non-sid) and
Ubuntu (and possibly other distributions) that don't install the cmake
config files.

This FindModule will try to use a config file, but will fall back to
using find_library if it can't.

It will unset any variables provided by the config that the find path
wont also expose.
2016-03-16 15:10:02 -07:00
saschawillems
08394eae30 Added particle fire example to cmakelists 2016-03-16 20:58:11 +01:00
Dylan Baker
bc90df5a9b CMakeLists.txt: use find_package for assimp on linux
assimp as an upstream provides a cmake-config file
(https://github.com/assimp/assimp/blob/master/assimp-config.cmake.in)
that can be used to in place of find library.

This may be usable on windows as well, but I don't have such a system to
test on.
2016-03-14 10:59:14 -07:00
Dylan Baker
b3218d5db8 CMakeLists.txt: Rename ASSIMP_LIB to ASSIMP_LIBRARIES
The latter name is used by the upstream cmake-config file, and will be
used in the next patch.
2016-03-14 10:57:42 -07:00
Dylan Baker
c6122adcda CMakeLists.txt: Move libassimp.dll.a to windows side of if/else
This is a dll, and clearly meant for use on windows not on Linux.
2016-03-14 10:55:17 -07:00
Sascha Willems
80c6fc0206 Fixed CMakeLists.txt to reflect name changes and shadow mapping example addition 2016-02-29 10:46:17 +01:00
Sascha Willems
599738839f Merge pull request #22 from encelo/patch-1
Fix CMake project name
2016-02-23 10:25:40 +01:00
Sascha Willems
4d08348f01 Added sekeltalanimation example to CMakeLists #25 2016-02-19 08:10:42 +01:00
Angelo Theodorou
0166680572 Fix CMake project name
The CMake project name is set to be the same as the name of the first example.
I suggest it gets changed to the name of the Visual Studio solution included in the repository.
2016-02-18 17:35:55 +00:00
Andrey Kazantsev
a91852433d Fix needed for outsource build 2016-02-16 19:33:57 +02:00
saschawillems
c91341813c Added Vulkan examples sources! 2016-02-16 15:07:25 +01:00