Skip to content

Commit f17e542

Browse files
d-ledd-led
committed
#16 linux build regenerated
1 parent e3b824b commit f17e542

9 files changed

+79
-84
lines changed

Diff for: ‎.travis.yml

-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ addons:
1515
- sourceline: deb http://us.archive.ubuntu.com/ubuntu/ xenial main universe
1616
packages:
1717
- g++
18-
- wget
1918
- libboost-all-dev
2019
- wget
2120
- libcpprest-dev
@@ -29,6 +28,5 @@ install:
2928

3029
script:
3130
- cd ${TRAVIS_BUILD_DIR}
32-
- chmod +x premake/premake5-64 && ./premake/premake5-64 gmake
3331
- make -C build/linux/gmake config=release_x64
3432
- /bin/bash -c "./src/script/test.sh bin/linux/gmake/x64/Release"

Diff for: ‎Vagrantfile

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
Vagrant.configure("2") do |config|
2-
config.vm.box = "ubuntu/trusty64"
2+
config.vm.box = "ubuntu/xenial64"
33
config.vm.provision "shell", privileged: true, inline: <<-SHELL
44
apt-get update
5-
apt-get -y install git build-essential
5+
apt-get -y install git build-essential g++ libcpprest-dev
66
echo cd /vagrant >> `pwd`/.profile
77
SHELL
88

99
config.vm.provision "shell", privileged: false, inline: <<-SHELL
10-
ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Linuxbrew/install/master/install)"
11-
PATH="/home/linuxbrew/.linuxbrew/bin:$PATH"
12-
echo 'export PATH="/home/linuxbrew/.linuxbrew/bin:$PATH"' >>~/.bash_profile
13-
brew install gcc cmake cpprestsdk influxdb
10+
1411
SHELL
1512

1613
config.vm.provider "virtualbox" do |v|

Diff for: ‎build/linux/gmake/demo.make

+12-12
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ ifeq ($(config),debug_x32)
1616
TARGET = $(TARGETDIR)/demo
1717
OBJDIR = ../../../obj/linux/gmake/x32/Debug/demo
1818
DEFINES += -D_DEBUG
19-
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/home/linuxbrew/.linuxbrew/Cellar/cpprestsdk/2.9.1/include
19+
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest
2020
FORCE_INCLUDE +=
2121
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
2222
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -fPIC -g -std=c++14
2323
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -fPIC -g -std=c++14
2424
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
25-
LIBS += ../../../bin/linux/gmake/x32/Debug/libinfluxdb-cpp-rest.a ../../../bin/linux/gmake/x32/Debug/libfmt.a -lssl -lcrypto -lboost_random -lboost_chrono -lboost_thread-mt -lboost_system-mt -lboost_regex -lboost_filesystem -lcpprest -lpthread
25+
LIBS += ../../../bin/linux/gmake/x32/Debug/libinfluxdb-cpp-rest.a ../../../bin/linux/gmake/x32/Debug/libfmt.a -lssl -lcrypto -lboost_random -lboost_chrono -lboost_thread -lboost_system -lboost_regex -lboost_filesystem -lcpprest -lpthread
2626
LDDEPS += ../../../bin/linux/gmake/x32/Debug/libinfluxdb-cpp-rest.a ../../../bin/linux/gmake/x32/Debug/libfmt.a
27-
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -L/home/linuxbrew/.linuxbrew/Cellar/cpprestsdk/2.9.1/lib -L/home/linuxbrew/.linuxbrew/lib64 -m32
27+
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32
2828
LINKCMD = $(CXX) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
2929
define PREBUILDCMDS
3030
endef
@@ -43,15 +43,15 @@ ifeq ($(config),debug_x64)
4343
TARGET = $(TARGETDIR)/demo
4444
OBJDIR = ../../../obj/linux/gmake/x64/Debug/demo
4545
DEFINES += -D_DEBUG
46-
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/home/linuxbrew/.linuxbrew/Cellar/cpprestsdk/2.9.1/include
46+
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest
4747
FORCE_INCLUDE +=
4848
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
4949
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -fPIC -g -std=c++14
5050
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -fPIC -g -std=c++14
5151
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
52-
LIBS += ../../../bin/linux/gmake/x64/Debug/libinfluxdb-cpp-rest.a ../../../bin/linux/gmake/x64/Debug/libfmt.a -lssl -lcrypto -lboost_random -lboost_chrono -lboost_thread-mt -lboost_system-mt -lboost_regex -lboost_filesystem -lcpprest -lpthread
52+
LIBS += ../../../bin/linux/gmake/x64/Debug/libinfluxdb-cpp-rest.a ../../../bin/linux/gmake/x64/Debug/libfmt.a -lssl -lcrypto -lboost_random -lboost_chrono -lboost_thread -lboost_system -lboost_regex -lboost_filesystem -lcpprest -lpthread
5353
LDDEPS += ../../../bin/linux/gmake/x64/Debug/libinfluxdb-cpp-rest.a ../../../bin/linux/gmake/x64/Debug/libfmt.a
54-
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -L/home/linuxbrew/.linuxbrew/Cellar/cpprestsdk/2.9.1/lib -L/home/linuxbrew/.linuxbrew/lib64 -m64
54+
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64
5555
LINKCMD = $(CXX) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
5656
define PREBUILDCMDS
5757
endef
@@ -70,15 +70,15 @@ ifeq ($(config),release_x32)
7070
TARGET = $(TARGETDIR)/demo
7171
OBJDIR = ../../../obj/linux/gmake/x32/Release/demo
7272
DEFINES +=
73-
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/home/linuxbrew/.linuxbrew/Cellar/cpprestsdk/2.9.1/include
73+
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest
7474
FORCE_INCLUDE +=
7575
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
7676
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -fPIC -std=c++14
7777
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -fPIC -std=c++14
7878
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
79-
LIBS += ../../../bin/linux/gmake/x32/Release/libinfluxdb-cpp-rest.a ../../../bin/linux/gmake/x32/Release/libfmt.a -lssl -lcrypto -lboost_random -lboost_chrono -lboost_thread-mt -lboost_system-mt -lboost_regex -lboost_filesystem -lcpprest -lpthread
79+
LIBS += ../../../bin/linux/gmake/x32/Release/libinfluxdb-cpp-rest.a ../../../bin/linux/gmake/x32/Release/libfmt.a -lssl -lcrypto -lboost_random -lboost_chrono -lboost_thread -lboost_system -lboost_regex -lboost_filesystem -lcpprest -lpthread
8080
LDDEPS += ../../../bin/linux/gmake/x32/Release/libinfluxdb-cpp-rest.a ../../../bin/linux/gmake/x32/Release/libfmt.a
81-
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -L/home/linuxbrew/.linuxbrew/Cellar/cpprestsdk/2.9.1/lib -L/home/linuxbrew/.linuxbrew/lib64 -m32 -s
81+
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32 -s
8282
LINKCMD = $(CXX) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
8383
define PREBUILDCMDS
8484
endef
@@ -97,15 +97,15 @@ ifeq ($(config),release_x64)
9797
TARGET = $(TARGETDIR)/demo
9898
OBJDIR = ../../../obj/linux/gmake/x64/Release/demo
9999
DEFINES +=
100-
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/home/linuxbrew/.linuxbrew/Cellar/cpprestsdk/2.9.1/include
100+
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest
101101
FORCE_INCLUDE +=
102102
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
103103
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -fPIC -std=c++14
104104
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -fPIC -std=c++14
105105
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
106-
LIBS += ../../../bin/linux/gmake/x64/Release/libinfluxdb-cpp-rest.a ../../../bin/linux/gmake/x64/Release/libfmt.a -lssl -lcrypto -lboost_random -lboost_chrono -lboost_thread-mt -lboost_system-mt -lboost_regex -lboost_filesystem -lcpprest -lpthread
106+
LIBS += ../../../bin/linux/gmake/x64/Release/libinfluxdb-cpp-rest.a ../../../bin/linux/gmake/x64/Release/libfmt.a -lssl -lcrypto -lboost_random -lboost_chrono -lboost_thread -lboost_system -lboost_regex -lboost_filesystem -lcpprest -lpthread
107107
LDDEPS += ../../../bin/linux/gmake/x64/Release/libinfluxdb-cpp-rest.a ../../../bin/linux/gmake/x64/Release/libfmt.a
108-
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -L/home/linuxbrew/.linuxbrew/Cellar/cpprestsdk/2.9.1/lib -L/home/linuxbrew/.linuxbrew/lib64 -m64 -s
108+
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64 -s
109109
LINKCMD = $(CXX) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
110110
define PREBUILDCMDS
111111
endef

Diff for: ‎build/linux/gmake/fmt.make

+8-8
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ ifeq ($(config),debug_x32)
1616
TARGET = $(TARGETDIR)/libfmt.a
1717
OBJDIR = ../../../obj/linux/gmake/x32/Debug/fmt
1818
DEFINES += -D_DEBUG
19-
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/home/linuxbrew/.linuxbrew/Cellar/cpprestsdk/2.9.1/include
19+
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest
2020
FORCE_INCLUDE +=
2121
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
2222
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -fPIC -g -std=c++14
2323
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -fPIC -g -std=c++14
2424
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
2525
LIBS +=
2626
LDDEPS +=
27-
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -L/home/linuxbrew/.linuxbrew/Cellar/cpprestsdk/2.9.1/lib -L/home/linuxbrew/.linuxbrew/lib64 -m32
27+
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32
2828
LINKCMD = $(AR) -rcs "$@" $(OBJECTS)
2929
define PREBUILDCMDS
3030
endef
@@ -43,15 +43,15 @@ ifeq ($(config),debug_x64)
4343
TARGET = $(TARGETDIR)/libfmt.a
4444
OBJDIR = ../../../obj/linux/gmake/x64/Debug/fmt
4545
DEFINES += -D_DEBUG
46-
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/home/linuxbrew/.linuxbrew/Cellar/cpprestsdk/2.9.1/include
46+
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest
4747
FORCE_INCLUDE +=
4848
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
4949
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -fPIC -g -std=c++14
5050
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -fPIC -g -std=c++14
5151
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
5252
LIBS +=
5353
LDDEPS +=
54-
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -L/home/linuxbrew/.linuxbrew/Cellar/cpprestsdk/2.9.1/lib -L/home/linuxbrew/.linuxbrew/lib64 -m64
54+
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64
5555
LINKCMD = $(AR) -rcs "$@" $(OBJECTS)
5656
define PREBUILDCMDS
5757
endef
@@ -70,15 +70,15 @@ ifeq ($(config),release_x32)
7070
TARGET = $(TARGETDIR)/libfmt.a
7171
OBJDIR = ../../../obj/linux/gmake/x32/Release/fmt
7272
DEFINES +=
73-
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/home/linuxbrew/.linuxbrew/Cellar/cpprestsdk/2.9.1/include
73+
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest
7474
FORCE_INCLUDE +=
7575
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
7676
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -fPIC -std=c++14
7777
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -fPIC -std=c++14
7878
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
7979
LIBS +=
8080
LDDEPS +=
81-
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -L/home/linuxbrew/.linuxbrew/Cellar/cpprestsdk/2.9.1/lib -L/home/linuxbrew/.linuxbrew/lib64 -m32 -s
81+
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32 -s
8282
LINKCMD = $(AR) -rcs "$@" $(OBJECTS)
8383
define PREBUILDCMDS
8484
endef
@@ -97,15 +97,15 @@ ifeq ($(config),release_x64)
9797
TARGET = $(TARGETDIR)/libfmt.a
9898
OBJDIR = ../../../obj/linux/gmake/x64/Release/fmt
9999
DEFINES +=
100-
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/home/linuxbrew/.linuxbrew/Cellar/cpprestsdk/2.9.1/include
100+
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest
101101
FORCE_INCLUDE +=
102102
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
103103
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -fPIC -std=c++14
104104
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -fPIC -std=c++14
105105
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
106106
LIBS +=
107107
LDDEPS +=
108-
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -L/home/linuxbrew/.linuxbrew/Cellar/cpprestsdk/2.9.1/lib -L/home/linuxbrew/.linuxbrew/lib64 -m64 -s
108+
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64 -s
109109
LINKCMD = $(AR) -rcs "$@" $(OBJECTS)
110110
define PREBUILDCMDS
111111
endef

Diff for: ‎build/linux/gmake/influx-c-rest.make

+12-12
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ ifeq ($(config),debug_x32)
1616
TARGET = $(TARGETDIR)/libinflux-c-rest.so
1717
OBJDIR = ../../../obj/linux/gmake/x32/Debug/influx-c-rest
1818
DEFINES += -D_DEBUG -DBUILDING_INFLUX_C_REST
19-
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/home/linuxbrew/.linuxbrew/Cellar/cpprestsdk/2.9.1/include
19+
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest
2020
FORCE_INCLUDE +=
2121
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
2222
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -fPIC -g -std=c++14
2323
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -fPIC -g -std=c++14
2424
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
25-
LIBS += ../../../bin/linux/gmake/x32/Debug/libinfluxdb-cpp-rest.a ../../../bin/linux/gmake/x32/Debug/libfmt.a -lssl -lcrypto -lboost_random -lboost_chrono -lboost_thread-mt -lboost_system-mt -lboost_regex -lboost_filesystem -lcpprest -lpthread
25+
LIBS += ../../../bin/linux/gmake/x32/Debug/libinfluxdb-cpp-rest.a ../../../bin/linux/gmake/x32/Debug/libfmt.a -lssl -lcrypto -lboost_random -lboost_chrono -lboost_thread -lboost_system -lboost_regex -lboost_filesystem -lcpprest -lpthread
2626
LDDEPS += ../../../bin/linux/gmake/x32/Debug/libinfluxdb-cpp-rest.a ../../../bin/linux/gmake/x32/Debug/libfmt.a
27-
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -L/home/linuxbrew/.linuxbrew/Cellar/cpprestsdk/2.9.1/lib -L/home/linuxbrew/.linuxbrew/lib64 -m32 -shared -Wl,-soname=libinflux-c-rest.so
27+
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32 -shared -Wl,-soname=libinflux-c-rest.so
2828
LINKCMD = $(CXX) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
2929
define PREBUILDCMDS
3030
endef
@@ -43,15 +43,15 @@ ifeq ($(config),debug_x64)
4343
TARGET = $(TARGETDIR)/libinflux-c-rest.so
4444
OBJDIR = ../../../obj/linux/gmake/x64/Debug/influx-c-rest
4545
DEFINES += -D_DEBUG -DBUILDING_INFLUX_C_REST
46-
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/home/linuxbrew/.linuxbrew/Cellar/cpprestsdk/2.9.1/include
46+
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest
4747
FORCE_INCLUDE +=
4848
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
4949
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -fPIC -g -std=c++14
5050
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -fPIC -g -std=c++14
5151
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
52-
LIBS += ../../../bin/linux/gmake/x64/Debug/libinfluxdb-cpp-rest.a ../../../bin/linux/gmake/x64/Debug/libfmt.a -lssl -lcrypto -lboost_random -lboost_chrono -lboost_thread-mt -lboost_system-mt -lboost_regex -lboost_filesystem -lcpprest -lpthread
52+
LIBS += ../../../bin/linux/gmake/x64/Debug/libinfluxdb-cpp-rest.a ../../../bin/linux/gmake/x64/Debug/libfmt.a -lssl -lcrypto -lboost_random -lboost_chrono -lboost_thread -lboost_system -lboost_regex -lboost_filesystem -lcpprest -lpthread
5353
LDDEPS += ../../../bin/linux/gmake/x64/Debug/libinfluxdb-cpp-rest.a ../../../bin/linux/gmake/x64/Debug/libfmt.a
54-
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -L/home/linuxbrew/.linuxbrew/Cellar/cpprestsdk/2.9.1/lib -L/home/linuxbrew/.linuxbrew/lib64 -m64 -shared -Wl,-soname=libinflux-c-rest.so
54+
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64 -shared -Wl,-soname=libinflux-c-rest.so
5555
LINKCMD = $(CXX) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
5656
define PREBUILDCMDS
5757
endef
@@ -70,15 +70,15 @@ ifeq ($(config),release_x32)
7070
TARGET = $(TARGETDIR)/libinflux-c-rest.so
7171
OBJDIR = ../../../obj/linux/gmake/x32/Release/influx-c-rest
7272
DEFINES += -DBUILDING_INFLUX_C_REST
73-
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/home/linuxbrew/.linuxbrew/Cellar/cpprestsdk/2.9.1/include
73+
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest
7474
FORCE_INCLUDE +=
7575
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
7676
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -fPIC -std=c++14
7777
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -fPIC -std=c++14
7878
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
79-
LIBS += ../../../bin/linux/gmake/x32/Release/libinfluxdb-cpp-rest.a ../../../bin/linux/gmake/x32/Release/libfmt.a -lssl -lcrypto -lboost_random -lboost_chrono -lboost_thread-mt -lboost_system-mt -lboost_regex -lboost_filesystem -lcpprest -lpthread
79+
LIBS += ../../../bin/linux/gmake/x32/Release/libinfluxdb-cpp-rest.a ../../../bin/linux/gmake/x32/Release/libfmt.a -lssl -lcrypto -lboost_random -lboost_chrono -lboost_thread -lboost_system -lboost_regex -lboost_filesystem -lcpprest -lpthread
8080
LDDEPS += ../../../bin/linux/gmake/x32/Release/libinfluxdb-cpp-rest.a ../../../bin/linux/gmake/x32/Release/libfmt.a
81-
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -L/home/linuxbrew/.linuxbrew/Cellar/cpprestsdk/2.9.1/lib -L/home/linuxbrew/.linuxbrew/lib64 -m32 -shared -Wl,-soname=libinflux-c-rest.so -s
81+
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32 -shared -Wl,-soname=libinflux-c-rest.so -s
8282
LINKCMD = $(CXX) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
8383
define PREBUILDCMDS
8484
endef
@@ -97,15 +97,15 @@ ifeq ($(config),release_x64)
9797
TARGET = $(TARGETDIR)/libinflux-c-rest.so
9898
OBJDIR = ../../../obj/linux/gmake/x64/Release/influx-c-rest
9999
DEFINES += -DBUILDING_INFLUX_C_REST
100-
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest -I/home/linuxbrew/.linuxbrew/Cellar/cpprestsdk/2.9.1/include
100+
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest
101101
FORCE_INCLUDE +=
102102
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
103103
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -fPIC -std=c++14
104104
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -fPIC -std=c++14
105105
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
106-
LIBS += ../../../bin/linux/gmake/x64/Release/libinfluxdb-cpp-rest.a ../../../bin/linux/gmake/x64/Release/libfmt.a -lssl -lcrypto -lboost_random -lboost_chrono -lboost_thread-mt -lboost_system-mt -lboost_regex -lboost_filesystem -lcpprest -lpthread
106+
LIBS += ../../../bin/linux/gmake/x64/Release/libinfluxdb-cpp-rest.a ../../../bin/linux/gmake/x64/Release/libfmt.a -lssl -lcrypto -lboost_random -lboost_chrono -lboost_thread -lboost_system -lboost_regex -lboost_filesystem -lcpprest -lpthread
107107
LDDEPS += ../../../bin/linux/gmake/x64/Release/libinfluxdb-cpp-rest.a ../../../bin/linux/gmake/x64/Release/libfmt.a
108-
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -L/home/linuxbrew/.linuxbrew/Cellar/cpprestsdk/2.9.1/lib -L/home/linuxbrew/.linuxbrew/lib64 -m64 -shared -Wl,-soname=libinflux-c-rest.so -s
108+
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64 -shared -Wl,-soname=libinflux-c-rest.so -s
109109
LINKCMD = $(CXX) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
110110
define PREBUILDCMDS
111111
endef

0 commit comments

Comments
 (0)