Merge branch 'master' into jgrpp

2020-10-14 17:38:23 +01:00
parent 5edb080deb 313141d2f1
commit d85a529f87
61 changed files with 2031 additions and 1507 deletions
--- a/src/video/CMakeLists.txt
+++ b/src/video/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_subdirectory(cocoa)

-if (NOT OPTION_DEDICATED)
+if(NOT OPTION_DEDICATED)
    add_files(
        allegro_v.cpp
        allegro_v.h
@@ -24,7 +24,7 @@ if (NOT OPTION_DEDICATED)
        win32_v.h
        CONDITION WIN32
    )
-endif (NOT OPTION_DEDICATED)
+endif()

 add_files(
    dedicated_v.cpp