d91372f3ae
Also tested with other major hashlink games without issues: Dead Cells, Nuclear Blaze, Evoland Legendary Edition. Northgard DLC Cross of Vidar needs hlvideo (video.hdll library) before this can be run.
131 lines
4.3 KiB
Plaintext
131 lines
4.3 KiB
Plaintext
remove -m$(ARCH)
|
|
add versioning to libhl
|
|
{CFLAGS} -> (CFLAGS) to not get picked up by SUBST_CMD
|
|
remove Linux's 32-/64-bit detection
|
|
remove Darwin detection in install target (breaks 'make fake')
|
|
|
|
Index: Makefile
|
|
--- Makefile.orig
|
|
+++ Makefile
|
|
@@ -1,6 +1,4 @@
|
|
|
|
-LBITS := $(shell getconf LONG_BIT)
|
|
-MARCH ?= $(LBITS)
|
|
PREFIX ?= /usr/local
|
|
INSTALL_DIR ?= $(PREFIX)
|
|
INSTALL_BIN_DIR ?= $(PREFIX)/bin
|
|
@@ -9,12 +7,12 @@ INSTALL_INCLUDE_DIR ?= $(PREFIX)/include
|
|
|
|
LIBS=fmt sdl ssl openal ui uv mysql sqlite
|
|
|
|
-CFLAGS = -Wall -O3 -I src -msse2 -mfpmath=sse -std=c11 -D LIBHL_EXPORTS
|
|
-LFLAGS = -L. -lhl
|
|
+CFLAGS = ${CFLAGS} -I src -I${LOCALBASE}/include -I${X11BASE}/include -std=c11 -I include -I include/pcre -I include/mikktspace -I include/minimp3 -D LIBHL_EXPORTS
|
|
+LFLAGS = -L. -L${LOCALBASE} -lhl
|
|
EXTRA_LFLAGS ?=
|
|
-LIBFLAGS =
|
|
-HLFLAGS = -ldl
|
|
-LIBEXT = so
|
|
+LIBFLAGS = -L${LOCALBASE}/lib -L${X11BASE}/lib
|
|
+HLFLAGS =
|
|
+LIBEXT = so.${LIBhl_VERSION}
|
|
LIBTURBOJPEG = -lturbojpeg
|
|
|
|
PCRE_FLAGS = -I include/pcre
|
|
@@ -105,16 +103,9 @@ LIB += ${HL_DEBUG}
|
|
else
|
|
|
|
# Linux
|
|
-CFLAGS += -m$(MARCH) -fPIC -pthread -fno-omit-frame-pointer
|
|
+CFLAGS += -fPIC -pthread -fno-omit-frame-pointer
|
|
LFLAGS += -lm -Wl,-rpath,.:'$$ORIGIN':$(INSTALL_LIB_DIR) -Wl,--export-dynamic -Wl,--no-undefined
|
|
|
|
-ifeq ($(MARCH),32)
|
|
-CFLAGS += -I /usr/include/i386-linux-gnu
|
|
-LIBFLAGS += -L/opt/libjpeg-turbo/lib
|
|
-else
|
|
-LIBFLAGS += -L/opt/libjpeg-turbo/lib64
|
|
-endif
|
|
-
|
|
LIBOPENAL = -lopenal
|
|
LIBOPENGL = -lGL
|
|
RELEASE_NAME = linux
|
|
@@ -133,7 +124,6 @@ endif
|
|
all: libhl hl libs
|
|
|
|
install:
|
|
- $(UNAME)==Darwin && ${MAKE} uninstall
|
|
mkdir -p $(INSTALL_BIN_DIR)
|
|
cp hl $(INSTALL_BIN_DIR)
|
|
mkdir -p $(INSTALL_LIB_DIR)
|
|
@@ -149,46 +139,46 @@ uninstall:
|
|
libs: $(LIBS)
|
|
|
|
./include/pcre/%.o: include/pcre/%.c
|
|
- ${CC} ${CFLAGS} -o $@ -c $< ${PCRE_FLAGS}
|
|
+ ${CC} $(CFLAGS) -o $@ -c $< ${PCRE_FLAGS}
|
|
|
|
src/std/regexp.o: src/std/regexp.c
|
|
- ${CC} ${CFLAGS} -o $@ -c $< ${PCRE_FLAGS}
|
|
+ ${CC} $(CFLAGS) -o $@ -c $< ${PCRE_FLAGS}
|
|
|
|
libhl: ${LIB}
|
|
- ${CC} -o libhl.$(LIBEXT) -m${MARCH} ${LIBFLAGS} -shared ${LIB} -lpthread -lm
|
|
+ ${CC} -o libhl.$(LIBEXT) ${LIBFLAGS} -shared ${LIB} -lpthread -lm
|
|
|
|
hlc: ${BOOT}
|
|
- ${CC} ${CFLAGS} -o hlc ${BOOT} ${LFLAGS} ${EXTRA_LFLAGS}
|
|
+ ${CC} $(CFLAGS) -o hlc ${BOOT} ${LFLAGS} ${EXTRA_LFLAGS}
|
|
|
|
hl: ${HL} libhl
|
|
- ${CC} ${CFLAGS} -o hl ${HL} ${LFLAGS} ${EXTRA_LFLAGS} ${HLFLAGS}
|
|
+ ${CC} $(CFLAGS) -o hl ${HL} ${LFLAGS} ${EXTRA_LFLAGS} ${HLFLAGS}
|
|
|
|
libs/fmt/%.o: libs/fmt/%.c
|
|
- ${CC} ${CFLAGS} -o $@ -c $< ${FMT_INCLUDE}
|
|
+ ${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} -L. -lhl -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} -L. -lhl -lSDL2 $(LIBOPENGL)
|
|
|
|
openal: ${OPENAL} libhl
|
|
- ${CC} ${CFLAGS} -shared -o openal.hdll ${OPENAL} ${LIBFLAGS} -L. -lhl $(LIBOPENAL)
|
|
+ ${CC} $(CFLAGS) -shared -o openal.hdll ${OPENAL} ${LIBFLAGS} -L. -lhl $(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} -L. -lhl -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} -L. -lhl
|
|
|
|
uv: ${UV} libhl
|
|
- ${CC} ${CFLAGS} -shared -o uv.hdll ${UV} ${LIBFLAGS} -L. -lhl -luv
|
|
+ ${CC} $(CFLAGS) -shared -o uv.hdll ${UV} ${LIBFLAGS} -L. -lhl -luv
|
|
|
|
mysql: ${MYSQL} libhl
|
|
- ${CC} ${CFLAGS} -shared -o mysql.hdll ${MYSQL} ${LIBFLAGS} -L. -lhl
|
|
+ ${CC} $(CFLAGS) -shared -o mysql.hdll ${MYSQL} ${LIBFLAGS} -L. -lhl
|
|
|
|
sqlite: ${SQLITE} libhl
|
|
- ${CC} ${CFLAGS} -shared -o sqlite.hdll ${SQLITE} ${LIBFLAGS} -L. -lhl -lsqlite3
|
|
+ ${CC} $(CFLAGS) -shared -o sqlite.hdll ${SQLITE} ${LIBFLAGS} -L. -lhl -lsqlite3
|
|
|
|
mesa:
|
|
(cd libs/mesa && ${MAKE})
|
|
@@ -249,7 +239,7 @@ codesign_osx:
|
|
.SUFFIXES : .c .o
|
|
|
|
.c.o :
|
|
- ${CC} ${CFLAGS} -o $@ -c $<
|
|
+ ${CC} $(CFLAGS) -o $@ -c $<
|
|
|
|
clean_o:
|
|
rm -f ${STD} ${BOOT} ${RUNTIME} ${PCRE} ${HL} ${FMT} ${SDL} ${SSL} ${OPENAL} ${UI} ${UV} ${MYSQL} ${SQLITE} ${HL_DEBUG}
|