Fix: 2023-07-22

horsicq · Jul 21, 2023 · 7fef403 · 7fef403
1 parent 86e26b8
commit 7fef403
Show file tree

Hide file tree

Showing 2 changed files with 187 additions and 169 deletions.
diff --git a/gui_source/CMakeLists.txt b/gui_source/CMakeLists.txt
@@ -1,89 +1,99 @@
-cmake_minimum_required(VERSION 3.10)
-
-project(die VERSION 3.08 LANGUAGES CXX)
-
-include_guard(DIRECTORY)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-file(MAKE_DIRECTORY ../release)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ../release)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ../release)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ../release)
-
-find_package(QT NAMES Qt5 COMPONENTS Widgets REQUIRED)
-find_package(Qt5 COMPONENTS Widgets REQUIRED)
-find_package(Qt5 COMPONENTS Concurrent REQUIRED)
-find_package(Qt5 COMPONENTS OpenGL REQUIRED)
-find_package(Qt5 COMPONENTS PrintSupport REQUIRED)
-find_package(Qt5 COMPONENTS Svg REQUIRED)
-find_package(Qt5 COMPONENTS Sql REQUIRED)
-find_package(Qt5 COMPONENTS Network REQUIRED)
-find_package(Qt5 COMPONENTS Script REQUIRED)
-find_package(Qt5 COMPONENTS ScriptTools REQUIRED)
-
-add_definitions(-DUSE_DEX)
-add_definitions(-DUSE_PDF)
-add_definitions(-DUSE_ARCHIVE)
-
-include(${PROJECT_SOURCE_DIR}/../XMIMEWidget/xmimewidget.cmake)
-include(${PROJECT_SOURCE_DIR}/../FormatWidgets/formatwidgets.cmake)
-include(${PROJECT_SOURCE_DIR}/../XSingleApplication/xsingleapplication.cmake)
-include(${PROJECT_SOURCE_DIR}/../XAboutWidget/xaboutwidget.cmake)
-
-set(PROJECT_SOURCES
-            ${XMIMEWIDGET_SOURCES}
-            ${FORMATWIDGETS_SOURCES}
-            ${XSINGLEAPPLICATION_SOURCES}
-            ${XABOUTWIDGET_SOURCES}
-            dialogabout.cpp
-            dialogabout.ui
-            dialogoptions.cpp
-            dialogoptions.ui
-            guimainwindow.cpp
-            guimainwindow.ui
-            main_gui.cpp
-            res.qrc
-)
-
-if(APPLE)
-    add_library(${PROJECT_NAME} MODULE ${PROJECT_SOURCES})
-    set_target_properties(${PROJECT_NAME} PROPERTIES
-            MACOSX_BUNDLE_GUI_IDENTIFIER ntinfo.die
-            MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
-            MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
-            BUNDLE TRUE)
-    set(MACOSX_BUNDLE_ICON_FILE ../icons/main.icns)
-else()
-    add_executable(${PROJECT_NAME} WIN32
-        ${PROJECT_SOURCES}
-    )
-endif()
-
-target_link_libraries(${PROJECT_NAME} bzip2)
-target_link_libraries(${PROJECT_NAME} lzma)
-target_link_libraries(${PROJECT_NAME} zlib)
-target_link_libraries(${PROJECT_NAME} capstone)
-target_link_libraries(${PROJECT_NAME} cppfilt)
-
-target_link_libraries(${PROJECT_NAME} Qt5::Widgets)
-target_link_libraries(${PROJECT_NAME} Qt5::Concurrent)
-target_link_libraries(${PROJECT_NAME} Qt5::OpenGL)
-target_link_libraries(${PROJECT_NAME} Qt5::PrintSupport)
-target_link_libraries(${PROJECT_NAME} Qt5::Svg)
-target_link_libraries(${PROJECT_NAME} Qt5::Sql)
-target_link_libraries(${PROJECT_NAME} Qt5::Network)
-target_link_libraries(${PROJECT_NAME} Qt5::Script)
-target_link_libraries(${PROJECT_NAME} Qt5::ScriptTools)
-
-if(WIN32)
-    target_link_libraries(${PROJECT_NAME} Wintrust)
-    target_link_libraries(${PROJECT_NAME} Crypt32)
-endif()
+cmake_minimum_required(VERSION 3.10)
+
+project(die VERSION 3.08 LANGUAGES CXX)
+
+include_guard(DIRECTORY)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+file(MAKE_DIRECTORY ../release)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ../release)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ../release)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ../release)
+
+find_package(QT NAMES Qt5 COMPONENTS Widgets REQUIRED)
+find_package(Qt5 COMPONENTS Widgets REQUIRED)
+find_package(Qt5 COMPONENTS Concurrent REQUIRED)
+find_package(Qt5 COMPONENTS OpenGL REQUIRED)
+find_package(Qt5 COMPONENTS PrintSupport REQUIRED)
+find_package(Qt5 COMPONENTS Svg REQUIRED)
+find_package(Qt5 COMPONENTS Sql REQUIRED)
+find_package(Qt5 COMPONENTS Network REQUIRED)
+find_package(Qt5 COMPONENTS Script REQUIRED)
+find_package(Qt5 COMPONENTS ScriptTools REQUIRED)
+
+add_definitions(-DUSE_DEX)
+add_definitions(-DUSE_PDF)
+add_definitions(-DUSE_ARCHIVE)
+
+if(LINUX)
+    add_definitions(-DUSE_YARA)
+endif()
+if(WIN32)
+    add_definitions(-DUSE_YARA)
+endif()
+
+include(${PROJECT_SOURCE_DIR}/../XMIMEWidget/xmimewidget.cmake)
+include(${PROJECT_SOURCE_DIR}/../FormatWidgets/formatwidgets.cmake)
+include(${PROJECT_SOURCE_DIR}/../XSingleApplication/xsingleapplication.cmake)
+include(${PROJECT_SOURCE_DIR}/../XAboutWidget/xaboutwidget.cmake)
+
+set(PROJECT_SOURCES
+            ${XMIMEWIDGET_SOURCES}
+            ${FORMATWIDGETS_SOURCES}
+            ${XSINGLEAPPLICATION_SOURCES}
+            ${XABOUTWIDGET_SOURCES}
+            dialogabout.cpp
+            dialogabout.ui
+            dialogoptions.cpp
+            dialogoptions.ui
+            dialogselectstyle.cpp
+            dialogselectstyle.ui
+            guimainwindow.cpp
+            guimainwindow.ui
+            main_gui.cpp
+            res.qrc
+)
+
+if(APPLE)
+    add_library(${PROJECT_NAME} MODULE ${PROJECT_SOURCES})
+    set_target_properties(${PROJECT_NAME} PROPERTIES
+            MACOSX_BUNDLE_GUI_IDENTIFIER ntinfo.die
+            MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
+            MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
+            BUNDLE TRUE)
+    set(MACOSX_BUNDLE_ICON_FILE ../icons/main.icns)
+else()
+    add_executable(${PROJECT_NAME} WIN32
+        ${PROJECT_SOURCES}
+    )
+endif()
+
+target_link_libraries(${PROJECT_NAME} bzip2)
+target_link_libraries(${PROJECT_NAME} lzma)
+target_link_libraries(${PROJECT_NAME} zlib)
+target_link_libraries(${PROJECT_NAME} capstone)
+target_link_libraries(${PROJECT_NAME} cppfilt)
+target_link_libraries(${PROJECT_NAME} yara)
+
+target_link_libraries(${PROJECT_NAME} Qt5::Widgets)
+target_link_libraries(${PROJECT_NAME} Qt5::Concurrent)
+target_link_libraries(${PROJECT_NAME} Qt5::OpenGL)
+target_link_libraries(${PROJECT_NAME} Qt5::PrintSupport)
+target_link_libraries(${PROJECT_NAME} Qt5::Svg)
+target_link_libraries(${PROJECT_NAME} Qt5::Sql)
+target_link_libraries(${PROJECT_NAME} Qt5::Network)
+target_link_libraries(${PROJECT_NAME} Qt5::Script)
+target_link_libraries(${PROJECT_NAME} Qt5::ScriptTools)
+
+if(WIN32)
+    target_link_libraries(${PROJECT_NAME} Wintrust)
+    target_link_libraries(${PROJECT_NAME} Crypt32)
+endif()
diff --git a/gui_source/gui_source.pro b/gui_source/gui_source.pro
@@ -1,80 +1,88 @@
-QT       += core gui
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
-CONFIG += c++11
-TARGET = die
-
-XCONFIG += use_dex
-XCONFIG += use_pdf
-XCONFIG += use_archive
-
-macx {
-    TARGET = DiE
-}
-
-#linux {
-#    TARGET = dieg
-#}
-
-SOURCES += \
-    dialogabout.cpp \
-    dialogoptions.cpp \
-    guimainwindow.cpp \
-    main_gui.cpp
-
-HEADERS += \
-    dialogabout.h \
-    dialogoptions.h \
-    guimainwindow.h
-
-FORMS += \
-    dialogabout.ui \
-    dialogoptions.ui \
-    guimainwindow.ui
-
-include(../build.pri)
-
-!contains(XCONFIG, xmimewidget) {
-    XCONFIG += xmimewidget
-    include(../XMIMEWidget/xmimewidget.pri)
-}
-
-!contains(XCONFIG, formatwidgets) {
-    XCONFIG += formatwidgets
-    include(../FormatWidgets/formatwidgets.pri)
-}
-
-!contains(XCONFIG, xsingleapplication) {
-    XCONFIG += xsingleapplication
-    include(../XSingleApplication/xsingleapplication.pri)
-}
-
-!contains(XCONFIG, xaboutwidget) {
-    XCONFIG += xaboutwidget
-    include(../XAboutWidget/xaboutwidget.pri)
-}
-
-RESOURCES += \
-    res.qrc
-
-win32 {
-    RC_ICONS = ../icons/main.ico
-    CONFIG -= embed_manifest_exe
-    QMAKE_MANIFEST = windows.manifest.xml
-    VERSION = 3.08.0.0
-    QMAKE_TARGET_COMPANY = NTInfo
-    QMAKE_TARGET_PRODUCT = Detect It Easy
-    QMAKE_TARGET_DESCRIPTION = Detect It Easy(DiE)
-    QMAKE_TARGET_COPYRIGHT = horsicq@gmail.com
-}
-
-macx {
-    ICON = ../icons/main.icns
-}
-
-DISTFILES += \
-    ../CMakeLists.txt \
-    ../README.md \
-    ../release_version.txt \
-    CMakeLists.txt
+QT       += core gui
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+CONFIG += c++11
+TARGET = die
+
+XCONFIG += use_dex
+XCONFIG += use_pdf
+XCONFIG += use_archive
+
+macx {
+    TARGET = DiE
+}
+
+#linux {
+#    TARGET = dieg
+#}
+
+SOURCES += \
+    dialogabout.cpp \
+    dialogoptions.cpp \
+    dialogselectstyle.cpp \
+    guimainwindow.cpp \
+    main_gui.cpp
+
+HEADERS += \
+    dialogabout.h \
+    dialogoptions.h \
+    dialogselectstyle.h \
+    guimainwindow.h
+
+FORMS += \
+    dialogabout.ui \
+    dialogoptions.ui \
+    dialogselectstyle.ui \
+    guimainwindow.ui
+
+include(../build.pri)
+
+!contains(XCONFIG, xmimewidget) {
+    XCONFIG += xmimewidget
+    include(../XMIMEWidget/xmimewidget.pri)
+}
+
+!contains(XCONFIG, formatwidgets) {
+    XCONFIG += formatwidgets
+    include(../FormatWidgets/formatwidgets.pri)
+}
+
+!contains(XCONFIG, xsingleapplication) {
+    XCONFIG += xsingleapplication
+    include(../XSingleApplication/xsingleapplication.pri)
+}
+
+!contains(XCONFIG, xoptionswidget) {
+    XCONFIG += xoptionswidget
+    include(../XOptions/xoptionswidget.pri)
+}
+
+!contains(XCONFIG, xaboutwidget) {
+    XCONFIG += xaboutwidget
+    include(../XAboutWidget/xaboutwidget.pri)
+}
+
+RESOURCES += \
+    res.qrc
+
+win32 {
+    RC_ICONS = ../icons/main.ico
+    CONFIG -= embed_manifest_exe
+    QMAKE_MANIFEST = windows.manifest.xml
+    VERSION = 3.08.0.0
+    QMAKE_TARGET_COMPANY = NTInfo
+    QMAKE_TARGET_PRODUCT = Detect It Easy
+    QMAKE_TARGET_DESCRIPTION = Detect It Easy(DiE)
+    QMAKE_TARGET_COPYRIGHT = horsicq@gmail.com
+}
+
+macx {
+    ICON = ../icons/main.icns
+}
+
+DISTFILES += \
+    ../CMakeLists.txt \
+    ../README.md \
+    ../release_version.txt \
+    CMakeLists.txt