From: Elias Fleckenstein <eliasfleckenstein@web.de>
Date: Mon, 17 Jan 2022 11:57:11 +0000 (+0100)
Subject: Merge branch 'master' of github.com:dragonblocks/dragonblocks_alpha
X-Git-Tag: 0.2~7
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=b1f8d66a9986342b1c3b49cea5ce7d7408ea79cd;p=dragonblocks_alpha.git

Merge branch 'master' of github.com:dragonblocks/dragonblocks_alpha
---

b1f8d66a9986342b1c3b49cea5ce7d7408ea79cd
diff --cc src/CMakeLists.txt
index 71daf3e,2cc9ad4..0adb599
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -27,20 -29,19 +27,30 @@@ include_directories(BEFOR
  	${CMAKE_SOURCE_DIR}
  )
  
- add_compile_options(-Wall -Wextra -Wpedantic -Werror -fmax-errors=4)
+ if ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD" OR "${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD")
+ 	link_directories("/usr/local/lib")
+ 	include_directories("/usr/local/include")
+ endif()
+ 
+ if ("${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD")
+ 	link_directories("/usr/X11R6/lib")
+ 	include_directories("/usr/X11R6/include")
+ endif()
+ 
+ add_compile_options(-Wall -Wextra -Wpedantic -Werror)
  
 -set(SOURCES_COMMON
 +set(DEPS_SOURCES
 +	"${DEPS_DIR}/dragontype/array.c"
 +	"${DEPS_DIR}/dragontype/bintree.c"
 +	"${DEPS_DIR}/dragontype/list.c"
 +	"${DEPS_DIR}/dragontype/number.c"
 +	"${DEPS_DIR}/dragontype/queue.c"
 +	"${DEPS_DIR}/dragonport/asprintf.c"
 +	"${DEPS_DIR}/perlin/perlin.c"
 +)
 +
 +set(COMMON_SOURCES
 +	${DEPS_SOURCES}
  	day.c
  	environment.c
  	map.c