From 3ff4e64b1d509e5b0012fa0b9a0418d75110fa0c Mon Sep 17 00:00:00 2001 From: caheckman <48068198+caheckman@users.noreply.github.com> Date: Thu, 10 Oct 2019 12:50:51 -0400 Subject: [PATCH] Incorporate transform.cc into the build --- Ghidra/Features/Decompiler/build.gradle | 1 + Ghidra/Features/Decompiler/certification.manifest | 1 - Ghidra/Features/Decompiler/src/decompile/cpp/Makefile | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Ghidra/Features/Decompiler/build.gradle b/Ghidra/Features/Decompiler/build.gradle index a4f7130ca2..af1c853034 100644 --- a/Ghidra/Features/Decompiler/build.gradle +++ b/Ghidra/Features/Decompiler/build.gradle @@ -295,6 +295,7 @@ model { include "rangeutil.cc" include "ruleaction.cc" include "subflow.cc" + include "transform.cc" include "blockaction.cc" include "merge.cc" include "double.cc" diff --git a/Ghidra/Features/Decompiler/certification.manifest b/Ghidra/Features/Decompiler/certification.manifest index 935fa18a79..6028dc4c12 100644 --- a/Ghidra/Features/Decompiler/certification.manifest +++ b/Ghidra/Features/Decompiler/certification.manifest @@ -6,7 +6,6 @@ Module.manifest||GHIDRA||||END| build.gradle||GHIDRA||||END| src/decompile/.cproject||GHIDRA||||END| src/decompile/.project||GHIDRA||||END| -src/decompile/.settings/org.eclipse.jdt.core.prefs||GHIDRA||||END| src/decompile/build.gradle||GHIDRA||||END| src/decompile/cpp/.gitignore||GHIDRA||||END| src/decompile/cpp/Doxyfile||GHIDRA|||Most of this file is autogenerated by doxygen which falls under the GPL - output from GPL products are NOT GPL! - mjbell4|END| diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/Makefile b/Ghidra/Features/Decompiler/src/decompile/cpp/Makefile index c44d44ebe7..e6d32c79c1 100644 --- a/Ghidra/Features/Decompiler/src/decompile/cpp/Makefile +++ b/Ghidra/Features/Decompiler/src/decompile/cpp/Makefile @@ -79,7 +79,7 @@ DECCORE=capability architecture options graph cover block cast typeop database c type variable varmap jumptable emulate emulateutil flow userop \ funcdata funcdata_block funcdata_op funcdata_varnode pcodeinject \ heritage prefersplit rangeutil ruleaction subflow blockaction merge double \ - coreaction condexe override dynamic crc32 prettyprint \ + transform coreaction condexe override dynamic crc32 prettyprint \ printlanguage printc printjava memstate opbehavior paramid $(COREEXT_NAMES) # Files used for any project that use the sleigh decoder SLEIGH= sleigh pcodeparse pcodecompile sleighbase slghsymbol \