X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=9028b81778374219276b037ba5a6178574b74339;hb=14813cefff1cc036bf217346188c168429b52e81;hp=d39526222f66f8dc959d51057ee26232d4ec98a0;hpb=b047ed3a09b3738defa4f0c323dbe698ff6831ce;p=flatwaifu.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d395262..9028b81 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -31,6 +31,7 @@ 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)
 
 aux_source_directory(${D2D_GAME_ROOT} D2D_GAME_SRC)
 aux_source_directory(${D2D_SDL_ROOT} D2D_SDL_SRC)
@@ -42,6 +43,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)
 
 if(WITH_SDL)
   if(D2D_FOR_EMSCRIPTEN)
@@ -57,7 +59,7 @@ if(WITH_SDL)
   endif()
 elseif(WITH_SDL2)
   if(D2D_FOR_EMSCRIPTEN)
-    set(D2D_SYSTEM_SRC "${D2D_SDL_SRC}")
+    set(D2D_SYSTEM_SRC "${D2D_SDL2_SRC}")
     set(D2D_SYSTEM_INCLUDE_DIR "")
     set(D2D_SYSTEM_LIBRARY "-lSDL2")
     set(D2D_SYSTEM_LINKFLAGS "-s USE_SDL=2")
@@ -118,13 +120,13 @@ elseif(WITH_SDLMIXER)
   set(D2D_SOUND_SRC "${D2D_SDLMIXER_SRC}")
   set(D2D_SOUND_INCLUDE_DIR "${SDLMIXER_INCLUDE_DIR}")
   set(D2D_SOUND_LIBRARY "${SDLMIXER_LIBRARY}")
-else(WITH_STUBSOUND)
+else()
   message(FATAL_ERROR "Select SOUND_DRIVER as 'OPENAL' or 'SDLMIXER' or 'STUB'")
-endif(WITH_STUBSOUND)
+endif()
 
 if (NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Release)
-endif (NOT CMAKE_BUILD_TYPE)
+endif()
 set(CMAKE_C_FLAGS "")
 set(CMAKE_C_FLAGS_DEBUG "-g -O0 -Wall")
 set(CMAKE_C_FLAGS_RELEASE "-O3") # -DNDEBUG
@@ -139,13 +141,22 @@ message(STATUS "SYSTEM: " "${SYSTEM_DRIVER}")
 message(STATUS "RENDER: " "${RENDER_DRIVER}")
 message(STATUS "SOUND:  " "${SOUND_DRIVER}")
 
-add_executable(doom2d ${D2D_GAME_SRC} ${D2D_SYSTEM_SRC} ${D2D_RENDER_SRC} ${D2D_SOUND_SRC})
-target_include_directories(doom2d PRIVATE "${D2D_GAME_ROOT}" "${D2D_SYSTEM_INCLUDE_DIR}" "${D2D_RENDER_INCLUDE_DIR}" "${D2D_SOUND_INCLUDE_DIR}")
+set(D2D_USED_SRC ${D2D_GAME_SRC} ${D2D_SYSTEM_SRC} ${D2D_RENDER_SRC} ${D2D_SOUND_SRC} ${D2D_LIBCP866_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}")
+#message(STATUS "USED INC: ${D2D_USED_INCLUDE_DIR}")
+#message(STATUS "USED LIB: ${D2D_USED_LIBRARY}")
+add_executable(doom2d ${D2D_USED_SRC})
+target_include_directories(doom2d PRIVATE ${D2D_USED_INCLUDE_DIR})
 if(D2D_FOR_EMSCRIPTEN)
   set(CMAKE_EXECUTABLE_SUFFIX ".html")
   configure_file(${D2D_GAME_ROOT}/doom2d.wad doom2d.wad COPYONLY)
   set(D2D_DOOM2D_WAD doom2d.wad)
-  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_SYSTEM_LINKFLAGS} ${D2D_RENDER_LINKFLAGS} ${D2D_SOUND_LINKFLAGS} --preload-file ${D2D_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}")
 else()
-  target_link_libraries(doom2d "${D2D_SYSTEM_LIBRARY}" "${D2D_RENDER_LIBRARY}" "${D2D_SOUND_LIBRARY}")
+  target_link_libraries(doom2d ${D2D_USED_LIBRARY})
 endif()