sslcon now builds on mingw (now broken on linux)
This commit is contained in:
@@ -2,13 +2,15 @@
|
||||
|
||||
ifeq ($(OS),mingw)
|
||||
EXE=main.exe
|
||||
LIBS=-lws2_32
|
||||
LIBS=-L ../mingwlib -lssl -lcrypto -lws2_32 -lcrypt32 -lcryptui
|
||||
INCS=-I ../mingwlib
|
||||
LUAFLAGS=-DLUA_COMPAT_ALL
|
||||
OPT=-g -O1
|
||||
DRIVER=driver-mingw
|
||||
else ifeq ($(OS),linux)
|
||||
EXE=main
|
||||
LIBS=
|
||||
LIBS=-lssl -lcrypto
|
||||
INCS=
|
||||
LUAFLAGS=-DLUA_USE_POSIX
|
||||
OPT=-g -O1
|
||||
DRIVER=driver-linux
|
||||
@@ -18,6 +20,7 @@ else
|
||||
ERROR=$(error You must specify OS=linux or OS=mingw)
|
||||
EXE=main
|
||||
LIBS=$(ERROR)
|
||||
INCS=$(ERROR)
|
||||
LUAFLAGS=$(ERROR)
|
||||
OPT=$(ERROR)
|
||||
DRIVER=driver-xxx
|
||||
@@ -99,8 +102,7 @@ lobj/%.o: ../eris-master/src/%.c
|
||||
gcc -Wall $(OPT) -DLUA_USE_APICHECK $(LUAFLAGS) -c -MMD $< -o $@
|
||||
|
||||
obj/%.o: cpp/%.cpp
|
||||
g++ -std=c++17 -Wall $(OPT) -I../eris-master/src -Icpp -c -MMD $< -o $@
|
||||
|
||||
g++ -std=c++17 -Wall $(OPT) -I../eris-master/src -Icpp $(INCS) -c -MMD $< -o $@
|
||||
|
||||
$(EXE): $(CORE_OBJ_FILES) $(LUA_OBJ_FILES)
|
||||
g++ -std=c++17 -Wall $(OPT) -o $@ $(CORE_OBJ_FILES) $(LUA_OBJ_FILES) $(LIBS)
|
||||
|
||||
Reference in New Issue
Block a user