updated build system
This commit is contained in:
parent
218053a2be
commit
bef2f078e0
@ -256,6 +256,7 @@ RUN if [ -f "/3rd_party/libjpeg_turbo-${MY_LIBJPEG_TURBO_VERSION}.tar.gz" ]; the
|
|||||||
&& mkdir _build \
|
&& mkdir _build \
|
||||||
&& cd _build \
|
&& cd _build \
|
||||||
&& cmake .. -DCMAKE_TOOLCHAIN_FILE=${MY_TOOLCHAIN_FILE_CMAKE} \
|
&& cmake .. -DCMAKE_TOOLCHAIN_FILE=${MY_TOOLCHAIN_FILE_CMAKE} \
|
||||||
|
-DCMAKE_SYSTEM_PROCESSOR=AMD64 \
|
||||||
-DBUILD_SHARED_LIBS=ON \
|
-DBUILD_SHARED_LIBS=ON \
|
||||||
-DBUILD_STATIC_LIBS=ON \
|
-DBUILD_STATIC_LIBS=ON \
|
||||||
-DENABLE_SHARED=ON \
|
-DENABLE_SHARED=ON \
|
||||||
@ -607,6 +608,7 @@ RUN if [ -f "/3rd_party/curl-${MY_CURL_VERSION}.tar.gz" ]; then \
|
|||||||
&& cd ${MY_WORKDIR} \
|
&& cd ${MY_WORKDIR} \
|
||||||
&& rm -r curl-${MY_CURL_VERSION} \
|
&& rm -r curl-${MY_CURL_VERSION} \
|
||||||
; fi
|
; fi
|
||||||
|
|
||||||
ARG CPP_HTTPLIB_VERSION
|
ARG CPP_HTTPLIB_VERSION
|
||||||
ENV MY_CPP_HTTPLIB_VERSION=${CPP_HTTPLIB_VERSION}
|
ENV MY_CPP_HTTPLIB_VERSION=${CPP_HTTPLIB_VERSION}
|
||||||
RUN if [ -f "/3rd_party/cpp-httplib-${MY_CPP_HTTPLIB_VERSION}.tar.gz" ]; then \
|
RUN if [ -f "/3rd_party/cpp-httplib-${MY_CPP_HTTPLIB_VERSION}.tar.gz" ]; then \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user