From d2012f71aba8d29992e9190c3eb9498be083f087 Mon Sep 17 00:00:00 2001 From: Guillaume Valadon Date: Wed, 25 Mar 2020 17:20:28 +0000 Subject: [PATCH 1/2] Build libsla from the Makefile --- .../Features/Decompiler/src/decompile/cpp/sleighexample.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/sleighexample.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/sleighexample.cc index 0a64034acb..3a61418e63 100644 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/sleighexample.cc +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/sleighexample.cc @@ -346,10 +346,13 @@ int main(int argc,char **argv) -- --LNK=src/libsla.a -- +--libsla.a: +-- $(MAKE) -C src/ $@ +-- --sleighexample.o: sleighexample.cc -- $(CXX) -c $(DBG_CXXFLAGS) $(INCLUDES) $< -o $@ -- ---sleighexample: sleighexample.o +--sleighexample: sleighexample.o libsla.a -- $(CXX) $(DBG_CXXFLAGS) -o sleighexample sleighexample.o $(LNK) -- --clean: From 19df1bbd208c020be39c5d112334e4b9f8ad2dd1 Mon Sep 17 00:00:00 2001 From: Guillaume Valadon Date: Wed, 25 Mar 2020 17:21:09 +0000 Subject: [PATCH 2/2] Fix sleighexamp_dir dependency --- Ghidra/Features/Decompiler/src/decompile/cpp/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/Makefile b/Ghidra/Features/Decompiler/src/decompile/cpp/Makefile index e6d32c79c1..712abb5fd4 100644 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/Makefile +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/Makefile @@ -278,7 +278,7 @@ libdecomp.a: $(LIBDECOMP_OPT_OBJS) ar qc libdecomp.a $(LIBDECOMP_OPT_OBJS) ranlib libdecomp.a -sleighexamp_dir: +sleighexamp_dir: slghscan.cc rm -rf $(SLEIGHVERSION) mkdir $(SLEIGHVERSION) mkdir $(SLEIGHVERSION)/src $(SLEIGHVERSION)/specfiles