From 1d58a49a0988448e317ae74640fe7019b9a7b11e Mon Sep 17 00:00:00 2001 From: Souryo Date: Sun, 18 Dec 2016 09:24:12 -0500 Subject: [PATCH] Linux: MInor makefile fixes + missing include --- Utilities/xBRZ/xbrz.cpp | 1 + makefile | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Utilities/xBRZ/xbrz.cpp b/Utilities/xBRZ/xbrz.cpp index a37c5c23..f9258cd2 100644 --- a/Utilities/xBRZ/xbrz.cpp +++ b/Utilities/xBRZ/xbrz.cpp @@ -18,6 +18,7 @@ #include #include #include +#include namespace { diff --git a/makefile b/makefile index d7d1ad59..054d1354 100644 --- a/makefile +++ b/makefile @@ -39,10 +39,10 @@ testhelper: $(SHAREDLIB) ar -rcs TestHelper/obj/libMesenLinux.a $(LINUXOBJ) ar -rcs TestHelper/obj/libUtilities.a $(UTILOBJ) ar -rcs TestHelper/obj/libCore.a $(COREOBJ) - cd TestHelper/obj && $(CC) $(GCCOPTIONS) -Wl,-z,defs -Wno-parentheses -Wno-switch -o testhelper ../*.cpp ../../InteropDLL/ConsoleWrapper.cpp -L ./ -lCore -lMesenLinux -lUtilities -lSevenZip -pthread -lSDL2 -lstdc++fs + cd TestHelper/obj && $(CPPC) $(GCCOPTIONS) -Wl,-z,defs -Wno-parentheses -Wno-switch -o testhelper ../*.cpp ../../InteropDLL/ConsoleWrapper.cpp -L ./ -lCore -lMesenLinux -lUtilities -lSevenZip -pthread -lSDL2 -lstdc++fs SevenZip/obj/%.o: SevenZip/%.c - mkdir -p SevenZip/obj && cd SevenZip/obj && clang $(7ZOPTIONS) -fpermissive -c $(patsubst SevenZip/%, ../%, $<) + mkdir -p SevenZip/obj && cd SevenZip/obj && $(CC) $(7ZOPTIONS) -fpermissive -c $(patsubst SevenZip/%, ../%, $<) Utilities/obj/%.o: Utilities/%.cpp mkdir -p Utilities/obj && cd Utilities/obj && $(CPPC) $(GCCOPTIONS) -c $(patsubst Utilities/%, ../%, $<) Utilities/obj/%.o: Utilities/HQX/%.cpp