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

Merges for dll refactor

Browse Source
This commit is contained in:
jyelon
2023-02-14 13:22:23 -05:00
parent 0d19564350 470d8a3c78
commit acad4291b6
4 changed files with 41 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
luprex/core/Makefile
View File

@@ -73,8 +73,8 @@ CORE_OBJ_FILES=\
DRV_OBJ_FILES=\
objdrv/drvutil.o\
objdrv/sslutil.o\
obj/drv/drvutil.o\
obj/drv/sslutil.o\
-include $(LUA_OBJ_FILES:%.o=%.d)
@@ -86,8 +86,8 @@ ifeq ($(OS),linux)
OPT=-g -O0
main: $(DRV_OBJ_FILES) $(CORE_OBJ_FILES) $(LUA_OBJ_FILES) objdrv/driver-linux.o
g++ -std=c++17 -export-dynamic -Wall $(OPT) -o $@ $(DRV_OBJ_FILES) $(CORE_OBJ_FILES) $(LUA_OBJ_FILES) objdrv/driver-linux.o -L../linuxlib -lssl -lcrypto -ldl
main: $(DRV_OBJ_FILES) $(CORE_OBJ_FILES) $(LUA_OBJ_FILES) obj/drv/driver-linux.o
g++ -std=c++17 -export-dynamic -Wall $(OPT) -o $@ $(DRV_OBJ_FILES) $(CORE_OBJ_FILES) $(LUA_OBJ_FILES) obj/drv/driver-linux.o -L../linuxlib -lssl -lcrypto -ldl
obj/lua/%.o: ../eris-master/src/%.c
gcc -Wall -fvisibility=hidden $(OPT) -DLUA_USE_APICHECK -DLUA_USE_POSIX -c -MMD $< -o $@
@@ -95,13 +95,13 @@ obj/lua/%.o: ../eris-master/src/%.c
obj/cpp/%.o: cpp/%.cpp
g++ -Wall -fvisibility=hidden $(OPT) -std=c++17 -I../linuxlib -I../eris-master/src -Iwrap -Icpp -c -MMD $< -o $@
objdrv/%.o: drv/%.cpp
obj/drv/%.o: drv/%.cpp
g++ -Wall -fvisibility=hidden $(OPT) -std=c++17 -I../linuxlib -Idrv -c -MMD $< -o $@
endif
clean:
rm -f main.exe main obj/cpp/*.* objdrv/*.* obj/lua/*.*
rm -f main.exe main obj/cpp/*.* obj/drv/*.* obj/lua/*.*