From 6929009578958634304404179659515738797945 Mon Sep 17 00:00:00 2001 From: Glenn Smith Date: Mon, 22 Apr 2024 19:11:45 -0400 Subject: Fix pdb compile on Free edition --- rust/examples/pdb-ng/CMakeLists.txt | 5 +---- rust/examples/pdb-ng/Cargo.toml | 3 --- rust/examples/pdb-ng/demo/Cargo.toml | 7 +------ 3 files changed, 2 insertions(+), 13 deletions(-) (limited to 'rust/examples') diff --git a/rust/examples/pdb-ng/CMakeLists.txt b/rust/examples/pdb-ng/CMakeLists.txt index 86013c5a..c88d4125 100644 --- a/rust/examples/pdb-ng/CMakeLists.txt +++ b/rust/examples/pdb-ng/CMakeLists.txt @@ -29,14 +29,11 @@ endif() if(DEMO) set(CARGO_FEATURES --features demo --manifest-path ${PROJECT_SOURCE_DIR}/demo/Cargo.toml) - set(OUTPUT_FILE_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}${PROJECT_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}) + set(OUTPUT_FILE_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}${PROJECT_NAME}_static${CMAKE_STATIC_LIBRARY_SUFFIX}) set(OUTPUT_PDB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}${PROJECT_NAME}.pdb) set(OUTPUT_FILE_PATH ${CMAKE_BINARY_DIR}/${OUTPUT_FILE_NAME}) set(OUTPUT_PDB_PATH ${CMAKE_BINARY_DIR}/${OUTPUT_PDB_NAME}) - set(STATIC_FILE_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}${PROJECT_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}) - set(STATIC_FILE_PATH ${CMAKE_BINARY_DIR}/${STATIC_FILE_NAME}) - set(BINJA_LIB_DIR $) else() set(CARGO_FEATURES "") diff --git a/rust/examples/pdb-ng/Cargo.toml b/rust/examples/pdb-ng/Cargo.toml index 093c067f..8636bced 100644 --- a/rust/examples/pdb-ng/Cargo.toml +++ b/rust/examples/pdb-ng/Cargo.toml @@ -18,6 +18,3 @@ regex = "1" [features] demo = [] - -[profile.release] -debug = 1 diff --git a/rust/examples/pdb-ng/demo/Cargo.toml b/rust/examples/pdb-ng/demo/Cargo.toml index 2d5b0bc4..656d1c6c 100644 --- a/rust/examples/pdb-ng/demo/Cargo.toml +++ b/rust/examples/pdb-ng/demo/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "pdb-import-plugin" +name = "pdb-import-plugin-static" version = "0.1.0" edition = "2021" @@ -17,10 +17,5 @@ pdb = "^0.8" cab = "^0.4" regex = "1" -[patch.crates-io] -# Patched pdb crate to implement some extra structures -# If I haven't PR'd this to their repo by the time we ship, DM me until I get to it -pdb = { path = "../pdb-0.8.0-patched" } - [features] demo = [] -- cgit v1.3.1