Merge pull request #84357 from alef/fix-c-make

Fix MSYS2/UCRT64 build

Author: Maleclypse

CMakeModules/Find/FindSDL2_mixer.cmake

@@ -133,6 +133,21 @@ if(PKG_CONFIG_FOUND)
                 PkgConfig::libmpg123
                 PkgConfig::opusfile
             )
+            if (NOT DYNAMIC_LINKING)
+              pkg_check_modules(vorbis REQUIRED IMPORTED_TARGET vorbis)
+              pkg_check_modules(vorbisenc REQUIRED IMPORTED_TARGET vorbisenc)
+              pkg_check_modules(vorbisfile REQUIRED IMPORTED_TARGET vorbisfile)
+              pkg_check_modules(wavpack REQUIRED IMPORTED_TARGET wavpack)
+              pkg_check_modules(libxmp REQUIRED IMPORTED_TARGET libxmp)
+              target_link_libraries(SDL2_mixer::SDL2_mixer-static INTERFACE
+                PkgConfig::vorbisfile
+                PkgConfig::vorbis
+                PkgConfig::ogg
+                PkgConfig::vorbisenc
+                PkgConfig::wavpack
+                PkgConfig::libxmp
+              )
+            endif()
         endif()
     elseif(TARGET SDL2_mixer::SDL2_mixer)
         pkg_check_modules(FLAC REQUIRED IMPORTED_TARGET flac)

Makefile

@@ -381,11 +381,14 @@ ifneq ($(CLANG), 0)
   ifeq ($(CCACHE), 1)
     CXX = CCACHE_CPP2=1 $(CCACHEBIN) $(CROSS)$(CLANGCMD)
     LD  = CCACHE_CPP2=1 $(CCACHEBIN) $(CROSS)$(CLANGCMD)
+    CC  = CCACHE_CPP2=1 $(CCACHEBIN) $(CROSS)$(subst ++,,$(CLANGCMD))
   else
     CXX = $(CROSS)$(CLANGCMD)
     LD  = $(CROSS)$(CLANGCMD)
+    CC  = $(CROSS)$(subst ++,,$(CLANGCMD))
   endif
   CXX_WARNINGS += -Wno-unknown-warning-option
+  WARNINGS += -Wno-unknown-warning-option
 else
   # Compiler version & target machine - used later for MXE ICE workaround
   ifdef CROSS
@@ -410,6 +413,7 @@ else
     LD  = $(CROSS)$(OS_LINKER)
   endif
   CXX_WARNINGS += -Wno-unknown-warning
+  WARNINGS += -Wno-unknown-warning
 endif
 
 STRIP = $(CROSS)strip
@@ -531,9 +535,9 @@ ifeq ($(PCH), 1)
 
   ifeq ($(CLANG), 0)
     PCHFLAGS += -include pch/main-pch.hpp
-    PCH_P = $(PCH_H).gch
+    PCH_P = $(ODIR)/$(PCH_H).gch
   else
-    PCH_P = $(PCH_H).pch
+    PCH_P = $(ODIR)/$(PCH_H).pch
     PCHFLAGS += -include-pch $(PCH_P)
 
     # FIXME: dirty hack ahead
@@ -612,11 +616,13 @@ endif
 ifeq ($(NATIVE), osx)
   DEFINES += -DMACOSX
   CXXFLAGS += -mmacosx-version-min=10.15
+  CFLAGS += -mmacosx-version-min=10.15
   LDFLAGS += -mmacosx-version-min=10.15 -framework CoreFoundation -Wl,-headerpad_max_install_names
   # doesn't use GNU ar
   THIN_AR=0
   ifeq ($(UNIVERSAL_BINARY), 1)
     CXXFLAGS += -arch x86_64 -arch arm64
+    CFLAGS += -arch x86_64 -arch arm64
     LDFLAGS += -arch x86_64 -arch arm64
   endif
   ifdef FRAMEWORK
@@ -964,8 +970,7 @@ ifeq ($(MSYS2),1)
   DEFINES += -DMSYS2 -D_GLIBCXX_USE_C99_MATH_TR1
 endif
 
-CFLAGS := $(CXXFLAGS)
-CFLAGS += $(C_STD)
+CFLAGS += $(C_STD) $(WARNINGS)
 CXXFLAGS += $(CXX_STD) $(CXX_WARNINGS)
 
 # Enumerations of all the source files and headers.
@@ -1130,14 +1135,14 @@ prefix:
          )
 
 # Unconditionally create the object dirs on every invocation.
-DIRS = $(sort $(dir $(OBJS)))
+DIRS = $(sort $(dir $(OBJS) $(PCH_P)))
 $(shell mkdir -p $(DIRS))
 
 $(ODIR)/%.inc: $(SRC_DIR)/%.cpp
 	$(COMPILE.cc) -o /dev/null -Wno-error -H -E $< 2> $@
 
 $(ODIR)/%.inc: $(SRC_DIR)/%.c
-	$(CXX) -x c $(CPPFLAGS) $(DEFINES) $(CFLAGS) -Wno-error -H -E $< -o /dev/null 2> $@
+	$(COMPILE.c) -o /dev/null -Wno-error -H -E $< 2> $@
 
 .PHONY: includes
 includes: $(OBJS:.o=.inc)
@@ -1147,7 +1152,7 @@ $(ODIR)/third-party/%.o: $(SRC_DIR)/third-party/%.cpp
 	$(COMPILE.cc) $(OUTPUT_OPTION) -w -MMD -MP $<
 
 $(ODIR)/third-party/%.o: $(SRC_DIR)/third-party/%.c
-	$(COMPILE.cc) $(OUTPUT_OPTION) -x c $(CFLAGS) -w -MMD -MP -c $<
+	$(COMPILE.c) $(OUTPUT_OPTION) -x c $(CFLAGS) -w -MMD -MP $<
 
 $(ODIR)/%.o: $(SRC_DIR)/%.cpp $(PCH_P)
 	$(COMPILE.cc) $(OUTPUT_OPTION) $(PCHFLAGS) -MMD -MP $<
@@ -1183,7 +1188,7 @@ $(CHKJSON_BIN): $(CHKJSON_SOURCES)
 json-check: $(CHKJSON_BIN)
 	./$(CHKJSON_BIN)
 
-clean: clean-tests clean-pch clean-lang
+clean: clean-tests clean-lang
 	rm -rf *$(TARGET_NAME) *$(TILES_TARGET_NAME)
 	rm -rf *$(TILES_TARGET_NAME).exe *$(TARGET_NAME).exe *$(TARGET_NAME).a
 	rm -rf *obj *objwin
@@ -1441,7 +1446,8 @@ $(BUILD_PREFIX)zstd.a: $(filter $(ODIR)/third-party/zstd/%.o,$(OBJS))
 	$(AR) rcs $(AR_FLAGS) $(BUILD_PREFIX)zstd.a $^
 
 $(ZZIP_BIN): $(ZZIP_SOURCES) $(BUILD_PREFIX)zstd.a
-	$(LINK.cc) $(OUTPUT_OPTION) -MMD -MP -isystem src/third-party $^
+  # Remove SDL libraries used by cataclysm
+	$(subst $(LDFLAGS),,$(LINK.cc)) $(OUTPUT_OPTION) -MMD -MP -isystem src/third-party $^
 
 python-check:
 	flake8
@@ -1455,19 +1461,15 @@ check: version $(BUILD_PREFIX)cataclysm.a $(LOCALIZE_TEST_DEPS)
 clean-tests:
 	$(MAKE) -C tests clean
 
-clean-pch:
-	rm -f pch/*pch.hpp.gch
-	rm -f pch/*pch.hpp.pch
-	rm -f pch/*pch.hpp.d
-	$(MAKE) -C tests clean-pch
-
 clean-lang:
 	$(MAKE) -C lang clean
 
-.PHONY: tests check ctags etags clean-tests clean-pch clean-lang install lint
+.PHONY: tests check ctags etags clean-tests clean-lang install lint
 
 compile_commands.txt:
 	@echo 'COMPILE.cc := $(COMPILE.cc)' > $@
 	@echo 'LINK.cc := $(LINK.cc)' >> $@
+	@echo 'COMPILE.c := $(COMPILE.c)' >> $@
+	@echo 'LINK.c := $(LINK.c)' >> $@
 
 -include ${OBJS:.o=.d}

doc/c++/COMPILING-MSYS.md

@@ -73,7 +73,7 @@ pacman -S git make ncurses-devel gettext-devel mingw-w64-x86_64-{astyle,ccache,c
 
 -> Windows 10 and later
 ```bash
-pacman -S git make ncurses-devel gettext-devel mingw-w64-ucrt-x86_64-{astyle,ccache,cmake,gcc,libmad,libwebp,pkgconf,SDL2,libzip,libavif} mingw-w64-ucrt-x86_64-SDL2_{image,mixer,ttf}
+pacman -S git make ncurses-devel gettext-devel mingw-w64-ucrt-x86_64-{astyle,ccache,cmake,freetype,gcc,libmad,libwebp,pkgconf,SDL2,libzip,libavif} mingw-w64-ucrt-x86_64-SDL2_{image,mixer,ttf} zlib-devel
 ```
 
 5. Close MSYS2.

src/CMakeLists.txt

@@ -137,6 +137,7 @@ if (TILES)
         target_link_libraries(cataclysm-tiles-common PUBLIC setupapi.lib)
         if (SOUND)
             target_link_libraries(cataclysm-tiles-common PUBLIC shlwapi.lib)
+            target_link_libraries(cataclysm-tiles-common PUBLIC dwrite.lib)
         endif()
         if (BACKTRACE)
             target_link_libraries(cataclysm-tiles-common PUBLIC dbghelp.lib)

src/character.cpp

@@ -407,10 +407,13 @@ void Character::queue_effects( const std::vector<effect_on_condition_id> &effect
 void Character::queue_effect( const std::string &name, const time_duration &delay,
                               const time_duration &effect_duration )
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
     global_variables::impl_t ctx = {
         { "effect", diag_value{ name } },
         { "duration", diag_value{ to_turns<int>( effect_duration ) } }
     };
+#pragma GCC diagnostic pop
 
     effect_on_conditions::queue_effect_on_condition( delay, effect_on_condition_add_effect, *this,
             ctx );

src/third-party/CMakeLists.txt

@@ -110,6 +110,7 @@ if (TILES)
         if (NOT DYNAMIC_LINKING)
             target_link_libraries(imgui PUBLIC
                 SDL2::SDL2-static
+                $<TARGET_NAME_IF_EXISTS:PkgConfig::Freetype>
             )
         else()
             target_link_libraries(imgui PUBLIC

src/vpart_range.h

@@ -59,7 +59,10 @@ class vehicle_part_iterator
 
         vehicle_part_iterator &operator++() {
             cata_assert( vp_ );
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
             skip_to_next_valid( vp_->part_index() + 1 );
+#pragma GCC diagnostic pop
             return *this;
         }
 
@@ -70,7 +73,10 @@ class vehicle_part_iterator
             if( !vp_.has_value() ) {
                 return true;
             }
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
             return &vp_->vehicle() == &rhs.vp_->vehicle() && vp_->part_index() == rhs.vp_->part_index();
+#pragma GCC diagnostic pop
         }
         bool operator!=( const vehicle_part_iterator &rhs ) const {
             return !operator==( rhs );

tests/Makefile

@@ -39,9 +39,9 @@ ifeq ($(PCH), 1)
 PCHFLAGS += -DCATA_CATCH_PCH
 PCH_H = pch/tests-pch.hpp
 ifeq ($(CLANG), 0)
-PCH_P = $(PCH_H).gch
+PCH_P = $(ODIR)/$(PCH_H).gch
 else
-PCH_P = $(PCH_H).pch
+PCH_P = $(ODIR)/$(PCH_H).pch
 CXXFLAGS += -Wno-unused-macros
 endif
 endif
@@ -70,17 +70,12 @@ check: $(TEST_TARGET) $(TEST_BATCHES)
 check-single: $(TEST_TARGET)
 	cd .. && tests/$(TEST_TARGET) --min-duration 0.2 --rng-seed time --order lex
 
-clean: clean-pch
+clean:
 	rm -rf *obj *objwin
 	rm -f *cata_test
 
-clean-pch:
-	rm -f pch/*pch.hpp.gch
-	rm -f pch/*pch.hpp.pch
-	rm -f pch/*pch.hpp.d
-
 #Unconditionally create object directory on invocation.
-$(shell mkdir -p $(ODIR))
+$(shell mkdir -p $(ODIR) $(dir $(PCH_P)))
 
 # Adding ../tests/ so that the directory appears in __FILE__ for log messages
 $(ODIR)/%.o: %.cpp $(PCH_P)
@@ -92,7 +87,7 @@ $(ODIR)/%.inc: %.cpp
 .PHONY: includes
 includes: $(OBJS:.o=.inc)
 
-.PHONY: clean clean-pch check check-single tests precompile_header
+.PHONY: clean check check-single tests precompile_header
 
 .SECONDARY: $(OBJS)