portability: avoid errors on some compilers

[flatwaifu.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9028b81778374219276b037ba5a6178574b74339..aa05b291c939c762a4d438f2e666eeec95b48e41 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,6 +12,8 @@ option(SOUND_DRIVER "Build with selected sound driver" "OpenAL")
 string(TOUPPER "${SYSTEM_DRIVER}" SYSTEM_DRIVER)
 string(COMPARE EQUAL "${SYSTEM_DRIVER}" "SDL" WITH_SDL)
 string(COMPARE EQUAL "${SYSTEM_DRIVER}" "SDL2" WITH_SDL2)
+string(COMPARE EQUAL "${SYSTEM_DRIVER}" "KOS32" WITH_KOS32)
+string(COMPARE EQUAL "${SYSTEM_DRIVER}" "STUB" WITH_STUBSYS)
 string(TOUPPER "${RENDER_DRIVER}" RENDER_DRIVER)
 string(COMPARE EQUAL "${RENDER_DRIVER}" "OPENGL" WITH_OPENGL)
 string(COMPARE EQUAL "${RENDER_DRIVER}" "SOFTWARE" WITH_SOFTWARE)
@@ -24,6 +26,8 @@ string(COMPARE EQUAL "${SOUND_DRIVER}" "STUB" WITH_STUBSOUND)
 set(D2D_GAME_ROOT .)
 set(D2D_SDL_ROOT ${D2D_GAME_ROOT}/sdl)
 set(D2D_SDL2_ROOT ${D2D_GAME_ROOT}/sdl2)
+set(D2D_KOS32_ROOT ${D2D_GAME_ROOT}/kos32)
+set(D2D_STUBSYS_ROOT ${D2D_GAME_ROOT}/stubsys)
 set(D2D_OPENGL_ROOT ${D2D_GAME_ROOT}/gl)
 set(D2D_SOFTWARE_ROOT ${D2D_GAME_ROOT}/soft)
 set(D2D_STUBRENDER_ROOT ${D2D_GAME_ROOT}/stubren)
@@ -31,11 +35,13 @@ set(D2D_SDL_ROOT ${D2D_GAME_ROOT}/sdl)
 set(D2D_SDLMIXER_ROOT ${D2D_GAME_ROOT}/sdlmixer)
 set(D2D_OPENAL_ROOT ${D2D_GAME_ROOT}/openal)
 set(D2D_STUBSOUND_ROOT ${D2D_GAME_ROOT}/stubsnd)
-set(D2D_LIBCP866_ROOT ${D2D_GAME_ROOT}/libs/cp866)
+set(D2D_COMMON_ROOT ${D2D_GAME_ROOT}/common)
 
 aux_source_directory(${D2D_GAME_ROOT} D2D_GAME_SRC)
 aux_source_directory(${D2D_SDL_ROOT} D2D_SDL_SRC)
 aux_source_directory(${D2D_SDL2_ROOT} D2D_SDL2_SRC)
+aux_source_directory(${D2D_KOS32_ROOT} D2D_KOS32_SRC)
+aux_source_directory(${D2D_STUBSYS_ROOT} D2D_STUBSYS_SRC)
 aux_source_directory(${D2D_OPENGL_ROOT} D2D_OPENGL_SRC)
 aux_source_directory(${D2D_SOFTWARE_ROOT} D2D_SOFTWARE_SRC)
 aux_source_directory(${D2D_STUBRENDER_ROOT} D2D_STUBRENDER_SRC)
@@ -43,7 +49,7 @@ aux_source_directory(${D2D_SDL_ROOT} D2D_SDL_SRC)
 aux_source_directory(${D2D_SDLMIXER_ROOT} D2D_SDLMIXER_SRC)
 aux_source_directory(${D2D_OPENAL_ROOT} D2D_OPENAL_SRC)
 aux_source_directory(${D2D_STUBSOUND_ROOT} D2D_STUBSOUND_SRC)
-aux_source_directory(${D2D_LIBCP866_ROOT} D2D_LIBCP866_SRC)
+aux_source_directory(${D2D_COMMON_ROOT} D2D_COMMON_SRC)
 
 if(WITH_SDL)
   if(D2D_FOR_EMSCRIPTEN)
@@ -78,8 +84,18 @@ elseif(WITH_SDL2)
     set(D2D_SYSTEM_INCLUDE_DIR "${SDL2_INCLUDE_DIRS}")
     set(D2D_SYSTEM_LIBRARY "${SDL2_LIBRARIES}")
   endif()
+elseif(WITH_KOS32)
+  set(D2D_SYSTEM_SRC "${D2D_KOS32_SRC}")
+  set(D2D_SYSTEM_INCLUDE_DIR "")
+  set(D2D_SYSTEM_LIBRARY "-lck")
+  set(D2D_SYSTEM_LINKFLAGS "")
+elseif(WITH_STUBSYS)
+  set(D2D_SYSTEM_SRC "${D2D_STUBSYS_SRC}")
+  set(D2D_SYSTEM_INCLUDE_DIR "")
+  set(D2D_SYSTEM_LIBRARY "")
+  set(D2D_SYSTEM_LINKFLAGS "")
 else()
-  message(FATAL_ERROR "Select SYSTEM_DRIVER as 'SDL' or 'SDL2'")
+  message(FATAL_ERROR "Select SYSTEM_DRIVER as 'SDL' or 'SDL2' or 'KOS32' or 'STUB'")
 endif()
 
 if(WITH_STUBRENDER)
@@ -141,7 +157,7 @@ message(STATUS "SYSTEM: " "${SYSTEM_DRIVER}")
 message(STATUS "RENDER: " "${RENDER_DRIVER}")
 message(STATUS "SOUND:  " "${SOUND_DRIVER}")
 
-set(D2D_USED_SRC ${D2D_GAME_SRC} ${D2D_SYSTEM_SRC} ${D2D_RENDER_SRC} ${D2D_SOUND_SRC} ${D2D_LIBCP866_SRC})
+set(D2D_USED_SRC ${D2D_GAME_SRC} ${D2D_SYSTEM_SRC} ${D2D_RENDER_SRC} ${D2D_SOUND_SRC} ${D2D_COMMON_SRC})
 set(D2D_USED_INCLUDE_DIR "${D2D_GAME_ROOT}" "${D2D_SYSTEM_INCLUDE_DIR}" "${D2D_RENDER_INCLUDE_DIR}" "${D2D_SOUND_INCLUDE_DIR}" "${D2D_LIBCP866_ROOT}")
 set(D2D_USED_LIBRARY "${D2D_SYSTEM_LIBRARY}" "${D2D_RENDER_LIBRARY}" "${D2D_SOUND_LIBRARY}")
 #message(STATUS "USED SRC: ${D2D_USED_SRC}")
@@ -155,8 +171,8 @@ if(D2D_FOR_EMSCRIPTEN)
   set(D2D_DOOM2D_WAD doom2d.wad)
   configure_file(${D2D_GAME_ROOT}/default.cfg default.cfg COPYONLY)
   set(D2D_DEFAULT_CFG default.cfg)
-  set(D2D_USED_LINKFLAGS ${D2D_SYSTEM_LINKFLAGS} ${D2D_RENDER_LINKFLAGS} ${D2D_SOUND_LINKFLAGS})
-  set_target_properties(doom2d PROPERTIES LINK_FLAGS "-s WASM=0 -s DISABLE_EXCEPTION_CATCHING=1 -s SAFE_HEAP=1 -s ASSERTIONS=1 -s GL_ASSERTIONS=1 ${D2D_USED_LINKFLAGS} --preload-file ${D2D_DOOM2D_WAD} --preload-file ${D2D_DEFAULT_CFG}")
+  set(D2D_USED_LINKFLAGS "${D2D_SYSTEM_LINKFLAGS} ${D2D_RENDER_LINKFLAGS} ${D2D_SOUND_LINKFLAGS}")
+  set_target_properties(doom2d PROPERTIES LINK_FLAGS "-s WASM=0 -s MINIFY_HTML=0 -s DISABLE_EXCEPTION_CATCHING=1 -s SAFE_HEAP=1 -s ASSERTIONS=1 -s GL_ASSERTIONS=0 ${D2D_USED_LINKFLAGS} --preload-file ${D2D_DOOM2D_WAD} --preload-file ${D2D_DEFAULT_CFG}")
 else()
   target_link_libraries(doom2d ${D2D_USED_LIBRARY})
 endif()