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

use $(LIBEXT) instead of manually setting .hdll everywhere #377

Closed
wants to merge 1 commit into from
Closed

use $(LIBEXT) instead of manually setting .hdll everywhere #377

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,11 @@ install:
mkdir -p $(INSTALL_DIR)/include
cp hl $(INSTALL_DIR)/bin
cp libhl.${LIBEXT} $(INSTALL_DIR)/lib
cp *.hdll $(INSTALL_DIR)/lib
cp *.$(LIBEXT) $(INSTALL_DIR)/lib
cp src/hl.h src/hlc.h src/hlc_main.c $(INSTALL_DIR)/include

uninstall:
rm -f $(INSTALL_DIR)/bin/hl $(INSTALL_DIR)/lib/libhl.${LIBEXT} $(INSTALL_DIR)/lib/*.hdll
rm -f $(INSTALL_DIR)/bin/hl $(INSTALL_DIR)/lib/libhl.${LIBEXT} $(INSTALL_DIR)/lib/*.$(LIBEXT)
rm -f $(INSTALL_DIR)/include/hl.h $(INSTALL_DIR)/include/hlc.h $(INSTALL_DIR)/include/hlc_main.c

libs: $(LIBS)
Expand All @@ -136,25 +136,25 @@ hl: ${HL} libhl
${CC} ${CFLAGS} -o hl ${HL} ${LFLAGS} ${HLFLAGS}

fmt: ${FMT} libhl
${CC} ${CFLAGS} -I include/mikktspace -I include/minimp3 -shared -o fmt.hdll ${FMT} ${LIBFLAGS} -L. -lhl -lpng $(LIBTURBOJPEG) -lz -lvorbisfile
${CC} ${CFLAGS} -I include/mikktspace -I include/minimp3 -shared -o fmt.$(LIBEXT) ${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.$(LIBEXT) ${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.$(LIBEXT) ${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.$(LIBEXT) ${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.$(LIBEXT) ${UI} ${LIBFLAGS} -L. -lhl

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

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

mesa:
(cd libs/mesa && make)
Expand Down Expand Up @@ -188,20 +188,20 @@ release_haxelib_package:
rm -rf $(HLIB)_release

release_win:
(cd x64/ReleaseVS2013 && cp hl.exe libhl.dll *.hdll *.lib ../../hl-$(HL_VER))
(cd x64/ReleaseVS2013 && cp hl.exe libhl.dll *.$(LIBEXT) *.lib ../../hl-$(HL_VER))
cp c:/windows/system32/msvcr120.dll hl-$(HL_VER)
cp `which SDL2.dll` hl-$(HL_VER)
cp `which OpenAL32.dll` hl-$(HL_VER)
zip -r hl-$(HL_VER).zip hl-$(HL_VER)
rm -rf hl-$(HL_VER)

release_linux:
cp hl libhl.so *.hdll hl-$(HL_VER)
cp hl libhl.so *.$(LIBEXT) hl-$(HL_VER)
tar -czf hl-$(HL_VER).tgz hl-$(HL_VER)
rm -rf hl-$(HL_VER)

release_osx:
cp hl libhl.dylib *.hdll hl-$(HL_VER)
cp hl libhl.dylib *.$(LIBEXT) hl-$(HL_VER)
tar -czf hl-$(HL_VER).tgz hl-$(HL_VER)
rm -rf hl-$(HL_VER)

Expand All @@ -214,6 +214,6 @@ clean_o:
rm -f ${STD} ${BOOT} ${RUNTIME} ${PCRE} ${HL} ${FMT} ${SDL} ${SSL} ${OPENAL} ${UI} ${UV} ${HL_DEBUG}

clean: clean_o
rm -f hl hl.exe libhl.$(LIBEXT) *.hdll
rm -f hl hl.exe libhl.$(LIBEXT) *.$(LIBEXT)

.PHONY: libhl hl hlc fmt sdl libs release