Enable BARONY_SUPER_MULTIPLAYER and remove remaining 4-player assumptions

.gitignore

@@ -1,5 +1,14 @@
 **/books/*
 build/*
+build-*/
+# Local distribution/release outputs
+/dist/
+/release/
+tests/smoke/artifacts/
+docker/*
+!docker/Dockerfile
+!docker/docker-compose.yml
+!docker/build-linux.sh
 **/data/*
 **/fonts/*
 **/images/*
@@ -41,6 +50,7 @@ steam_appid.txt
 *.log
 *.user
 *log.txt
+!docs/mod_release/mod-changelog.txt
 *.cache
 *.zip
 *.res
@@ -75,6 +85,9 @@ steam_appid.txt
 xcode/Barony/Barony.xcodeproj/project.xcworkspace/*
 xcode/Barony/Barony.xcodeproj/xcuserdata/*
 *.ps1
+!setup_barony_vs2022_x64.ps1
+restore-env-*.ps1
+install.log
 !LICENSE.nativefiledialog.txt
 /VS.2015/Barony/x64/Debug
 *.sarif
@@ -83,3 +96,7 @@ xcode/Barony/Barony.xcodeproj/xcuserdata/*
 *.ilk
 /VS.2015/x64
 *.sqlite-journal
+/deps/*
+# Local smoke outputs and SDK drops
+tests/smoke/artifacts/
+third_party/steamworks_sdk/

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.10)
 project(barony)
 
 if (NOT CMAKE_BUILD_TYPE)
@@ -17,6 +17,34 @@ if (NOT DEFINED STEAMWORKS_ENABLED)
 	endif()
 endif()
 
+if (DEFINED ENV{BARONY_SUPER_MULTIPLAYER} AND NOT DEFINED BARONY_SUPER_MULTIPLAYER)
+	set (BARONY_SUPER_MULTIPLAYER $ENV{BARONY_SUPER_MULTIPLAYER})
+endif()
+
+if (NOT DEFINED BARONY_SUPER_MULTIPLAYER)
+	option(BARONY_SUPER_MULTIPLAYER "Enable 15-Player Multiplayer" ON)
+endif()
+
+if (BARONY_SUPER_MULTIPLAYER)
+	set (BARONY_SUPER_MULTIPLAYER 1)
+else()
+	set (BARONY_SUPER_MULTIPLAYER 0)
+endif()
+
+if (DEFINED ENV{BARONY_SMOKE_TESTS} AND NOT DEFINED BARONY_SMOKE_TESTS)
+	set (BARONY_SMOKE_TESTS $ENV{BARONY_SMOKE_TESTS})
+endif()
+
+if (NOT DEFINED BARONY_SMOKE_TESTS)
+	option(BARONY_SMOKE_TESTS "Compile smoke-test hooks and smoke instrumentation call sites" OFF)
+endif()
+
+if (BARONY_SMOKE_TESTS)
+	set (BARONY_SMOKE_TESTS 1)
+else()
+	set (BARONY_SMOKE_TESTS 0)
+endif()
+
 if (DEFINED ENV{OPTIMIZATION_LEVEL})
 	set (OPTIMIZATION_LEVEL $ENV{OPTIMIZATION_LEVEL})
 else()
@@ -193,7 +221,13 @@ endif()
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 
-set(CMAKE_OSX_ARCHITECTURES x86_64)
+if (APPLE AND NOT DEFINED CMAKE_OSX_ARCHITECTURES)
+	if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm64|aarch64")
+		set(CMAKE_OSX_ARCHITECTURES arm64 CACHE STRING "Build architectures for macOS")
+	else()
+		set(CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING "Build architectures for macOS")
+	endif()
+endif()
 
 if (EDITOR_ENABLED)
 	set(EDITOR_EXE_NAME "editor" CACHE STRING "Editor executable name")
@@ -206,6 +240,18 @@ else()
 	message("Building without steamworks")
 endif()
 
+if (BARONY_SUPER_MULTIPLAYER)
+	message("Building with Barony Super Multiplayer")
+else()
+	message("Building without Barony Super Multiplayer")
+endif()
+
+if (BARONY_SMOKE_TESTS)
+	message("Building with smoke-test instrumentation")
+else()
+	message("Building without smoke-test instrumentation")
+endif()
+
 if (EOS_ENABLED)
 	message("Building with EOS")
 else()
@@ -403,11 +449,12 @@ if (FMOD_ENABLED)
 		set(FMOD 1)
 	endif()
 endif()
-if(NOT APPLE)
-  #Linux needs these two.
-  #Macs have their own special line.
-  find_package(PNG REQUIRED)
-elseif (APPLE)
+find_package(PNG REQUIRED)
+if (WIN32)
+  find_package(GLEW REQUIRED)
+  include_directories(${GLEW_INCLUDE_DIR})
+endif()
+if (APPLE)
   set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FMOD_CXX_FLAGS}")
   MESSAGE("CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
   set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${FMOD_LINK_FLAGS}")
@@ -462,12 +509,11 @@ endif()
 if( NOT WIN32 )
  	include_directories(${THREADS_INCLUDE_DIR})
 endif()
-if(NOT APPLE)
- 	include_directories(${PNG_INCLUDE_DIR})
-endif()
+include_directories(${PNG_INCLUDE_DIR})
 if (FMOD_FOUND)
 	include_directories(${FMOD_INCLUDE_DIR})
 endif()
+include_directories(BEFORE ${PROJECT_BINARY_DIR})
 
 # Add the source directory
 #file(GLOB_RECURSE SOURCE_FILES src/*.c src/*.h) # Can't do this because it'd then compile barony and editor together. Which just won't work.
@@ -481,7 +527,7 @@ endif()
 
 #add_subdirectory(books)
 
-configure_file ( "${PROJECT_SOURCE_DIR}/src/Config.hpp.in" "${PROJECT_SOURCE_DIR}/src/Config.hpp")
+configure_file("${PROJECT_SOURCE_DIR}/src/Config.hpp.in" "${PROJECT_BINARY_DIR}/Config.hpp")
 
 message("***************************")
 message("Debug flags: ")
@@ -512,7 +558,8 @@ if (APPLE)
   #add_executable(barony MACOSX_BUNDLE OSX/SDLmain.m ${GAME_SOURCES} ${COPY_FRAMEWORKS} libfmodex.dylib /opt/local/lib/libpng16.16.dylib)
   #add_executable(barony MACOSX_BUNDLE OSX/SDLmain.m ${GAME_SOURCES} ${MACOSX_BUNDLE_ICON_FILE} libfmodex.dylib /opt/local/lib/libpng16.16.dylib)
   if (GAME_ENABLED)
-	add_executable(barony MACOSX_BUNDLE ${GAME_SOURCES} ${MACOSX_BUNDLE_ICON_FILE} ${PROJECT_SOURCE_DIR}/libpng16.16.dylib)
+	add_executable(barony MACOSX_BUNDLE ${GAME_SOURCES} ${MACOSX_BUNDLE_ICON_FILE})
+	set_target_properties(barony PROPERTIES OUTPUT_NAME "Barony")
   #add_executable(barony OSX/SDLmain.m ${GAME_SOURCES})
   #add_executable(barony ${GAME_SOURCES})
   #SET_SOURCE_FILES_PROPERTIES(${COPY_FRAMEWORKS} PROPERTIES MACOSX_PACKAGE_LOCATION Frameworks)
@@ -525,7 +572,6 @@ if (APPLE)
   #SET_SOURCE_FILES_PROPERTIES(${SOUND_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources/sound/)
 	set_source_files_properties(${GAME_SOURCES} PROPERTIES COMPILE_FLAGS "-x objective-c++")
   endif(GAME_ENABLED)
-  SET_SOURCE_FILES_PROPERTIES(${PROJECT_SOURCE_DIR}/libpng16.16.dylib PROPERTIES MACOSX_PACKAGE_LOCATION MacOS)
   SET_SOURCE_FILES_PROPERTIES(${COPY_RESOURCES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
   SET_SOURCE_FILES_PROPERTIES(${MACOSX_BUNDLE_ICON_FILE} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
   #set_source_files_properties(${GAME_SOURCES} PROPERTIES COMPILE_FLAGS "-stdlib=libc++")
@@ -553,7 +599,12 @@ if (GAME_ENABLED)
 	# endif()
 	set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT barony) # Otherwise, hitting "debug" will default to "ALL_BUILD" :|
 	if (DEFINED BARONY_DATADIR)
-		set_target_properties(barony PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "\$(BARONY_DATADIR)/")
+		set_target_properties(barony PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${BARONY_DATADIR}/")
+	else()
+		set_target_properties(barony PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/")
+	endif()
+	if (SDL2MAIN_LIBRARY)
+		target_link_libraries(barony ${SDL2MAIN_LIBRARY})
 	endif()
 	target_link_libraries(barony ${SDL2_LIBRARIES} ${SDL2_LIBRARY} ${SDL2IMAGE_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${SDL2_NET_LIBRARIES} ${SDL2_TTF_LIBRARIES} ${SDL2TTF_LIBRARY})
 	if (STEAMWORKS_ENABLED)
@@ -608,9 +659,6 @@ if (GAME_ENABLED)
 	if (EOS_ENABLED)
 	  target_link_libraries(barony ${EOS_LIBRARIES})
 	endif()
-	if (APPLE)
-	  target_link_libraries(barony ${PROJECT_SOURCE_DIR}/libpng16.16.dylib) #Wait...what? if(APPLE) in if(WIN32)? What was I thinking back then, haha.
-	endif()
 	if (${CMAKE_SYSTEM_NAME} MATCHES "BSD|DragonFly" OR ${CMAKE_SYSTEM_NAME} MATCHES "Haiku")
 	  # For backtrace
 	  find_path(EXECINFO_INC NAMES execinfo.h)
@@ -624,24 +672,23 @@ if (GAME_ENABLED)
   endif()
   target_link_libraries(barony ${OPENGL_LIBRARIES})
   target_link_libraries(barony ${THREADS_LIBRARIES}) # TODO: Not sure what this is doing, since it doesn't appear to be working in Linux!
-  target_link_libraries(barony -lm) # TODO: In Visual Studio, I bet this is something else, right?
-  if (NOT CMAKE_SYSTEM_NAME MATCHES "Haiku")
-	  target_link_libraries(barony -lc)
+  if (NOT WIN32)
+	  target_link_libraries(barony -lm) # TODO: In Visual Studio, I bet this is something else, right?
+	  if (NOT CMAKE_SYSTEM_NAME MATCHES "Haiku")
+		  target_link_libraries(barony -lc)
+	  endif()
   endif()
   if (FMOD_FOUND)
     target_link_libraries(barony ${FMOD_LIBRARY})
   endif()
   target_link_libraries(barony ${PHYSFS_LIBRARY})
-  if(NOT APPLE)
-	#Remember, Mac isn't using find_package for PNG.
-	target_link_libraries(barony ${PNG_LIBRARY})
-  endif()
+  target_link_libraries(barony ${PNG_LIBRARIES})
   if (APPLE)
 	target_link_libraries(barony ${IOKit_LIBRARY})
   endif()
   # We need to link to Winsock if we're on Windows
   if(WIN32)
-	target_link_libraries(barony wsock32 ws2_32)
+	target_link_libraries(barony wsock32 ws2_32 ${GLEW_LIBRARIES})
 	#target_link_libraries(barony -lpng -lfmodex) Mingw, not Visual Studio.
   endif()
   target_link_libraries(barony ${EXTRA_LIBS}) #Apple needs this for OpenGL to work.
@@ -689,14 +736,18 @@ if (EDITOR_ENABLED)
 	#add_executable(editor MACOSX_BUNDLE OSX/SDLmain.m ${EDITOR_SOURCES} ${COPY_FRAMEWORKS} libfmodex.dylib  /opt/local/lib/libpng16.16.dylib)
 	#add_executable(editor MACOSX_BUNDLE OSX/SDLmain.m ${EDITOR_SOURCES} libfmodex.dylib  /opt/local/lib/libpng16.16.dylib)
 	set_source_files_properties("editor.icns" PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
-	add_executable(${EDITOR_EXE_NAME} MACOSX_BUNDLE "editor.icns" ${EDITOR_SOURCES} ${PROJECT_SOURCE_DIR}/libpng16.16.dylib)
+	add_executable(${EDITOR_EXE_NAME} MACOSX_BUNDLE "editor.icns" ${EDITOR_SOURCES})
 	#SET_SOURCE_FILES_PROPERTIES(${MACOSX_BUNDLE_ICON_FILE} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
 	set_source_files_properties(${EDITOR_SOURCES} PROPERTIES COMPILE_FLAGS "-x objective-c++")
   else()
 	if (WIN32)
 		# add_executable(${EDITOR_EXE_NAME} EXCLUDE_FROM_ALL ${EDITOR_SOURCES} ${EDITOR_RESOURCE_FILE})
 		add_executable(${EDITOR_EXE_NAME} ${EDITOR_SOURCES} ${EDITOR_RESOURCE_FILE})
-		set_target_properties(${EDITOR_EXE_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "\$(BARONY_DATADIR)/")
+		if (DEFINED BARONY_DATADIR)
+			set_target_properties(${EDITOR_EXE_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${BARONY_DATADIR}/")
+		else()
+			set_target_properties(${EDITOR_EXE_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/")
+		endif()
 	else()
 		add_executable(${EDITOR_EXE_NAME} ${EDITOR_SOURCES} ${EDITOR_RESOURCE_FILE})
 	endif()
@@ -715,6 +766,9 @@ if (EDITOR_ENABLED)
 	#target_link_libraries(${EDITOR_EXE_NAME} OpenSSL::SSL)
 	#target_link_libraries(${EDITOR_EXE_NAME} OpenSSL::Crypto)
   endif()
+  if (WIN32 AND SDL2MAIN_LIBRARY)
+	target_link_libraries(${EDITOR_EXE_NAME} ${SDL2MAIN_LIBRARY})
+  endif()
   target_link_libraries(${EDITOR_EXE_NAME} ${SDL2_LIBRARIES} ${SDL2_LIBRARY} ${SDL2IMAGE_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${SDL2_NET_LIBRARIES} ${SDL2_TTF_LIBRARIES} ${SDL2TTF_LIBRARY})
   if(STEAMWORKS_ENABLED)
 	target_link_libraries(${EDITOR_EXE_NAME} ${STEAMWORKS_LIBRARY})
@@ -735,28 +789,26 @@ if (EDITOR_ENABLED)
   endif()
   target_link_libraries(${EDITOR_EXE_NAME} ${OPENGL_LIBRARIES})
   target_link_libraries(${EDITOR_EXE_NAME} ${THREADS_LIBRARIES})
-  target_link_libraries(${EDITOR_EXE_NAME} -lm) # TODO: Only for Mingw?
-  if (NOT CMAKE_SYSTEM_NAME MATCHES "Haiku")
-	  target_link_libraries(${EDITOR_EXE_NAME} -lc)
+  if (NOT WIN32)
+	  target_link_libraries(${EDITOR_EXE_NAME} -lm) # TODO: Only for Mingw?
+	  if (NOT CMAKE_SYSTEM_NAME MATCHES "Haiku")
+		  target_link_libraries(${EDITOR_EXE_NAME} -lc)
+	  endif()
   endif()
   # We need to link to Winsock if we're on Windows
   if (FMOD_FOUND)
     target_link_libraries(${EDITOR_EXE_NAME} ${FMOD_LIBRARY})
   endif()
-  if(NOT APPLE)
-	#Remember, Mac isn't using find_package for FMOD and PNG.
-	target_link_libraries(${EDITOR_EXE_NAME} ${PHYSFS_LIBRARY})
-	target_link_libraries(${EDITOR_EXE_NAME} ${PNG_LIBRARY})
-  endif()
+  target_link_libraries(${EDITOR_EXE_NAME} ${PHYSFS_LIBRARY})
+  target_link_libraries(${EDITOR_EXE_NAME} ${PNG_LIBRARY})
   if (APPLE)
-	target_link_libraries(${EDITOR_EXE_NAME} ${PHYSFS_LIBRARY})
 	target_link_libraries(${EDITOR_EXE_NAME} ${IOKit_LIBRARY})
 	if (EOS_ENABLED)
 	  target_link_libraries(${EDITOR_EXE_NAME} ${EOS_LIBRARY})
 	endif()
   endif()
   if(WIN32)
-	target_link_libraries(${EDITOR_EXE_NAME} wsock32 ws2_32)
+	target_link_libraries(${EDITOR_EXE_NAME} wsock32 ws2_32 ${GLEW_LIBRARIES})
   endif()
   if (APPLE)
 	if (FMOD_ENABLED)