From d29c6a55eb8f89b9e387ce4bd5be137374d5028a Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Mon, 13 Apr 2020 10:14:07 +0300 Subject: [PATCH] - fix autoseg registration by moving start/end files back to src directory Link order was wrong when building via Xcode project because CMake generator sorts files by paths This made most of classes missing from corresponding segments, and the game crashes right after launch --- src/CMakeLists.txt | 4 ++-- src/{common/objects => }/__autostart.cpp | 0 src/{common/objects => }/zzautozend.cpp | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename src/{common/objects => }/__autostart.cpp (100%) rename src/{common/objects => }/zzautozend.cpp (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a550135d34..d39eca9dde 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1188,7 +1188,7 @@ endif() add_executable( zdoom WIN32 MACOSX_BUNDLE ${HEADER_FILES} ${NOT_COMPILED_SOURCE_FILES} - common/objects/__autostart.cpp + __autostart.cpp ${SYSTEM_SOURCES} ${FASTMATH_SOURCES} ${PCH_SOURCES} @@ -1214,7 +1214,7 @@ add_executable( zdoom WIN32 MACOSX_BUNDLE common/thirdparty/math/tan.c common/thirdparty/math/tanh.c common/thirdparty/math/fastsin.cpp - common/objects/zzautozend.cpp + zzautozend.cpp ) set_source_files_properties( ${FASTMATH_SOURCES} PROPERTIES COMPILE_FLAGS ${ZD_FASTMATH_FLAG} ) diff --git a/src/common/objects/__autostart.cpp b/src/__autostart.cpp similarity index 100% rename from src/common/objects/__autostart.cpp rename to src/__autostart.cpp diff --git a/src/common/objects/zzautozend.cpp b/src/zzautozend.cpp similarity index 100% rename from src/common/objects/zzautozend.cpp rename to src/zzautozend.cpp