Skip to content

Commit a4d18e3

Browse files
ofTheoofTheo
authored
switch shared libs back to static closes #506 (#507)
1 parent b0c012a commit a4d18e3

File tree

6 files changed

+62
-66
lines changed

6 files changed

+62
-66
lines changed

‎apothecary/formulas/assimp.sh‎

Lines changed: 29 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -149,40 +149,37 @@ function build() {
149149
DEFINES="$DEFINES -DASSIMP_NO_EXPORT=ON"
150150
fi
151151

152-
if [ "${ASSIMP_STATIC:-0}" = "1" ]; then
153-
DEFINES="${DEFINES} \
154-
-DBUILD_WITH_STATIC_CRT=ON \
155-
-DUSE_STATIC_CRT=ON \
156-
-DBUILD_SHARED_LIBS=OFF"
157-
if [ $MULTITHREADED_TYPE == "MD" ]; then
158-
sed -i 's/\/MT/\/MD/g; s/\/MTd/\/MDd/g' ../CMakeLists.txt
159-
fi
160-
else
161-
DEFINES="${DEFINES} \
162-
-DBUILD_WITH_STATIC_CRT=OFF \
163-
-DBUILD_SHARED_LIBS=ON"
164-
cmake .. ${DEFINES} \
165-
-A "${PLATFORM}" \
166-
${CMAKE_WIN_SDK} \
167-
-G "${GENERATOR_NAME}" \
168-
-DCMAKE_BUILD_TYPE=Debug \
169-
-DCMAKE_INSTALL_PREFIX=Debug \
170-
-DCMAKE_INSTALL_LIBDIR="lib" \
171-
-DCMAKE_CXX_FLAGS="-DUSE_PTHREADS=1 ${VS_C_FLAGS} ${FLAGS_DEBUG} ${EXCEPTION_FLAGS}" \
172-
-DCMAKE_C_FLAGS="-DUSE_PTHREADS=1 ${VS_C_FLAGS} ${FLAGS_DEBUG} ${EXCEPTION_FLAGS}" \
173-
-DCMAKE_CXX_FLAGS_DEBUG="-DUSE_PTHREADS=1 ${VS_C_FLAGS} ${FLAGS_DEBUG} ${EXCEPTION_FLAGS}" \
174-
-DCMAKE_C_FLAGS_DEBUG="-DUSE_PTHREADS=1 ${VS_C_FLAGS} ${FLAGS_DEBUG} ${EXCEPTION_FLAGS}" \
175-
-DCMAKE_PREFIX_PATH="${LIBS_ROOT}" \
176-
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
177-
-DCMAKE_MINIMUM_REQUIRED_VERSION=3.22 \
178-
-DASSIMP_BUILD_ZLIB=OFF \
179-
-DZLIB_ROOT=${ZLIB_ROOT} \
180-
-DZLIB_INCLUDE_DIR=${ZLIB_INCLUDE_DIR} \
181-
-DZLIB_LIBRARY=${ZLIB_LIBRARY}
182-
cmake --build . --config Debug -j${PARALLEL_MAKE}
183-
rm -f CMakeCache.txt || true
152+
if [ $MULTITHREADED_TYPE == "MD" ]; then
153+
sed -i 's/\/MT/\/MD/g; s/\/MTd/\/MDd/g' ../CMakeLists.txt
184154
fi
185155

156+
DEFINES="${DEFINES} \
157+
-DBUILD_WITH_STATIC_CRT=ON \
158+
-DUSE_STATIC_CRT=ON \
159+
-DBUILD_SHARED_LIBS=OFF"
160+
161+
cmake .. ${DEFINES} \
162+
-A "${PLATFORM}" \
163+
${CMAKE_WIN_SDK} \
164+
-G "${GENERATOR_NAME}" \
165+
-DCMAKE_BUILD_TYPE=Debug \
166+
-DCMAKE_INSTALL_PREFIX=Debug \
167+
-DCMAKE_INSTALL_LIBDIR="lib" \
168+
-DCMAKE_CXX_FLAGS="-DUSE_PTHREADS=1 ${VS_C_FLAGS} ${FLAGS_DEBUG} ${EXCEPTION_FLAGS}" \
169+
-DCMAKE_C_FLAGS="-DUSE_PTHREADS=1 ${VS_C_FLAGS} ${FLAGS_DEBUG} ${EXCEPTION_FLAGS}" \
170+
-DCMAKE_CXX_FLAGS_DEBUG="-DUSE_PTHREADS=1 ${VS_C_FLAGS} ${FLAGS_DEBUG} ${EXCEPTION_FLAGS}" \
171+
-DCMAKE_C_FLAGS_DEBUG="-DUSE_PTHREADS=1 ${VS_C_FLAGS} ${FLAGS_DEBUG} ${EXCEPTION_FLAGS}" \
172+
-DCMAKE_PREFIX_PATH="${LIBS_ROOT}" \
173+
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
174+
-DCMAKE_MINIMUM_REQUIRED_VERSION=3.22 \
175+
-DASSIMP_BUILD_ZLIB=OFF \
176+
-DZLIB_ROOT=${ZLIB_ROOT} \
177+
-DZLIB_INCLUDE_DIR=${ZLIB_INCLUDE_DIR} \
178+
-DZLIB_LIBRARY=${ZLIB_LIBRARY}
179+
cmake --build . --config Debug -j${PARALLEL_MAKE}
180+
181+
rm -f CMakeCache.txt || true
182+
186183
cmake .. ${DEFINES} \
187184
-A "${PLATFORM}" \
188185
${CMAKE_WIN_SDK} \

‎apothecary/formulas/libusb/libusb.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ function build() {
6363
-DCMAKE_CXX_STANDARD=${CPP_STANDARD} \
6464
-DCMAKE_CXX_STANDARD_REQUIRED=ON \
6565
-DCMAKE_CXX_EXTENSIONS=OFF
66-
-DBUILD_SHARED_LIBS=ON \
66+
-DBUILD_SHARED_LIBS=OFF \
6767
-DCMAKE_INSTALL_PREFIX=Release \
6868
-DCMAKE_INCLUDE_OUTPUT_DIRECTORY=include \
6969
-DCMAKE_INSTALL_INCLUDEDIR=include"
@@ -76,7 +76,7 @@ function build() {
7676
-DLIBUSB_BUILD_TESTING=OFF \
7777
-DLIBUSB_BUILD_EXAMPLES=OFF \
7878
-DLIBUSB_INSTALL_TARGETS=ON \
79-
-DLIBUSB_BUILD_SHARED_LIBS=ON \
79+
-DLIBUSB_BUILD_SHARED_LIBS=OFF \
8080
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
8181
-DCMAKE_MINIMUM_REQUIRED_VERSION=3.22 \
8282
${CMAKE_WIN_SDK} \
@@ -103,7 +103,7 @@ function build() {
103103
-DCMAKE_CXX_STANDARD=${CPP_STANDARD} \
104104
-DCMAKE_CXX_STANDARD_REQUIRED=ON \
105105
-DCMAKE_CXX_EXTENSIONS=OFF
106-
-DBUILD_SHARED_LIBS=ON \
106+
-DBUILD_SHARED_LIBS=OFF \
107107
-DCMAKE_INSTALL_PREFIX=Release \
108108
-DCMAKE_INCLUDE_OUTPUT_DIRECTORY=include \
109109
-DCMAKE_INSTALL_INCLUDEDIR=include"
@@ -144,7 +144,7 @@ function copy() {
144144
if [ "$TYPE" == "vs" ]; then
145145
mkdir -p $1/lib/$TYPE/$PLATFORM/
146146
cp -Rv "build_${TYPE}_${PLATFORM}/Release/include/libusb-1.0/" $1/
147-
cp -f "build_${TYPE}_${PLATFORM}/Release/libusb-1.0.dll" $1/lib/$TYPE/$PLATFORM/libusb-1.0.dll
147+
#cp -f "build_${TYPE}_${PLATFORM}/Release/libusb-1.0.dll" $1/lib/$TYPE/$PLATFORM/libusb-1.0.dll
148148
cp -f "build_${TYPE}_${PLATFORM}/Release/usb-1.0.lib" $1/lib/$TYPE/$PLATFORM/libusb.lib
149149
secure "$1/lib/$TYPE/$PLATFORM/libusb.lib" "libusb.pkl" "$VERSION" "$DEFINES" "$BUILD_ID" "$FORMULA_DEPENDS"
150150
fi

‎apothecary/formulas/opencv/opencv.sh‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -355,19 +355,17 @@ function build() {
355355
-DWITH_CUFFT=OFF"
356356
fi
357357

358-
if [ "${OPENCV_STATIC:-0}" = "1" ]; then
359-
echoInfo "Building with OPENCV_STATIC"
360-
export DEFINES="${DEFINES} \
361-
-DBUILD_WITH_STATIC_CRT=ON \
362-
-DUSE_STATIC_CRT=ON \
363-
-DBUILD_SHARED_LIBS=OFF"
364-
if [ $MULTITHREADED_TYPE == "MD" ]; then
365-
sed -i 's/\/MT/\/MD/g; s/\/MTd/\/MDd/g' ../CMakeLists.txt
366-
fi
367-
else
368-
echoInfo "Building OpenCV Debug"
369-
export DEFINES="${DEFINES} -DBUILD_WITH_STATIC_CRT=OFF -DUSE_STATIC_CRT=OFF -DBUILD_SHARED_LIBS=ON"
370-
cmake .. ${DEFINES} \
358+
echoInfo "Building with OPENCV_STATIC"
359+
export DEFINES="${DEFINES} \
360+
-DBUILD_WITH_STATIC_CRT=ON \
361+
-DUSE_STATIC_CRT=ON \
362+
-DBUILD_SHARED_LIBS=OFF"
363+
if [ $MULTITHREADED_TYPE == "MD" ]; then
364+
sed -i 's/\/MT/\/MD/g; s/\/MTd/\/MDd/g' ../CMakeLists.txt
365+
fi
366+
367+
echoInfo "Building OpenCV Debug"
368+
cmake .. ${DEFINES} \
371369
-A "${PLATFORM}" \
372370
-G "${GENERATOR_NAME}" \
373371
-DCMAKE_PREFIX_PATH="${LIBS_ROOT}" \
@@ -387,19 +385,20 @@ function build() {
387385
-DPNG_ROOT=${LIBPNG_ROOT} \
388386
-DPNG_PNG_INCLUDE_DIR=${LIBPNG_INCLUDE_DIR} \
389387
-DPNG_LIBRARY=${LIBPNG_LIBRARY}
390-
cmake --build . --target install --config Debug
391-
mv Debug ..
392-
mv 3rdparty/lib/Debug ../Debug3rd
393-
394-
rm -f CMakeCache.txt *.a *.o *.lib *.js
395-
cd ..
396-
if [ -d "build_${TYPE}_${PLATFORM}" ]; then
397-
rm -r build_${TYPE}_${PLATFORM}
398-
fi
399-
mkdir -p "build_${TYPE}_${PLATFORM}"
400-
cd "build_${TYPE}_${PLATFORM}"
401-
rm -f CMakeCache.txt || true
402-
fi
388+
cmake --build . --target install --config Debug
389+
390+
mv Debug ..
391+
mv 3rdparty/lib/Debug ../Debug3rd
392+
393+
rm -f CMakeCache.txt *.a *.o *.lib *.js
394+
cd ..
395+
if [ -d "build_${TYPE}_${PLATFORM}" ]; then
396+
rm -r build_${TYPE}_${PLATFORM}
397+
fi
398+
mkdir -p "build_${TYPE}_${PLATFORM}"
399+
cd "build_${TYPE}_${PLATFORM}"
400+
401+
rm -f CMakeCache.txt || true
403402

404403
echoInfo "Building OpenCV Release"
405404
cmake .. ${DEFINES} \

‎apothecary/formulas/shaderc.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ function build() {
119119
-DCMAKE_CXX_STANDARD=${CPP_STANDARD} \
120120
-DCMAKE_CXX_STANDARD_REQUIRED=ON \
121121
-DCMAKE_CXX_EXTENSIONS=OFF \
122-
-DBUILD_SHARED_LIBS=ON \
122+
-DBUILD_SHARED_LIBS=OFF \
123123
-Dgtest_disable_pthreads=ON \
124124
-DSHADERC_SKIP_TESTS=ON"
125125

‎apothecary/formulas/svgtiny/svgtiny.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ function build() {
204204
-DCMAKE_BUILD_TYPE=Debug \
205205
-DCMAKE_INSTALL_LIBDIR="lib" \
206206
${CMAKE_WIN_SDK} \
207-
-DBUILD_SHARED_LIBS=ON \
207+
-DBUILD_SHARED_LIBS=OFF \
208208
-DLIBXML2_ROOT=$LIBXML2_ROOT \
209209
-DLIBXML2_INCLUDE_DIR=$LIBXML2_INCLUDE_DIR \
210210
-DLIBXML2_LIBRARY=$LIBXML2_LIBRARY \
@@ -227,7 +227,7 @@ function build() {
227227
-DCMAKE_BUILD_TYPE=Debug \
228228
-DCMAKE_INSTALL_LIBDIR="lib" \
229229
${CMAKE_WIN_SDK} \
230-
-DBUILD_SHARED_LIBS=ON \
230+
-DBUILD_SHARED_LIBS=OFF \
231231
-DLIBXML2_ROOT=$LIBXML2_ROOT \
232232
-DLIBXML2_INCLUDE_DIR=$LIBXML2_INCLUDE_DIR \
233233
-DLIBXML2_LIBRARY=$LIBXML2_LIBRARY \

‎apothecary/formulas/videoInput.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ function build() {
5151
-DCMAKE_CXX_STANDARD=${CPP_STANDARD} \
5252
-DCMAKE_CXX_STANDARD_REQUIRED=ON \
5353
-DCMAKE_CXX_EXTENSIONS=OFF
54-
-DBUILD_SHARED_LIBS=ON \
54+
-DBUILD_SHARED_LIBS=OFF \
5555
-DCMAKE_INCLUDE_OUTPUT_DIRECTORY=include \
5656
-DCMAKE_INSTALL_INCLUDEDIR=include \
5757
${CMAKE_WIN_SDK} "

0 commit comments

Comments
 (0)