pkg: include dep for win32 ; arch_arm: remove debug msg

wisk · Apr 23, 2014 · 73486bb · 73486bb
1 parent 686b8b6
commit 73486bb
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 9 deletions.
diff --git a/src/arch/arm/arm_opcode.cpp b/src/arch/arm/arm_opcode.cpp
@@ -3806,7 +3806,6 @@ bool ArmArchitecture::Instruction_ADC_A1_0fe00010_00a00000(BinaryStream const& r
   return true;
 }
 
-#include <iostream>
 // ADC{S}<c> <Rd>, <Rn>, <Rm>, <type> <Rs> - ['c', 'c', 'c', 'c', 0, 0, 0, 0, 1, 0, 1, 'S', 'n', 'n', 'n', 'n', 'd', 'd', 'd', 'd', 's', 's', 's', 's', 0, 'tp', 'tp', 1, 'm', 'm', 'm', 'm']
 bool ArmArchitecture::Instruction_ADC_A1_0fe00090_00a00010(BinaryStream const& rBinStrm, TOffset Offset, u32 Opcode, Instruction& rInsn)
 {
@@ -3830,7 +3829,6 @@ bool ArmArchitecture::Instruction_ADC_A1_0fe00090_00a00010(BinaryStream const& r
   auto pOprd2 = rInsn.Operand(2);
   pOprd2->SetType(O_REG32);
   pOprd2->SetReg(1 << ExtractBits<0, 3>(Opcode));
-  std::cout << "BLA: " << pOprd2->GetReg() << std::endl;
   return true;
 }
 // ADD{S}<c> <Rd>, <Rn>,#<const> - ['c', 'c', 'c', 'c', 0, 0, 1, 0, 1, 0, 0, 'S', 'n', 'n', 'n', 'n', 'd', 'd', 'd', 'd', 'i', 'i', 'i', 'i', 'i', 'i', 'i', 'i', 'i', 'i', 'i', 'i']

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -94,19 +94,19 @@ set(SRC
   ${SRCROOT}/xref.cpp
   )
 
-if(WIN32)
+if (WIN32)
   set(SRC
     ${SRC}
     ${SRCROOT}/windows_binary_stream.cpp
     ${SRCROOT}/windows_module.cpp
     )
-else()
+else ()
   set(SRC
     ${SRC}
     ${SRCROOT}/unix_binary_stream.cpp
     ${SRCROOT}/unix_module.cpp
     )
-endif()
+endif ()
 
 # define libMedusa architecture target
 add_library(Medusa SHARED ${SRC})
@@ -119,10 +119,11 @@ if (DL_LIBRARY)
   target_link_libraries(Medusa dl)
 endif ()
 
-if(WIN32)
+if (WIN32)
   install(TARGETS Medusa RUNTIME DESTINATION .)
+  file(GLOB boost_system_dll     "${Boost_LIBRARY_DIRS}/boost_system-*-mt-1*.dll")
   file(GLOB boost_filesystem_dll "${Boost_LIBRARY_DIRS}/boost_filesystem-*-mt-1*.dll")
-  install(FILES "${boost_filesystem_dll}" DESTINATION .)
-else()
+  install(FILES "${boost_system_dll}" "${boost_filesystem_dll}" DESTINATION .)
+else ()
   install(TARGETS Medusa LIBRARY DESTINATION .)
-endif()
+endif ()
diff --git a/src/ui/qt/CMakeLists.txt b/src/ui/qt/CMakeLists.txt
@@ -99,4 +99,31 @@ add_executable(qMedusa ${GUI_TYPE}
 qt5_use_modules(qMedusa Widgets)
 target_link_libraries(qMedusa Medusa ${CMAKE_THREAD_LIBS_INIT} ${OGDF_LIBRARIES})
 
+# I can't believe how hard it is to deploy qt5...
+# Inspired from http://pastebin.com/an3dyt51
+# ref: http://qt-project.org/doc/qt-5/windows-deployment.html#creating-the-application-package
+if (WIN32)
+
+  set(QT5_BIN_PATH ${QT5_CMAKE_PATH}/../bin)
+  file(TO_CMAKE_PATH ${QT5_BIN_PATH} QT5_BIN_PATH)
+
+  list(APPEND QT5_NEEDED_DLL ${QT5_BIN_PATH}/Qt5Gui.dll)
+  list(APPEND QT5_NEEDED_DLL ${QT5_BIN_PATH}/Qt5Core.dll)
+  list(APPEND QT5_NEEDED_DLL ${QT5_BIN_PATH}/libGLESv2.dll)
+
+  file(GLOB icuin_dll ${QT5_BIN_PATH}/icuin*.dll)
+  list(APPEND QT5_NEEDED_DLL ${icuin_dll})
+  file(GLOB icuuc_dll ${QT5_BIN_PATH}/icuuc*.dll)
+  list(APPEND QT5_NEEDED_DLL ${icuuc_dll})
+  file(GLOB icudt_dll ${QT5_BIN_PATH}/icudt*.dll)
+  list(APPEND QT5_NEEDED_DLL ${icudt_dll})
+  file(GLOB d3dcompiler_dll ${QT5_BIN_PATH}/d3dcompiler_*.dll)
+  list(APPEND QT5_NEEDED_DLL ${d3dcompiler_dll})
+
+  foreach (lib ${QT5_NEEDED_DLL})
+    install(FILES ${lib} DESTINATION .)
+  endforeach ()
+
+endif ()
+
 install(TARGETS qMedusa RUNTIME DESTINATION .)