diff --git a/compile-linux.hxml b/compile-linux.hxml index bcea82ed..3d082e48 100644 --- a/compile-linux.hxml +++ b/compile-linux.hxml @@ -1,7 +1,10 @@ -cp src -lib heaps -lib hlsdl +-lib colyseus-websocket +-lib datachannel -D highDPI -D flow_border +-D analyzer-optimize -hl native/marblegame.c --main Main diff --git a/compile-linux.sh b/compile-linux.sh index 4aaad4ec..269828e2 100755 --- a/compile-linux.sh +++ b/compile-linux.sh @@ -2,5 +2,6 @@ haxe compile-linux.hxml cd native -gcc -o marblegame -g -I . -L /usr/local/lib marblegame.c /usr/local/lib/{ui.hdll,openal.hdll,fmt.hdll,sdl.hdll,uv.hdll,ssl.hdll} -lSDL2 -lhl -lm +gcc -o marblegame -O2 -I . -L /usr/local/lib marblegame.c /usr/local/lib/{ui.hdll,openal.hdll,fmt.hdll,sdl.hdll,uv.hdll,ssl.hdll,datachannel.hdll} -lSDL2 -lhl -lm -luv +strip marblegame cp marblegame .. diff --git a/linux-dist/run-marblegame-debug.sh b/linux-dist/run-marblegame-debug.sh new file mode 100755 index 00000000..565a2739 --- /dev/null +++ b/linux-dist/run-marblegame-debug.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +cd "$(dirname "$0")" +./hl marblegame.hl diff --git a/linux-dist/run-marblegame.sh b/linux-dist/run-marblegame.sh new file mode 100755 index 00000000..e6fe5fe4 --- /dev/null +++ b/linux-dist/run-marblegame.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +cd "$(dirname "$0")" + +# Add the current directory to the linker path so the .hdll files can be loaded +if [ "x$LD_LIBRARY_PATH" = "x" ]; then + export LD_LIBRARY_PATH=. +else + export LD_LIBRARY_PATH=".:$LD_LIBRARY_PATH" +fi + +./marblegame $@ diff --git a/src/gui/PresentsGui.hx b/src/gui/PresentsGui.hx index cd20573a..b831d2e1 100644 --- a/src/gui/PresentsGui.hx +++ b/src/gui/PresentsGui.hx @@ -14,7 +14,7 @@ class PresentsGui extends GuiImage { this.position = new Vector(); this.extent = new Vector(640, 480); - var ggLogo = new GuiImage(ResourceLoader.getResource('data/ui/GG_logo.png', ResourceLoader.getImage, this.imageResources).toTile()); + var ggLogo = new GuiImage(ResourceLoader.getResource('data/ui/GG_Logo.png', ResourceLoader.getImage, this.imageResources).toTile()); ggLogo.horizSizing = Center; ggLogo.vertSizing = Center; ggLogo.position = new Vector(69, 99);