Remove pch.h

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.7)
+cmake_minimum_required(VERSION 3.13)
 
 include(CMake/out_of_tree.cmake)
 
@@ -6,32 +6,39 @@ project(devilutionX
   VERSION 0.0.1
   LANGUAGES C CXX)
 
+list(APPEND CMAKE_MODULE_PATH "${devilutionX_SOURCE_DIR}/CMake")
+
 if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE "Debug")
 endif()
 
 option(ASAN "Enable address sanitizer" ON)
 option(DEBUG "Enable debug mode in engine" ON)
-option(COTIRE "Enable cotire" OFF)
 option(DIST "Dynamically link only glibc and SDL2" OFF)
 option(FASTER "Enable FASTER in engine" ON)
 option(BINARY_RELEASE "Enable options for binary release" OFF)
+option(NIGHTLY_BUILD "Enable options for nightly build" OFF)
 
 if(BINARY_RELEASE)
   set(CMAKE_BUILD_TYPE "Release")
   set(ASAN OFF)
   set(DEBUG OFF)
-  set(COTIRE OFF)
   set(DIST ON)
   set(FASTER OFF)
 endif()
 
+if(NIGHTLY_BUILD)
+  set(CMAKE_BUILD_TYPE "Debug")
+  set(ASAN OFF)
+  set(DEBUG ON)
+  set(DIST ON)
+  set(FASTER ON)
+endif()
+
 if(DIST)
   set(sodium_USE_STATIC_LIBS ON)
 endif()
 
-list(APPEND CMAKE_MODULE_PATH "${devilutionX_SOURCE_DIR}/CMake")
-
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
@@ -43,10 +50,6 @@ if(NOT CMAKE_SIZEOF_VOID_P EQUAL 4)
   message(WARNING [[Not 32-bit, highly experimental!]])
 endif()
 
-if(COTIRE)
-  include(CMake/cotire.cmake)
-endif()
-
 find_package(Threads REQUIRED)
 find_package(SDL2 REQUIRED)
 find_package(SDL2_ttf REQUIRED)
@@ -150,7 +153,6 @@ add_library(devilution OBJECT
   Source/track.cpp
   Source/trigs.cpp
   Source/wave.cpp)
-target_include_directories(devilution PRIVATE SourceS)
 
 add_executable(devilutionx
   SourceX/dx.cpp
@@ -182,16 +184,16 @@ add_executable(devilutionx
   SourceX/DiabloUI/title.cpp
   SourceX/main.cpp)
 
-target_include_directories(devilutionx PRIVATE SourceS SourceX 3rdParty/asio/include .)
+target_include_directories(devilution PUBLIC Source SourceS)
+target_include_directories(devilutionx PRIVATE SourceX 3rdParty/asio/include)
 
-target_link_libraries(devilution PRIVATE Threads::Threads)
+target_link_libraries(devilution PUBLIC Threads::Threads)
 target_link_libraries(devilutionx PRIVATE
   devilution
   PKWare
   StormLib
   smacker
   Radon
-  Threads::Threads
   SDL2::SDL2main
   SDL2::SDL2_ttf
   SDL2::SDL2_mixer
@@ -203,13 +205,11 @@ target_compile_definitions(devilution PUBLIC
   "$<$<BOOL:${DEBUG}>:_DEBUG>"
   # Skip fades and other fluff
   "$<$<BOOL:${FASTER}>:FASTER>")
+target_compile_definitions(devilutionx PRIVATE ASIO_STANDALONE)
 
-target_compile_definitions(devilutionx PUBLIC ASIO_STANDALONE)
-
-# Enable ASAN in Debug mode
 if(ASAN)
   target_compile_options(devilution PUBLIC -fsanitize=address -fsanitize-recover=address)
-  target_link_libraries(devilution PUBLIC -fsanitize=address -fsanitize-recover=address)
+  target_link_options(devilution PUBLIC -fsanitize=address -fsanitize-recover=address)
 endif()
 
 if(DIST)
@@ -217,15 +217,14 @@ if(DIST)
 endif()
 
 if(WIN32)
-  cmake_minimum_required(VERSION 3.13)
   target_link_libraries(devilutionx PRIVATE wsock32 ws2_32 wininet)
   target_compile_options(devilution PUBLIC $<$<CONFIG:Debug>:-gstabs>)
 endif()
 
+target_compile_options(devilution PUBLIC -Wno-unknown-pragmas)
 # Note: In Debug mode, GCC generates spurious memory references that upset Valgrind,
 # these options fix that.
 target_compile_options(devilution PUBLIC $<$<CONFIG:Debug>:-fno-omit-frame-pointer>)
-
 # Ignore serious warnings due to "quality" of decompiled code
 # Currently, disable ignore all warnings (-w), to be removed later
 target_compile_options(devilution PRIVATE -fpermissive -Wno-write-strings -Wno-multichar -w)
@@ -235,7 +234,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
   target_compile_options(devilution PRIVATE -fno-aggressive-loop-optimizations)
 endif()
 # Warnings for devilutionX
-target_compile_options(devilution PUBLIC -Wno-unknown-pragmas)
 target_compile_options(devilutionx PRIVATE -Wall -Wextra -Wno-multichar -Wno-unused-parameter)
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -248,11 +246,3 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 
   set_target_properties(devilutionx PROPERTIES LINK_FLAGS "-liconv")
 endif()
-
-if(COTIRE)
-  set_target_properties(devilutionx PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)
-  set_target_properties(devilutionx PROPERTIES
-    COTIRE_PREFIX_HEADER_INCLUDE_PATH "${devilutionX_SOURCE_DIR}"
-    COTIRE_PREFIX_HEADER_IGNORE_PATH "${devilutionX_SOURCE_DIR}/SourceX")
-  cotire(devilutionx)
-endif()

SourceS/devilution.h

@@ -0,0 +1 @@
+#include "../types.h"

SourceX/DiabloUI/credits.cpp

@@ -1,4 +1,6 @@
-#include "pch.h"
+#include "devilution.h"
+#include "DiabloUI/diabloui.h"
+#include "dx.h"
 
 #define CREDIT_LINES 13
 

SourceX/DiabloUI/diabloui.cpp

@@ -1,6 +1,10 @@
-#include "pch.h"
 #include <string>
+
+#include "devilution.h"
+#include "DiabloUI/diabloui.h"
+#include "dx.h"
 #include "utf8.h"
+#include "stubs.h"
 
 namespace dvl {
 

SourceX/DiabloUI/dialogs.cpp

@@ -1,4 +1,5 @@
-#include "pch.h"
+#include "devilution.h"
+#include "DiabloUI/diabloui.h"
 
 namespace dvl {
 

SourceX/DiabloUI/mainmenu.cpp

@@ -1,4 +1,5 @@
-#include "pch.h"
+#include "devilution.h"
+#include "DiabloUI/diabloui.h"
 
 namespace dvl {
 

SourceX/DiabloUI/progress.cpp

@@ -1,4 +1,6 @@
-#include "pch.h"
+#include "devilution.h"
+#include "DiabloUI/diabloui.h"
+#include "dx.h"
 
 namespace dvl {
 

SourceX/DiabloUI/selconn.cpp

@@ -1,6 +1,8 @@
-#include "pch.h"
 #include "selconn.h"
 
+#include "devilution.h"
+#include "DiabloUI/diabloui.h"
+
 namespace dvl {
 
 char selconn_MaxPlayers[21];

SourceX/DiabloUI/selgame.cpp

@@ -1,6 +1,8 @@
-#include "pch.h"
 #include "selgame.h"
 
+#include "devilution.h"
+#include "DiabloUI/diabloui.h"
+
 namespace dvl {
 
 char selgame_Lable[32];

SourceX/DiabloUI/selhero.cpp

@@ -1,6 +1,8 @@
-#include "pch.h"
 #include "selhero.h"
 
+#include "devilution.h"
+#include "DiabloUI/diabloui.h"
+
 namespace dvl {
 
 int selhero_SaveCount = 0;

SourceX/DiabloUI/title.cpp

@@ -1,4 +1,5 @@
-#include "pch.h"
+#include "devilution.h"
+#include "DiabloUI/diabloui.h"
 
 namespace dvl {
 

SourceX/devilution.h

@@ -1,3 +0,0 @@
-#include <types.h>
-#include "stubs.h"
-#include "miniwin_sdl.h"

SourceX/dvlnet/loopback.cpp

@@ -1,4 +1,5 @@
 #include "dvlnet/loopback.h"
+#include "stubs.h"
 
 namespace dvl { namespace net {
 

SourceX/dvlnet/packet.h

@@ -6,6 +6,7 @@
 #include <sodium.h>
 
 #include "dvlnet/abstract_net.h"
+#include "stubs.h"
 
 namespace dvl { namespace net {
 	enum packet_type : uint8_t {

SourceX/dvlnet/udp_p2p.cpp

@@ -1,5 +1,7 @@
 #include "dvlnet/udp_p2p.h"
 
+#include <SDL.h>
+
 namespace dvl { namespace net {
 
 const udp_p2p::endpoint udp_p2p::none;

SourceX/dx.cpp

@@ -1,4 +1,8 @@
-#include "pch.h"
+#include "dx.h"
+
+#include "devilution.h"
+#include "stubs.h"
+#include "DiabloUI/diabloui.h"
 
 namespace dvl {
 

SourceX/main.cpp

@@ -1,4 +1,6 @@
-#include "pch.h"
+#include <string>
+
+#include "devilution.h"
 
 extern "C" const char *__asan_default_options()
 {

SourceX/miniwin/misc.cpp

@@ -1,10 +1,14 @@
-#include "pch.h"
 #ifndef _WIN32
 #include <sys/statvfs.h>
 #endif
 
 #include <SDL.h>
 
+#include "devilution.h"
+#include "stubs.h"
+#include "dx.h"
+#include "DiabloUI/diabloui.h"
+
 namespace dvl {
 
 DWORD last_error;

SourceX/miniwin/misc_io.cpp

@@ -1,8 +1,10 @@
-#include "pch.h"
-
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <set>
+
+#include "devilution.h"
+#include "stubs.h"
 
 namespace dvl {
 

SourceX/miniwin/misc_msg.cpp

@@ -1,4 +1,9 @@
-#include "pch.h"
+#include <deque>
+#include <SDL.h>
+
+#include "devilution.h"
+#include "stubs.h"
+
 /** @file
  * *
  * Windows message handling and keyboard event conversion for SDL.

SourceX/miniwin/thread.cpp

@@ -1,4 +1,8 @@
-#include "pch.h"
+#include <set>
+#include <SDL.h>
+
+#include "devilution.h"
+#include "stubs.h"
 
 namespace dvl {
 

SourceX/miniwin_dsound.cpp

@@ -1,4 +1,9 @@
-#include "pch.h"
+#include "miniwin_dsound.h"
+
+#include <SDL.h>
+
+#include "devilution.h"
+#include "stubs.h"
 
 namespace dvl {
 

SourceX/miniwin_dsound.h

@@ -0,0 +1,26 @@
+#include "devilution.h"
+
+#include <SDL_mixer.h>
+
+namespace dvl {
+
+struct DirectSoundBuffer : public IDirectSoundBuffer {
+public:
+        virtual ULONG Release();
+        BOOL GetStatus(LPDWORD pdwStatus);
+        HRESULT Lock(DWORD dwOffset, DWORD dwBytes, LPVOID *ppvAudioPtr1, LPDWORD pdwAudioBytes1,
+            LPVOID *ppvAudioPtr2, LPDWORD pdwAudioBytes2, DWORD dwFlags);
+        HRESULT Play(DWORD dwReserved1, DWORD dwPriority, DWORD dwFlags);
+        HRESULT SetFormat(LPCWAVEFORMATEX pcfxFormat);
+        HRESULT SetVolume(LONG lVolume);
+        HRESULT SetPan(LONG lPan);
+        HRESULT Stop();
+        HRESULT Unlock(LPVOID pvAudioPtr1, DWORD dwAudioBytes1, LPVOID pvAudioPtr2, DWORD dwAudioBytes2);
+        HRESULT Restore();
+    private:
+        int volume = 0;
+        int pan = 0;
+        Mix_Chunk *chunk;
+};
+
+}  // namespace dvl

SourceX/pch.h

@@ -1,44 +0,0 @@
-#include <assert.h>
-#include <deque>
-#include <dirent.h>
-#include <functional>
-#include <iostream>
-#include <memory>
-#include <queue>
-#include <set>
-#include <map>
-#include <stdarg.h>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include <SDL.h>
-#include <SDL_mixer.h>
-#include <SDL_thread.h>
-#include <SDL_ttf.h>
-
-#include "devilution.h"
-#include "DiabloUI/diabloui.h"
-
-namespace dvl {
-
-struct DirectSoundBuffer : public IDirectSoundBuffer {
-public:
-	virtual ULONG Release();
-	BOOL GetStatus(LPDWORD pdwStatus);
-	HRESULT Lock(DWORD dwOffset, DWORD dwBytes, LPVOID *ppvAudioPtr1, LPDWORD pdwAudioBytes1,
-	    LPVOID *ppvAudioPtr2, LPDWORD pdwAudioBytes2, DWORD dwFlags);
-	HRESULT Play(DWORD dwReserved1, DWORD dwPriority, DWORD dwFlags);
-	HRESULT SetFormat(LPCWAVEFORMATEX pcfxFormat);
-	HRESULT SetVolume(LONG lVolume);
-	HRESULT SetPan(LONG lPan);
-	HRESULT Stop();
-	HRESULT Unlock(LPVOID pvAudioPtr1, DWORD dwAudioBytes1, LPVOID pvAudioPtr2, DWORD dwAudioBytes2);
-	HRESULT Restore();
-    private:
-        int volume = 0;
-        int pan = 0;
-        Mix_Chunk *chunk;
-};
-
-}  // namespace dvl

SourceX/sound.cpp

@@ -1,7 +1,8 @@
-//HEADER_GOES_HERE
+#include "devilution.h"
 
-#include "../types.h"
-#include "pch.h"
+#include <SDL_mixer.h>
+
+#include "stubs.h"
 
 namespace dvl {
 

SourceX/storm.cpp

@@ -1,8 +1,14 @@
 #include "../3rdParty/Radon/Radon/include/Radon.hpp"
 #include "../3rdParty/libsmacker/smacker.h"
-#include "pch.h"
 
 #include <unistd.h>
+#include <SDL.h>
+#include <SDL_mixer.h>
+
+#include "devilution.h"
+#include "stubs.h"
+#include "DiabloUI/diabloui.h"
+#include "dx.h"
 
 namespace dvl {
 

SourceX/storm_net.cpp

@@ -1,5 +1,8 @@
+#include <memory>
+
+#include "devilution.h"
+#include "stubs.h"
 #include "dvlnet/abstract_net.h"
-#include "pch.h"
 
 namespace dvl {