Skip to content

Commit 0340e08

Browse files
authored
[actions] msys2 fix cannot find -lglfw3dll (#7842)
#changelog #actions
1 parent 130840a commit 0340e08

3 files changed

Lines changed: 15 additions & 8 deletions

File tree

.github/workflows/build-msys2.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,19 @@ jobs:
3232
- uses: actions/checkout@v4
3333
- uses: msys2/setup-msys2@v2
3434
with:
35+
cache: true
3536
update: true
3637
msystem: ${{matrix.msystem}}
3738
install: >-
38-
git
3939
unzip
40-
rsync
41-
wget
40+
# git
41+
# rsync
42+
# wget
43+
pacboy: assimp:p cairo:p curl:p freeglut:p FreeImage:p gcc:p gdb:p glew:p glfw:p glm:p harfbuzz:p libsndfile:p libusb:p libxml2:p mpg123:p nlohmann-json:p ntldd-git:p openal:p opencv:p pkgconf:p pugixml:p rtaudio:p uriparser:p utf8cpp:p zlib:p poco:p
44+
# boost:p tools:p
4245
- name: Install dependencies
4346
run: ./scripts/ci/msys2/install.sh
47+
4448
- name: Build
4549
run: ./scripts/ci/msys2/build.sh
4650
- name: Run tests

libs/openFrameworksCompiled/project/msys2/config.msys2.default.mk

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,11 @@ PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/utf8/%
236236

237237
PLATFORM_LIBRARIES += ksuser opengl32 gdi32 msimg32 glu32 dsound winmm strmiids #dxguid
238238
PLATFORM_LIBRARIES += uuid ole32 oleaut32 setupapi wsock32 ws2_32 Iphlpapi Comdlg32
239-
PLATFORM_LIBRARIES += freeimage boost_filesystem-mt boost_system-mt
239+
PLATFORM_LIBRARIES += freeimage
240+
# PLATFORM_LIBRARIES += boost_filesystem-mt boost_system-mt
240241
PLATFORM_LIBRARIES += mf mfplat mfuuid mfreadwrite
242+
PLATFORM_LIBRARIES += glfw3
243+
241244
#PLATFORM_LIBRARIES += gstapp-1.0 gstvideo-1.0 gstbase-1.0 gstreamer-1.0 gobject-2.0 glib-2.0 intl
242245
#PLATFORM_LIBRARIES += mf mfplat mfuuid d3d11 #xaudio2
243246

@@ -250,7 +253,7 @@ PLATFORM_PKG_CONFIG_LIBRARIES += zlib
250253
PLATFORM_PKG_CONFIG_LIBRARIES += openssl
251254
PLATFORM_PKG_CONFIG_LIBRARIES += freetype2
252255
PLATFORM_PKG_CONFIG_LIBRARIES += glew
253-
PLATFORM_PKG_CONFIG_LIBRARIES += glfw3
256+
# PLATFORM_PKG_CONFIG_LIBRARIES += glfw3
254257
PLATFORM_PKG_CONFIG_LIBRARIES += glm
255258
#PLATFORM_PKG_CONFIG_LIBRARIES += gstreamer-1.0
256259
PLATFORM_PKG_CONFIG_LIBRARIES += libcurl

scripts/msys2/install_dependencies.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ done
3434
msyspackages="make rsync zip unzip wget"
3535

3636
# List of MINGW packages to be installed (without prefix)
37-
mingwPackages="assimp boost cairo curl freeglut FreeImage \
37+
mingwPackages="assimp cairo curl freeglut FreeImage \
3838
gcc gdb glew glfw glm \
3939
harfbuzz libsndfile libusb libxml2 mpg123 \
4040
nlohmann-json ntldd-git openal opencv \
41-
pkgconf poco pugixml rtaudio tools \
41+
pkgconf pugixml rtaudio \
4242
uriparser utf8cpp zlib"
43-
43+
# boost poco tools
4444
# Build the full list of packages adding prefix to MINGW packages
4545
packages=${msyspackages}
4646
for pkg in ${mingwPackages}; do

0 commit comments

Comments
 (0)