Commit graph

699 commits

Author SHA1 Message Date
Jupeyy 152a71546f Add DPI awareness support for MSVC compiling for Win8.1 and Win10 2017-10-22 03:34:15 +02:00
heinrich5991 d01c892bbd Don't copy files twice in CMakeLists.txt 2017-10-20 12:22:46 +02:00
Dennis Felsing f679c3e1bd GLEW_STATIC 2017-10-20 11:52:18 +02:00
Dennis Felsing 6c7f6e3a7e glew on macosx as well... 2017-10-20 11:49:00 +02:00
Dennis Felsing 5a75dc7f27 New glew try 2017-10-20 11:35:44 +02:00
Dennis Felsing 88c0778b21 Bundle glew instead 2017-10-20 11:12:27 +02:00
Dennis Felsing d6999bb726 Merge "Pull Request using OpenGL 3.3" 2017-10-18 12:49:27 +02:00
heinrich5991 6452c7e5c3 Enable automatic download of GTest on Windows by default 2017-10-15 10:25:26 +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
heinrich5991 e989ffad78 Rename async_* to aio_* and add test for nondivisible buffer lengths 2017-10-13 02:48:42 +02:00
heinrich5991 2fc018aac3 Add asynchronous file output, port dbg_msg()s to that system
Also add tests.
2017-10-10 04:11:14 +02:00
heinrich5991 7de42a1414 Couple of thread fixes 2017-10-10 00:08:24 +02:00
Learath2 d15dcd3c58 Merge pull request #871 from heinrich5991/ddnet_teehistorian
Teehistorian
2017-10-09 18:42:27 +02:00
Redix 134a79a225 Move RaceHelper to src/game/client 2017-10-06 22:13:35 +02:00
Redix b1e7138847 Added ghost file handling classes 2017-09-28 16:01:56 +02:00
heinrich5991 f43480aeed Add testing infrastructure for teehistorian 2017-09-28 02:03:30 +02:00
heinrich5991 72a17da716 Change to C++11 in CMakeLists.txt, bam.lua 2017-09-21 23:34:51 +02:00
Dennis Felsing 94c7c8d864 Use C++14 2017-09-21 15:11:09 +02:00
heinrich5991 6ef9c8dbcd First working version of teehistorian
teehistorian records all inputs from the players as well as the player
positions in each tick. It stores this info in a highly compressible
output format (I've achived 5x compression using xz or bz2).
2017-09-20 02:16:11 +02:00
Jupeyy cb1ab7ff9e sort opengl_sl files alphabetically 2017-09-16 18:58:24 +02:00
def 75d3eeaa09 Try linking against security framework on macosx 2017-09-16 11:39:09 +02:00
Dennis Felsing f60eb5658f Merge pull request #836 from heinrich5991/pr_ddnet_unify_icons
Unify icons for gcc and MSVC, fix server icon
2017-09-16 11:18:40 +02:00
heinrich5991 a34b1f4dd7 Add compatibility with older CMake for package 2017-09-13 22:38:25 +02:00
Jupeyy 7e0146be97 replace tabs with spaces 2017-09-13 20:09:40 +02:00
Jupeyy de43d410fe merged cmakelist 2017-09-12 21:03:27 +02:00
Jupeyy 629bf2c5f9 Merge branch 'master' of https://github.com/ddnet/ddnet 2017-09-12 20:24:58 +02:00
Jupeyy 4d8cf36e29 add GLEW to cmake 2017-09-12 20:03:06 +02:00
heinrich5991 8b2e31620f Compatibility with older CMake
Copy each file individually, only pass --type parameter for creating
zips.
2017-09-05 21:52:54 +02:00
heinrich5991 45d944162a Add package targets independent of CPack
This makes packaging compatible to CMake versions prior to CMake 3.6.
2017-09-05 16:00:50 +02:00
heinrich5991 38c26de47b Add install, package and package_source targets to CMake
On Linux, `install` installs DDNet into the normal file system (root
rights required).

`package` tries to create an archive similar to today's release archives
and `package_source` tries to create a source archive similar to today's
source archives.
2017-09-05 15:55:38 +02:00
def 89ed22e8d8 Introduce ddnet-info.json
- Single json file containing all information for the client
- Fetched from https://info.ddnet.tw/info?name=deen
- Replaces versionsrv, news, ddnet-maps.json and ddnet-ranks.json
- Servers are sorted by most popular ones for respective player
- Always stays < 100 ms response time, compared to occasional 50 s for
  old ddnet-ranks.json
2017-09-03 17:42:04 +02:00
heinrich5991 659e1ff527 Merge pull request #853 from Redix/pr_ghost_time
Ghost and Race demo time extraction fix
2017-08-31 12:31:20 +02:00
Redix a396e40c5e Move race helper functions to own cpp file
Fix some style issues
2017-08-31 00:17:16 +02:00
heinrich5991 de2fd75a16 Add possibility to write tests
Also add a test for `IStorage::StripPathAndExtension`
2017-08-30 21:57:55 +02:00
Redix f1f7e4e30b Fix ghost and race recorder time parsing 2017-08-30 21:44:27 +02:00
sctt 0849fa6024 fixing map_resave and adding map_replace_image
Update datafile.h

Update datafile.cpp

Update datafile.cpp

Update map_resave.cpp

Update datafile.h

Update map_resave.cpp

Update datafile.h

Update datafile.cpp

Update config_store.cpp

Update config_retrieve.cpp

Update io.cpp

Update gamecontext.cpp

Update config_store.cpp

Update CMakeLists.txt

Create map_replace_image.cpp

Update map_replace_image.cpp

fixing bug with height and witdth
2017-08-29 16:21:16 +02:00
Learath2 77ca505e74 Do not continue without python
We can not compile without python anyways.
2017-08-03 18:44:36 +02:00
heinrich5991 05f136fdfb Unify icons for gcc and MSVC, fix server icon 2017-08-01 21:43:56 +02:00
heinrich5991 523f35205d Statically link standard libraries in MinGW for CMake
Hopefully fixes the CMake MinGW build.
2017-08-01 01:37:54 +02:00
Dennis Felsing fd1b6763e1 Merge pull request #821 from heinrich5991/pr_ddnet_cmake_list_files
List all source files instead of globbing them in `CMakeLists.txt`
2017-07-31 20:45:13 +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
def cb6158dd6a safeseh:no only for msvc 2017-07-30 14:35:06 +02:00
heinrich5991 83742a98ca List all source files instead of globbing them in CMakeLists.txt
This seems to be wanted by CMake, it results in never having to re-run
`cmake`.

See e.g. https://stackoverflow.com/a/18538444/870079.
2017-07-30 11:41:52 +02:00
Learath2 4622ab4cb6 Merge pull request #814 from heinrich5991/pr_ddnet_fix_cmake_mac
Fix the CMake Mac build
2017-07-30 11:38:12 +02:00
heinrich5991 6247aa0c7f Enable -Wextra and -Wformat=2
Also annotate `dbg_msg`, `str_format` and `str_timestamp_ex` so that the
compiler can determine whether the format strings are correct.

Fix the compiler warnings generated by these extra warnings -- some of
them were security issues.
2017-07-27 20:38:17 +02:00
heinrich5991 fd8bccb0f4 Fix the CMake Mac build
Fixes #805.
2017-07-26 04:30:56 +02:00
def 3de72f66e3 mysql needs CONF_SQL defined everywhere 2017-07-23 01:36:36 +02:00
def 46f30a2fc1 Fix mysql cmake build 2017-07-22 21:53:55 +02:00
def 8e4a4d673f New Windows MSVC try 2017-07-22 11:46:43 +02:00
def 39b0c9282f SAFESEH:NO 2017-07-22 09:59:27 +02:00
def 8082a461ce Windows linker fix 2017-07-22 00:27:52 +02:00
def 609adcfe8c Windows linker fix 2017-07-22 00:20:29 +02:00
def 6b9386ce86 Windows compiler fix 2017-07-22 00:02:00 +02:00
def 0db98b218b Fix icons 2017-07-21 23:54:58 +02:00
def a7439af1ff Syntax 2017-07-21 23:12:07 +02:00
def 6a76bf9b73 Add some debugging to cmake 2017-07-21 23:06:07 +02:00
def 41d9de997c ddnet-libs submodule and some fixes 2017-07-20 23:07:15 +02:00
def 2365958227 Fix cmake build of map_extract 2017-06-12 21:23:45 +02:00
heinrich5991 743c58e4ae Revert "Fix OSX cmake build"
This reverts commit 3406f01ff9.
2017-06-09 19:34:01 +02:00
Learath2 3406f01ff9 Fix OSX cmake build
A little crude but it works.
2017-06-09 16:05:04 +02:00
heinrich5991 5ae37e6c72 Add protocol extension with UUIDs
This system can easily be extended by independent authors without
collisions, something the old system with plain increasing integers did
not allow.

Do this by utilizing the previously unused message code `NETMSG_NULL`
which has a value of 0.

This works for engine and game messages, snapshot items and events.
2017-05-25 00:52:43 +02:00
heinrich5991 713b3db4a2 CMakeLists.txt: Make the versionsrv's dependency on nethash.cpp explicit 2017-03-28 12:50:19 +02:00
Dennis Felsing 90b51d140a Merge pull request #688 from heinrich5991/pr_ddnet_cmake_client_link_order
Fix link order for the client libraries
2017-03-20 08:29:30 +01:00
heinrich5991 d52870cb35 Remove GREATER_EQUAL (introduced in CMake 3.7) 2017-03-19 17:18:17 +01:00
heinrich5991 57009f6467 Generator expressions using COMPILE_LANGUAGE are only available from 3.3 2017-03-19 17:18:17 +01:00
heinrich5991 efb43ddff8 Remove usages of target_sources
This command would require CMake 3.1.
2017-03-19 17:18:17 +01:00
heinrich5991 5eb2068f75 Check if -fstack-protector-all works before using it
MinGW apparantly accepts this flag, but can't successfully link
afterwards.
2017-03-18 11:55:50 +01:00
heinrich5991 d10ab196f5 Fix link order for the client libraries
Fixes #686.
2017-03-18 01:20:55 +01:00
heinrich5991 5b8052ff9d CMakeLists.txt: Check for _FORTIFY_SOURCE defines even harder 2017-03-13 16:45:27 +01:00
Redix 50be0ab7cf Use static CRT on windows 2017-03-12 17:41:57 +01:00
Redix 2b91785415 Use multiple cores in MSVC 2017-03-12 17:28:42 +01:00
Redix dfdd08ae7a Disable some warnings on win64 2017-03-12 17:28:40 +01:00
Redix 3911504bd9 Minor cmake fixes
zlib is already included in DEPS_CLIENT
2017-03-12 16:19:23 +01:00
Redix 8b418292c2 Fix typo in CMakeLists.txt 2017-03-12 15:56:44 +01:00
heinrich5991 253857e236 CMakeLists.txt: Create the generated source directory
Problem was reported on IRC, in #teeworlds on Quakenet.
2017-03-11 13:25:52 +01:00
heinrich5991 fad7989243 CMakeLists.txt: Check for _FORTIFY_SOURCE before defining it 2017-03-07 16:47:27 +01:00
heinrich5991 51b4a793b8 CMakeLists.txt: Add icon to DDNet executable on Windows 2017-03-07 15:32:11 +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 d98abf35db Rename WEBSOCKETS to CONF_WEBSOCKETS 2017-03-07 13:03:37 +01:00
heinrich5991 c201d7959c Enable -Wdeclaration-after-statement for compat with MSVC 2017-03-07 13:02:37 +01:00
heinrich5991 0d342f139c CMakeLists.txt: Add tools target 2017-03-03 15:23:18 +01:00
heinrich5991 9b0561bbc0 CMakeLists.txt: Add some EXCLUDE_FROM_ALL 2017-03-03 15:17:12 +01:00
heinrich5991 e6dcd94fc4 CMakeLists.txt: Fix Windows build and ignore some more warnings 2017-03-03 15:10:21 +01:00
heinrich5991 8407416042 CMakeLists.txt: Move everything to target_* commands 2017-03-03 15:04:13 +01:00
heinrich5991 0fb13159d5 CMakeLists.txt: Squelch some warnings on Windows 2017-03-03 13:39:06 +01:00
heinrich5991 254793604c CMakeLists.txt: Group sources by directory in MSVC 2017-03-03 13:29:35 +01:00
heinrich5991 1157a9a835 CMakeLists.txt: Windows support? 2017-03-03 12:23:51 +01:00
heinrich5991 a7e68fbf1b CMakeLists.txt: Fix a couple of uninitialized variables 2017-03-03 12:23:51 +01:00
heinrich5991 98f3c82c29 CMakeLists.txt: Fix SQL config 2017-03-03 12:23:51 +01:00
heinrich5991 1c7be368f6 CMakeLists.txt: Make external dependencies to OBJ libs 2017-03-03 12:23:51 +01:00
heinrich5991 e3839e4bf2 CMakeLists.txt: Build tools 2017-03-03 12:23:51 +01:00
heinrich5991 6bf0862c30 Use add_library(... OBJECT ...) for internal targets
Also add a few smaller targets: mastersrv, twping, versionsrv.
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
heinrich5991 4912312fb9 Make dependency errors less fatal, to show all of them at once 2017-02-23 16:29:13 +01:00
necropotame 2815a7e042 Cleanup, better separation between each part, more options, check for missing dependencies 2017-02-23 16:27:33 +01:00
necropotame 8c7608f1bb Set the default build type to 'Release' 2017-02-23 16:23:16 +01:00
necropotame eff3ca8bf3 Change CMake required version from 3.7 to 2.8 2017-02-23 16:23: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