Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI and various compile fixes #270

Merged
merged 7 commits into from
Sep 6, 2024
Merged

CI and various compile fixes #270

merged 7 commits into from
Sep 6, 2024

Conversation

dsvensson
Copy link
Contributor

No description provided.

@dsvensson dsvensson force-pushed the ci branch 2 times, most recently from 89f92d9 to 71b8593 Compare August 31, 2024 10:57
@dsvensson dsvensson marked this pull request as ready for review August 31, 2024 11:00
@dsvensson dsvensson force-pushed the ci branch 2 times, most recently from 335b576 to aa89fb8 Compare August 31, 2024 16:41
@@ -3,7 +3,7 @@
ifeq ($(FTE_TARGET),win32)
PLUG_NATIVE_EXT=_x86.dll
PLUG_LDFLAGS= -static-libgcc
PLUG_LDFLAGS_ZLIB=-L../engine/libs/mingw-libs -lzlib
PLUG_LDFLAGS_ZLIB=-L../engine/libs/mingw-libs -lz
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixes the win32 plugins build, same as the win64 case a few lines down. Think it's correct at least.

@eukara eukara merged commit e62a712 into fte-team:master Sep 6, 2024
7 checks passed
@Xylemon Xylemon added the bug Something isn't working label Sep 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants