More makefile tweaks

This commit is contained in:
2023-02-20 17:53:18 -05:00
parent 3ca56d7776
commit 6c8ee78041

View File

@@ -1,21 +1,23 @@
ifneq "" "$(findstring -linux-,$(MAKE_HOST))" ifneq "" "$(findstring -linux-,$(MAKE_HOST))"
OS=linux
EXE=main EXE=main
LIBS=-L./ext/openssl-linux -lssl -lcrypto LIBS=-L./ext/openssl-linux -lssl -lcrypto -ldl
LUAFLAGS=-DLUA_USE_APICHECK -DLUA_USE_POSIX LUAFLAGS=-DLUA_USE_APICHECK -DLUA_USE_POSIX
OPT=-g -O0 OPT=-g -O0
DRIVER=driver-linux
else ifneq "" "$(findstring cmd.exe,$(COMSPEC))" else ifneq "" "$(findstring cmd.exe,$(COMSPEC))"
OS=mingw
EXE=main.exe EXE=main.exe
LIBS=-L./ext/openssl-mingw -lssl -lcrypto -lws2_32 -lcrypt32 -lcryptui LIBS=-L./ext/openssl-mingw -lssl -lcrypto -lws2_32 -lcrypt32 -lcryptui
LUAFLAGS=-DLUA_USE_APICHECK -DLUA_COMPAT_ALL LUAFLAGS=-DLUA_USE_APICHECK -DLUA_COMPAT_ALL
OPT=-g -O0 OPT=-g -O0
DRIVER=driver-mingw
else else
$(error Cannot figure out whether to build the linux or mingw version) $(error Cannot figure out whether to build the linux or mingw version)
endif endif
$(info Building for $(OS)...)
OBJ_ERIS=\ OBJ_ERIS=\
obj/eris/lapi.o \ obj/eris/lapi.o \
obj/eris/lcode.o \ obj/eris/lcode.o \
@@ -89,7 +91,7 @@ OBJ_CORE=\
OBJ_DRV=\ OBJ_DRV=\
obj/drv/drvutil.o\ obj/drv/drvutil.o\
obj/drv/sslutil.o\ obj/drv/sslutil.o\
obj/drv/$(DRIVER).o obj/drv/driver-$(OS).o