Commit graph

27 commits

Author SHA1 Message Date
bors[bot] c0fa444f3a Merge #1034
1034: Try to find external GLEW, pnglite and Wavpack  r=Learath2 a=heinrich5991

Allow for newer versions of Wavpack, fixes #1023.

Fixes #1016.
2018-02-13 02:02:07 +00:00
heinrich5991 94818ec1f0 Try to find external GLEW, pnglite and Wavpack
Allow for newer versions of Wavpack, fixes #1023.

Fixes #1016.
2018-02-12 23:29:45 +01:00
yangfl 1620fc9b0f Fix typo 2018-02-07 16:10:40 +08:00
heinrich5991 2593091380 Preliminary version of cross-compiled DMG archives
Currently they only contain the client and the archives are a lot larger
than the current release artifacts.
2017-11-09 00:16:52 +01:00
heinrich5991 ab2738ca1b Allow cross-compilation from Linux to macOS 2017-10-25 16:57:25 +02:00
heinrich5991 f3abdd43cb Add crypto and ssl if using bundled curl
Fixes #926.
2017-10-24 15:29:53 +02:00
Dennis Felsing 19a8054df6 Merge pull request #925 from heinrich5991/pr_ddnet_cmake_fix_bundle_libs
Only use bundled includes only if also using bundled libs
2017-10-24 12:24:50 +02:00
heinrich5991 5ef723c7f6 Only use bundled includes only if also using bundled libs
Fixes #867. Fixes #922.
2017-10-24 12:10:46 +02:00
heinrich5991 4c5115d742 Add toolchain files for MinGW 32- and 64-bit cross-compilation
Tested on Arch Linux. Fixes #807.
2017-10-24 01:22:17 +02:00
Dennis Felsing d6999bb726 Merge "Pull Request using OpenGL 3.3" 2017-10-18 12:49:27 +02:00
heinrich5991 ea978e1db7 Add a flag -DDOWNLOAD_GTEST to automatically download and build GTest
Enable tests on Circle CI, macOS on Travis and Appveyor.
2017-10-15 09:57:21 +02:00
Jupeyy 4d8cf36e29 add GLEW to cmake 2017-09-12 20:03:06 +02:00
heinrich5991 52e42c2f74 Add CMake config option PREFER_BUNDLED_LIBS
This makes CMake look at the provided libraries before considering
system libraries. Enable this by default on Windows.

Fixes #830.
2017-07-31 18:30:24 +02:00
heinrich5991 fd8bccb0f4 Fix the CMake Mac build
Fixes #805.
2017-07-26 04:30:56 +02:00
def 46f30a2fc1 Fix mysql cmake build 2017-07-22 21:53:55 +02:00
def c53f39c434 Let's try the nicer dll names on windows 2017-07-21 23:43:01 +02:00
def 1683b71cf9 Try to fix cmake for windows 2017-07-20 23:52:25 +02:00
def 41d9de997c ddnet-libs submodule and some fixes 2017-07-20 23:07:15 +02:00
heinrich5991 e7d8c44bcc Test on Travis CI
This will allow us to test on macOS in the future.
2017-03-28 02:00:21 +02:00
heinrich5991 ec0f0b28d7 Fix cmake/FindFreetype.cmake a bit 2017-03-19 17:18:17 +01:00
heinrich5991 a6983d329c CMakeLists.txt: Copy over data files and DLLs 2017-03-07 15:24:08 +01:00
heinrich5991 4389737288 CMakeLists.txt: Handle the static library case on Linux 2017-03-07 13:39:23 +01:00
heinrich5991 1157a9a835 CMakeLists.txt: Windows support? 2017-03-03 12:23:51 +01:00
heinrich5991 6980bb7b02 Improve the CMakeLists.txt to search for the bundled libs 2017-03-03 12:23:51 +01:00
necropotame 397ef29bed Add mariadb in FindMySQL.cmake 2017-02-23 16:23:16 +01:00
heinrich5991 aff784a7db Use pkg-config for freetype as well 2017-02-23 14:42:16 +01:00
heinrich5991 5d61aa0b6e Add CMakeLists.txt that work on my machine
It probably doesn't work on Windows, at least.
2017-02-23 14:16:32 +01:00