empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Linux: MInor makefile fixes + missing include

Browse source
This commit is contained in:
Souryo 2016-12-18 09:24:12 -05:00
parent 30bf930623
commit 1d58a49a09
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Utilities/xBRZ/xbrz.cpp
View file

@ -18,6 +18,7 @@
#include <cassert>
#include <algorithm>
#include <vector>
#include <cmath>
namespace
{

4
makefile
View file

@ -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