Skip to content

[make] Set rpath for hdll builds #571

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[make] Set rpath for hdll builds #571

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5417002
[make] Set rpath for hdll builds
tobil4sk Nov 3, 2022
e59b1e9
Add ORIGIN to hdll rpath
tobil4sk Nov 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ CFLAGS = -Wall -O3 -I src -msse2 -mfpmath=sse -std=c11 -D LIBHL_EXPORTS
LFLAGS = -L. -lhl
EXTRA_LFLAGS ?=
LIBFLAGS =
HDLLFLAGS = -L. -lhl
HLFLAGS = -ldl
LIBEXT = so
LIBTURBOJPEG = -lturbojpeg
Expand Down Expand Up @@ -107,6 +108,7 @@ else
# Linux
CFLAGS += -m$(MARCH) -fPIC -pthread -fno-omit-frame-pointer
LFLAGS += -lm -Wl,-rpath,.:'$$ORIGIN':$(INSTALL_LIB_DIR) -Wl,--export-dynamic -Wl,--no-undefined
HDLLFLAGS += -Wl,-rpath,'$$ORIGIN':$(INSTALL_LIB_DIR)

ifeq ($(MARCH),32)
CFLAGS += -I /usr/include/i386-linux-gnu
Expand Down Expand Up @@ -167,28 +169,28 @@ libs/fmt/%.o: libs/fmt/%.c
${CC} ${CFLAGS} -o $@ -c $< ${FMT_INCLUDE}

fmt: ${FMT} libhl
${CC} ${CFLAGS} -shared -o fmt.hdll ${FMT} ${LIBFLAGS} -L. -lhl -lpng $(LIBTURBOJPEG) -lz -lvorbisfile
${CC} ${CFLAGS} -shared -o fmt.hdll ${FMT} ${LIBFLAGS} ${HDLLFLAGS} -lpng $(LIBTURBOJPEG) -lz -lvorbisfile

sdl: ${SDL} libhl
${CC} ${CFLAGS} -shared -o sdl.hdll ${SDL} ${LIBFLAGS} -L. -lhl -lSDL2 $(LIBOPENGL)
${CC} ${CFLAGS} -shared -o sdl.hdll ${SDL} ${LIBFLAGS} ${HDLLFLAGS} -lSDL2 $(LIBOPENGL)

openal: ${OPENAL} libhl
${CC} ${CFLAGS} -shared -o openal.hdll ${OPENAL} ${LIBFLAGS} -L. -lhl $(LIBOPENAL)
${CC} ${CFLAGS} -shared -o openal.hdll ${OPENAL} ${LIBFLAGS} ${HDLLFLAGS} $(LIBOPENAL)

ssl: ${SSL} libhl
${CC} ${CFLAGS} -shared -o ssl.hdll ${SSL} ${LIBFLAGS} -L. -lhl -lmbedtls -lmbedx509 -lmbedcrypto $(LIBSSL)
${CC} ${CFLAGS} -shared -o ssl.hdll ${SSL} ${LIBFLAGS} ${HDLLFLAGS} -lmbedtls -lmbedx509 -lmbedcrypto $(LIBSSL)

ui: ${UI} libhl
${CC} ${CFLAGS} -shared -o ui.hdll ${UI} ${LIBFLAGS} -L. -lhl
${CC} ${CFLAGS} -shared -o ui.hdll ${UI} ${LIBFLAGS} ${HDLLFLAGS}

uv: ${UV} libhl
${CC} ${CFLAGS} -shared -o uv.hdll ${UV} ${LIBFLAGS} -L. -lhl -luv
${CC} ${CFLAGS} -shared -o uv.hdll ${UV} ${LIBFLAGS} ${HDLLFLAGS} -luv

mysql: ${MYSQL} libhl
${CC} ${CFLAGS} -shared -o mysql.hdll ${MYSQL} ${LIBFLAGS} -L. -lhl
${CC} ${CFLAGS} -shared -o mysql.hdll ${MYSQL} ${LIBFLAGS} ${HDLLFLAGS}

sqlite: ${SQLITE} libhl
${CC} ${CFLAGS} -shared -o sqlite.hdll ${SQLITE} ${LIBFLAGS} -L. -lhl -lsqlite3
${CC} ${CFLAGS} -shared -o sqlite.hdll ${SQLITE} ${LIBFLAGS} ${HDLLFLAGS} -lsqlite3

mesa:
(cd libs/mesa && ${MAKE})
Expand Down