Skip to content

Commit fd97096

Browse files
committed
Build on libidacpp; fix monitor deactivating after a .deps index change
1 parent 9ea89e2 commit fd97096

11 files changed

Lines changed: 942 additions & 719 deletions

‎CMakeLists.txt‎

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,46 +17,35 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
1717
include($ENV{IDASDK}/ida-cmake/bootstrap.cmake)
1818
find_package(idasdk REQUIRED)
1919

20-
# Resolve idacpp: optional local path (-DIDACPP_PATH) -> IDASDK -> FetchContent
21-
set(IDACPP_PATH "" CACHE PATH "Optional path to a local idacpp checkout")
22-
set(IDACPP_SDK_PATH "$ENV{IDASDK}/include/idacpp")
23-
set(IDACPP_LOCAL_PATH "${CMAKE_CURRENT_BINARY_DIR}/idacpp")
24-
25-
if(IDACPP_PATH AND EXISTS "${IDACPP_PATH}/CMakeLists.txt")
26-
message(STATUS "Using idacpp from IDACPP_PATH: ${IDACPP_PATH}")
27-
add_subdirectory(${IDACPP_PATH} ${CMAKE_CURRENT_BINARY_DIR}/idacpp)
28-
elseif(EXISTS "${IDACPP_SDK_PATH}/CMakeLists.txt")
29-
message(STATUS "Using idacpp from IDASDK: ${IDACPP_SDK_PATH}")
30-
add_subdirectory(${IDACPP_SDK_PATH} ${CMAKE_CURRENT_BINARY_DIR}/idacpp)
20+
# Resolve libidacpp: use a local ../libidacpp if present, otherwise fetch it.
21+
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../libidacpp/CMakeLists.txt")
22+
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../libidacpp ${CMAKE_CURRENT_BINARY_DIR}/libidacpp)
3123
else()
32-
message(STATUS "Fetching idacpp from github.com/allthingsida/libidacpp...")
3324
include(FetchContent)
3425
FetchContent_Declare(
35-
idacpp
26+
libidacpp
3627
GIT_REPOSITORY https://github.com/allthingsida/libidacpp.git
3728
GIT_TAG main
38-
SOURCE_DIR ${IDACPP_LOCAL_PATH}
3929
)
40-
FetchContent_MakeAvailable(idacpp)
30+
FetchContent_MakeAvailable(libidacpp)
4131
endif()
4232

4333
# Convert paths to native format
4434
set(SAMPLE_IDB "${IDA_CMAKE_DIR}/samples/wizmo32.exe.i64")
4535
file(TO_NATIVE_PATH "${SAMPLE_IDB}" SAMPLE_IDB)
4636

47-
# Disabled sources
48-
list(APPEND DISABLED_SOURCES utils_impl.cpp)
49-
set_source_files_properties(${DISABLED_SOURCES} PROPERTIES LANGUAGE "")
50-
5137
# Add plugin
5238
ida_add_plugin(qscripts
5339
SOURCES
5440
qscripts.cpp
55-
ida.h
41+
qscripts_monitor.cpp
5642
script.hpp
57-
${DISABLED_SOURCES}
43+
qscripts_utils.h
44+
qscripts_expander.h
45+
qscripts_deps.h
46+
qscripts_monitor.h
5847
DEBUG_ARGS
5948
"${SAMPLE_IDB}"
6049
)
6150

62-
target_link_libraries(qscripts PRIVATE idacpp::idacpp)
51+
target_link_libraries(qscripts PRIVATE libidacpp::libidacpp)

‎TODO.md‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎ida-plugin.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"IDAMetadataDescriptorVersion": 1,
33
"plugin": {
44
"name": "QScripts",
5-
"version": "1.2.7",
5+
"version": "1.2.8",
66
"entryPoint": "qscripts",
77
"description": "Develop IDA scripts faster with hot-reload and automatic execution on file changes. Supports Python, IDC, and compiled plugins with dependency tracking.",
88
"urls": {

‎ida.h‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)