You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
46 lines
2.2 KiB
46 lines
2.2 KiB
Index: build/gmake.unix/Premake5.make |
|
--- build/gmake.unix/Premake5.make.orig 2017-01-11 16:44:42.000000000 +0100 |
|
+++ build/gmake.unix/Premake5.make 2017-04-02 09:46:40.811437000 +0200 |
|
@@ -22,9 +22,9 @@ |
|
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -Wall -Wextra |
|
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) -fno-stack-protector |
|
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) |
|
- LIBS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a bin/Release/libmbedtls-lib.a -lm -ldl -lrt |
|
+ LIBS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a bin/Release/libmbedtls-lib.a -lm |
|
LDDEPS += bin/Release/liblua-lib.a bin/Release/libzip-lib.a bin/Release/libzlib-lib.a bin/Release/libcurl-lib.a bin/Release/libmbedtls-lib.a |
|
- ALL_LDFLAGS += $(LDFLAGS) -s -rdynamic |
|
+ ALL_LDFLAGS += $(LDFLAGS) |
|
LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS) |
|
define PREBUILDCMDS |
|
endef |
|
@@ -49,9 +49,9 @@ |
|
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g -Wall -Wextra |
|
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) |
|
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) |
|
- LIBS += bin/Debug/liblua-lib.a bin/Debug/libzip-lib.a bin/Debug/libzlib-lib.a bin/Debug/libcurl-lib.a bin/Debug/libmbedtls-lib.a -lm -ldl -lrt |
|
+ LIBS += bin/Debug/liblua-lib.a bin/Debug/libzip-lib.a bin/Debug/libzlib-lib.a bin/Debug/libcurl-lib.a bin/Debug/libmbedtls-lib.a -lm |
|
LDDEPS += bin/Debug/liblua-lib.a bin/Debug/libzip-lib.a bin/Debug/libzlib-lib.a bin/Debug/libcurl-lib.a bin/Debug/libmbedtls-lib.a |
|
- ALL_LDFLAGS += $(LDFLAGS) -rdynamic |
|
+ ALL_LDFLAGS += $(LDFLAGS) |
|
LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS) |
|
define PREBUILDCMDS |
|
endef |
|
@@ -286,4 +286,4 @@ |
|
-include $(OBJECTS:%.o=%.d) |
|
ifneq (,$(PCH)) |
|
-include $(OBJDIR)/$(notdir $(PCH)).d |
|
-endif |
|
\ No newline at end of file |
|
+endif |
|
Index: contrib/curl/lib/curl_setup.h |
|
--- contrib/curl/lib/curl_setup.h.orig 2017-01-11 16:44:37.000000000 +0100 |
|
+++ contrib/curl/lib/curl_setup.h 2017-04-02 10:00:36.715233000 +0200 |
|
@@ -78,7 +78,7 @@ |
|
# include "config-vxworks.h" |
|
#endif |
|
|
|
-#ifdef __linux__ |
|
+#if defined(__linux__) || defined(__FreeBSD__) |
|
# include "config-linux.h" |
|
#endif |
|
|
|
|