talezero/integration
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stop using cv2pdb and improve HTTP handling a little

Browse Source
This commit is contained in:
teppy999
2023-07-03 15:18:21 -04:00
parent ea10bddb0b
commit af62ac040f
4 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
luprex/Makefile
View File

@@ -121,7 +121,6 @@ ifeq "$(OS)" "linux"
LINKDLL=g++ -Wall $(OPT) -std=c++17 -export-dynamic -Wl,--no-allow-shlib-undefined -Wl,-z,defs -shared -o
LINKEXE=g++ -Wall $(OPT) -std=c++17 -o
MAKEDEPS=true
MAKEPDB=true
OPENSSL_INCLUDE=-I./ext/openssl-3.0.1/inc
LUA_FLAGS=-DLUA_USE_APICHECK -DLUA_USE_POSIX
LIBS=-L./ext/openssl-3.0.1/lib/linux -lssl -lcrypto -ldl
@@ -143,7 +142,6 @@ ifeq "$(OS)" "mingw"
LINKDLL=g++ -Wall $(OPT) -std=c++17 -Wl,--no-allow-shlib-undefined -shared -o
LINKEXE=g++ -Wall $(OPT) -std=c++17 -o
MAKEDEPS=true
MAKEPDB=./ext/cv2pdb.exe
OPENSSL_INCLUDE=-I./ext/openssl-3.0.1/inc
LUA_FLAGS=-DLUA_USE_APICHECK -DLUA_COMPAT_ALL
LIBS=-L./ext/openssl-3.0.1/lib/mingw -lssl -lcrypto -lws2_32 -lcrypt32 -lcryptui
@@ -168,7 +166,6 @@ ifeq "$(OS)" "visual"
LINKDLL=CL $(OPT) /std:c++17 /EHsc /nologo /LDd /Fe:
LINKEXE=CL $(OPT) /std:c++17 /EHsc /nologo /Fe:
MAKEDEPS=g++ -Wall -std=c++17 -MMD -E -o
MAKEPDB=true
OPENSSL_INCLUDE=-I./ext/openssl-3.1.0/inc
LUA_FLAGS=-DLUA_USE_APICHECK -DLUA_COMPAT_ALL
LIBS=ext/openssl-3.1.0/lib/visual/libcrypto.lib ext/openssl-3.1.0/lib/visual/libssl.lib ws2_32.lib crypt32.lib cryptui.lib user32.lib advapi32.lib
@@ -188,15 +185,12 @@ build/DIRECTORY:
build/$(OS)/$(LUPREX_EXE): build/$(OS)/$(LUPREXLIB_DLL) $(OBJ_DRV)
$(LINKEXE) $@ $(OBJ_DRV) $(LIBS)
$(MAKEPDB) $@
build/$(OS)/$(LUPREXSTATIC_EXE): $(OBJ_DRV) $(OBJ_ERIS) $(OBJ_CORE)
$(LINKEXE) $@ $^ $(LIBS)
$(MAKEPDB) $@
build/$(OS)/$(LUPREXLIB_DLL): $(OBJ_ERIS) $(OBJ_CORE)
$(LINKDLL) $@ $^
$(MAKEPDB) $@
build/$(OS)/eris/%.obj: ext/eris-master/src/%.c build/DIRECTORY
$(MAKEDEPS) $@d $(LUA_FLAGS) $<