X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=CMakeLists.txt;h=0cef065e80833086e1c993bd0cb834bdf85b332e;hp=fe8e1a3e262e48a111d36e90652339a8a93d3769;hb=f5b948bf38d8757f4e9a0d7af4edaa4a6fffec27;hpb=3c693e3cafc3c791479a6d5100c4a4b72a8d5e7b

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe8e1a3..0cef065 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,9 +14,9 @@ pkg_check_modules(LOG4CXX REQUIRED liblog4cxx)
 #add_compile_options(${LOG4CXX_CFLAGS})
 add_definitions(${LOG4CXX_CFLAGS})
 
-execute_process(COMMAND llvm-config --cxxflags OUTPUT_VARIABLE LLVM_CFLAGS  OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND llvm-config --ldflags  OUTPUT_VARIABLE LLVM_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND llvm-config --libs     OUTPUT_VARIABLE LLVM_LIBS    OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND llvm-config-3.5 --cxxflags OUTPUT_VARIABLE LLVM_CFLAGS  OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND llvm-config-3.5 --ldflags  OUTPUT_VARIABLE LLVM_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND llvm-config-3.5 --libs     OUTPUT_VARIABLE LLVM_LIBS    OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 separate_arguments(LLVM_CFLAGS)
 add_definitions(${LLVM_CFLAGS})
@@ -28,19 +28,20 @@ separate_arguments(LLVM_LIBS)
 set(CMAKE_CXX_COMPILER "clang++")
 
 SET(frida_SOURCES
-  src/Binary.cxx
   src/main.cxx
   src/gui/Mainwindow.cxx
   src/gui/widgets/BasicBlockWidget.cxx
-  src/disassembler/InstructionReader.cxx
-  src/disassembler/Target.cxx
-  src/disassembler/Disassembler.cxx)
+  src/disassembler/Disassembler.cxx
+  src/disassembler/llvm/LLVMDisassembler.cxx
+  )
 SET(frida_HEADERS
-  src/Binary.hxx
   src/include_llvm.hxx
-  src/Section.hxx
+  src/gui/qt.hxx
   src/gui/Mainwindow.hxx
-  src/gui/widgets/BasicBlockWidget.hxx)
+  src/gui/widgets/BasicBlockWidget.hxx
+  src/disassembler/llvm/LLVMDisassembler.hxx
+  src/disassembler/Disassembler.hxx
+  )
 
 ADD_EXECUTABLE(frida ${frida_SOURCES} ${frida_HEADERS_MOC})
 #ADD_LIBRARY(llvm SHARED )