Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: Use abi-compatible directory for loading plugins #20545

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

WIP: Use abi-compatible directory for loading plugins #20545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ libr/include/r_version.h:
@echo '#define R_VERSION_H 1' >> [email protected]
@echo '#define R2_VERSION_COMMIT $(R2VC)' >> [email protected]
@echo '#define R2_VERSION "$(R2_VERSION)"' >> [email protected]
@echo '#define R2_VERSION_ABI "$(R2_VERSION_MAJOR).$(R2_VERSION_MINOR).x"' >> [email protected]
@echo '#define R2_VERSION_MAJOR $(R2_VERSION_MAJOR)' >> [email protected]
@echo '#define R2_VERSION_MINOR $(R2_VERSION_MINOR)' >> [email protected]
@echo '#define R2_VERSION_PATCH $(R2_VERSION_PATCH)' >> [email protected]
Expand Down
6 changes: 3 additions & 3 deletions libr/include/r_userconf.h.acr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ extern "C" {
#define R2_INCDIR "@INCLUDEDIR@/libr"
#define R2_DATDIR "@DATADIR@"
#define R2_WWWROOT R2_DATDIR "/radare2/" R2_VERSION "/www"
#define R2_PLUGINS "lib/radare2/" R2_VERSION
#define R2_EXTRAS "lib/radare2-extras/" R2_VERSION
#define R2_BINDINGS "lib/radare2-bindings/" R2_VERSION
#define R2_PLUGINS "lib/radare2/" R2_VERSION_ABI
#define R2_EXTRAS "lib/radare2-extras/" R2_VERSION_ABI
#define R2_BINDINGS "lib/radare2-bindings/" R2_VERSION_ABI
#endif
#define R2_DATDIR_R2 R_JOIN_2_PATHS ("share", "radare2")
#define R2_SDB R_JOIN_3_PATHS ("share", "radare2", R2_VERSION)
Expand Down
1 change: 1 addition & 0 deletions libr/include/r_version.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef R_VERSION_H
#define R_VERSION_H 1
#define R_MESON_VERSION "@MESON_VERSION@"
#define R2_VERSION_ABI "@R2_VERSION_MAJOR@.@[email protected]"
#define R2_VERSION_MAJOR @R2_VERSION_MAJOR@
#define R2_VERSION_MINOR @R2_VERSION_MINOR@
#define R2_VERSION_PATCH @R2_VERSION_PATCH@
Expand Down