1
0
mirror of synced 2024-09-24 03:28:24 +02:00

build: More repo cleanup, move libimhex and external libs to /lib folder

This commit is contained in:
WerWolv 2022-01-16 14:20:52 +01:00
parent a5a1ae6725
commit 40d7e4aa6e
232 changed files with 62 additions and 75 deletions

28
.gitmodules vendored
View File

@ -1,26 +1,26 @@
[submodule "external/nativefiledialog"] [submodule "lib/external/nativefiledialog"]
path = external/nativefiledialog path = lib/external/nativefiledialog
url = https://github.com/btzy/nativefiledialog-extended url = https://github.com/btzy/nativefiledialog-extended
ignore = dirty ignore = dirty
[submodule "external/yara/yara"] [submodule "lib/external/yara/yara"]
path = external/yara/yara path = lib/external/yara/yara
url = https://github.com/VirusTotal/yara url = https://github.com/VirusTotal/yara
ignore = dirty ignore = dirty
[submodule "external/xdgpp"] [submodule "lib/external/xdgpp"]
path = external/xdgpp path = lib/external/xdgpp
url = https://git.sr.ht/~danyspin97/xdgpp url = https://git.sr.ht/~danyspin97/xdgpp
ignore = dirty ignore = dirty
[submodule "external/fmt"] [submodule "lib/external/fmt"]
path = external/fmt path = lib/external/fmt
url = https://github.com/fmtlib/fmt url = https://github.com/fmtlib/fmt
ignore = dirty ignore = dirty
[submodule "external/curl"] [submodule "lib/external/curl"]
path = external/curl path = lib/external/curl
url = https://github.com/curl/curl url = https://github.com/curl/curl
ignore = dirty ignore = dirty
[submodule "external/capstone"] [submodule "lib/external/capstone"]
path = external/capstone path = lib/external/capstone
url = https://github.com/capstone-engine/capstone url = https://github.com/capstone-engine/capstone
[submodule "external/libromfs"] [submodule "lib/external/libromfs"]
path = external/libromfs path = lib/external/libromfs
url = https://github.com/WerWolv/libromfs url = https://github.com/WerWolv/libromfs

View File

@ -17,6 +17,9 @@ detectBadClone()
set(PLUGINS set(PLUGINS
builtin builtin
windows windows
example_cpp
example_rust
) )
# Add various defines # Add various defines
@ -26,7 +29,7 @@ addVersionDefines()
configurePackingResources() configurePackingResources()
# Add ImHex sources # Add ImHex sources
add_subdirectory(plugins/libimhex) add_subdirectory(lib/libimhex)
add_subdirectory(main) add_subdirectory(main)
add_custom_target(imhex ALL DEPENDS main) add_custom_target(imhex ALL DEPENDS main)

View File

@ -152,7 +152,7 @@ make -j
To create a standalone zipfile on Windows, get the Python standard library (e.g. from https://github.com/python/cpython/tree/master/Lib) and place the files and folders in `lib/python3.8` next to your built executable. Don't forget to also copy the `libpython3.8.dll` and `libwinpthread-1.dll` from your mingw setup next to the executable. To create a standalone zipfile on Windows, get the Python standard library (e.g. from https://github.com/python/cpython/tree/master/Lib) and place the files and folders in `lib/python3.8` next to your built executable. Don't forget to also copy the `libpython3.8.dll` and `libwinpthread-1.dll` from your mingw setup next to the executable.
- Copy the files from `python_libs` in the `lib` folder next to your built executable. - Copy the files inside the `/resources/lib/python` folder into the `lib` folder next to your built executable.
- Place your magic databases in the `magic` folder next to your built executable - Place your magic databases in the `magic` folder next to your built executable
- Place your patterns in the `pattern` folder next to your built executable - Place your patterns in the `pattern` folder next to your built executable
- Place your include pattern files in the `include` folder next to your built executable - Place your include pattern files in the `include` folder next to your built executable

View File

View File

View File

@ -81,7 +81,7 @@ dependencies = [
] ]
[[package]] [[package]]
name = "hex" name = "libimhex-rs"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"cxx", "cxx",

View File

@ -1,5 +1,5 @@
[package] [package]
name = "hex" name = "libimhex-rs"
version = "0.1.0" version = "0.1.0"
edition = "2018" edition = "2018"
build = "build.rs" build = "build.rs"
@ -7,7 +7,7 @@ build = "build.rs"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
macros = { path = "proc_macros" } imhex-macros = { path = "proc_macros" }
imgui = { path = "imgui-rs" } imgui = { path = "imgui-rs" }
cxx = "1.0.55" cxx = "1.0.55"

View File

@ -0,0 +1 @@
../README.markdown

Some files were not shown because too many files have changed in this diff Show More