Skip to content

Commit

Permalink
Build maintenance and bug fix
Browse files Browse the repository at this point in the history
* Attempt fixing Linux build, broke after switching to enet6.

* Upgrade unordered_dense to 73f3cbb237e84d483afafc743f1f14ec53e12314

* Fix sound_default_mixer being applied upon sound load even if that sound was set to a custom mixer before hand.
  • Loading branch information
samtupy committed Dec 5, 2024
1 parent 7c53c4b commit 7ccdba4
Show file tree
Hide file tree
Showing 3 changed files with 127 additions and 60 deletions.
2 changes: 1 addition & 1 deletion SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ elif env["PLATFORM"] == "posix":
# enable the gold linker to silence seemingly pointless warnings about symbols in the bass libraries, strip the resulting binaries, and add /usr/local/lib to the libpath because it seems we aren't finding libraries unless we do manually.
env.Append(CPPPATH = ["/usr/local/include"], LIBPATH = ["/usr/local/lib"], LINKFLAGS = ["-fuse-ld=gold", "-g" if ARGUMENTS.get("debug", 0) == "1" else "-s"])
# We must explicitly denote the static linkage for several libraries or else gcc will choose the dynamic ones.
env.Append(LIBS = [":libangelscript.a", ":libenet.a", ":libSDL3.a", "crypto", "ssl"])
env.Append(LIBS = [":libangelscript.a", ":libenet6.a", ":libSDL3.a", "crypto", "ssl"])
env.Append(CPPDEFINES = ["POCO_STATIC", "UNIVERSAL_SPEECH_STATIC", "DEBUG" if ARGUMENTS.get("debug", "0") == "1" else "NDEBUG", "UNICODE"])
env.Append(CPPPATH = ["#ASAddon/include", "#dep"], LIBPATH = ["#build/lib"])

Expand Down
Loading

0 comments on commit 7ccdba4

Please sign in to comment.