Skip to content

Commit 8561869

Browse files
committed
underhanded techniques to make it build probably
1 parent 6a10dd4 commit 8561869

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.github/workflows/ci-workflow.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
run: sudo apt update && sudo apt install ${{ matrix.cfg.cpp-version }} nasm ninja-build libglew-dev libxrandr-dev libxtst-dev libpulse-dev libasound-dev libogg-dev libvorbis-dev xorg-dev libcurl4-openssl-dev
4040

4141
- name: Generate CMake
42-
run: mkdir main/build && cd main/build && cmake -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
42+
run: mkdir main/build && cd main/build && cmake -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTS=FALSE -DBUILD_EXAMPLES=FALSE ..
4343
env:
4444
CXX: ${{matrix.cfg.cpp-version}}
4545

@@ -135,7 +135,7 @@ jobs:
135135
echo "ETT_MAC_SYS_NAME=M1" >> $GITHUB_ENV
136136
137137
- name: Generate CMake
138-
run: mkdir main/build && cd main/build && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWITH_CRASHPAD=OFF -G Ninja ..
138+
run: mkdir main/build && cd main/build && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWITH_CRASHPAD=OFF -DBUILD_TESTS=FALSE -DBUILD_EXAMPLES=FALSE -G Ninja ..
139139

140140
- name: Build Project
141141
run: cd main/build && ninja
@@ -238,7 +238,7 @@ jobs:
238238
echo "ETT_MAC_SYS_NAME=Darwin-x64" >> $GITHUB_ENV
239239
240240
- name: Generate CMake
241-
run: mkdir main/build && cd main/build && cmake -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCMAKE_BUILD_TYPE=RelWithDebInfo -G Ninja ..
241+
run: mkdir main/build && cd main/build && cmake -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTS=FALSE -DBUILD_EXAMPLES=FALSE -G Ninja ..
242242

243243
- name: Build Project
244244
run: cd main/build && ninja
@@ -330,7 +330,7 @@ jobs:
330330
echo "ETT_MAC_SYS_NAME=High-Sierra" >> $GITHUB_ENV
331331
332332
- name: Generate CMake
333-
run: mkdir main/build && cd main/build && cmake -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DWITH_CRASHPAD=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -G Ninja ..
333+
run: mkdir main/build && cd main/build && cmake -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DWITH_CRASHPAD=OFF -DBUILD_TESTS=FALSE -DBUILD_EXAMPLES=FALSE -DCMAKE_BUILD_TYPE=RelWithDebInfo -G Ninja ..
334334

335335
- name: Build Project
336336
run: cd main/build && ninja
@@ -453,7 +453,7 @@ jobs:
453453
arch: ${{ matrix.cfg.arch }}
454454

455455
- name: Generate CMake
456-
run: mkdir main/build && cd main/build && cmake -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
456+
run: mkdir main/build && cd main/build && cmake -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTS=FALSE -DBUILD_EXAMPLES=FALSE ..
457457
env:
458458
DXSDK_DIR: "${{github.workspace}}/dxsdk/"
459459

extern/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ list(APPEND EXT_TARGETS
8888
discord-rpc muFFT
8989
zlib libmad pcre
9090
ogg vorbis glfw
91-
libcurl fmt)
91+
fmt)
9292

9393
list(APPEND LUA_TARGETS luajit libluajit minilua buildvm)
9494

extern/curl/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1339,7 +1339,7 @@ if(USE_LIBIDN2 AND NOT USE_APPLE_IDN AND NOT USE_WIN32_IDN)
13391339
endif()
13401340

13411341
# libpsl
1342-
option(CURL_USE_LIBPSL "Use libpsl" ON)
1342+
option(CURL_USE_LIBPSL "Use libpsl" OFF)
13431343
mark_as_advanced(CURL_USE_LIBPSL)
13441344
set(USE_LIBPSL OFF)
13451345

0 commit comments

Comments
 (0)