move distributable location to an access protected folder; restore Linux compiler to default and use a better default for sdl2-config location

This commit is contained in:
ohsqueezy 2024-04-17 18:31:11 -04:00
parent 7f87756b6c
commit eb09e0603b
5 changed files with 9 additions and 17 deletions

1
.gitignore vendored
View File

@ -7,6 +7,7 @@ compile_commands.json
# SPACEBOX
BPmono.ttf
sdl2-config
# External symlinks
ext/

View File

@ -25,7 +25,7 @@ CC := gcc-12
CXX := g++-12
# Location of SDL config program. See README.md for how to compile the SDL library and this utility.
SDLCONFIG := $(HOME)/local/sdl/bin/sdl2-config
SDLCONFIG := sdl2-config
#############################
# Based on above parameters #
@ -194,8 +194,6 @@ LINUX_OBJ = $(addprefix $(X64_BUILD_DIR)/, glew.o SDL2_rotozoom.o SDL2_gfxPrimit
LINUX_DEBUG_OBJ = $(addprefix $(X64_DEBUG_BUILD_DIR)/, glew.o SDL2_rotozoom.o SDL2_gfxPrimitives.o $(SB_O_FILES) $(SRC_O_FILES))
X64_BUILD_LIB_DIR = lib/
Cakefoot-linux.x64 : CC = $(HOME)/ext/software/zig-linux-x86_64-0.12.0-dev.3644+05d975576/zig cc
Cakefoot-linux.x64 : CXX = $(HOME)/ext/software/zig-linux-x86_64-0.12.0-dev.3644+05d975576/zig c++
Cakefoot-linux.x64 : CFLAGS = $(LINUX_CFLAGS) -O3
Cakefoot-linux.x64 : CXXFLAGS = $(LINUX_CXXFLAGS)
Cakefoot-linux.x64 : LFLAGS = $(LINUX_LFLAGS) -Wl,-rpath $(X64_BUILD_LIB_DIR)

View File

@ -129,13 +129,6 @@ Upcoming conventions, festivals, and events
* [1 year anniversary of Boshi's Place party](https://www.instagram.com/p/C40yS-cOp4e/) (Sat. 4/6 @ 7pm, New York, NY) - Cakefoot will be playable
Weekly livestreams of Cakefoot, played by the developer, occasionally featuring guest players
* [Fork it up: Cakefoot Live on Twitch](https://twitch.tv/dankd0tgame) (Wed. 4/17 @ 8-11pm EST)
* [Fork it up: Cakefoot Live on Twitch](https://twitch.tv/dankd0tgame) (Wed. 4/24 @ 8-11pm EST)
* [Fork it up: Cakefoot Live on Twitch](https://twitch.tv/dankd0tgame) (Wed. 5/1 @ 8-11pm EST)
* [Fork it up: Cakefoot Live on Twitch](https://twitch.tv/dankd0tgame) (Wed. 5/8 @ 8-11pm EST)
Past events
* [Awesome Con](https://awesome-con.com/) (Fri. 3/8 - Sun. 3/10, Washington D.C.)

View File

@ -3,7 +3,7 @@
"AppID" "2869020" // your AppID
"Desc" "Cakefoot on Windows, MacOS, and Linux for Steam" // internal description for this build
"ContentRoot" "../dist/" // root content folder, relative to location of this file
"ContentRoot" "../dist/protected/" // root content folder, relative to location of this file
"BuildOutput" "../local/steam-sdk-output/" // build output folder for build logs and build cache files
"Depots"

View File

@ -1,10 +1,10 @@
#!/bin/bash
unzip -d dist/ dist/Cakefoot-linux.zip
unzip -d dist/ dist/Cakefoot-win32.zip
unzip -d dist/ dist/Cakefoot-win64.zip
unzip -d dist/protected/ dist/protected/Cakefoot-linux.zip
unzip -d dist/protected/ dist/protected/Cakefoot-win32.zip
unzip -d dist/protected/ dist/protected/Cakefoot-win64.zip
bash $HOME/ext/software/steamworks/sdk/tools/ContentBuilder/builder_linux/steamcmd.sh +login tarecontrol +run_app_build \
$(pwd)/src/steam_app_build.vdf +quit
mv dist/Cakefoot-linux /tmp && rm -rf /tmp/Cakefoot-linux
mv dist/Cakefoot-win32 /tmp && rm -rf /tmp/Cakefoot-win32
mv dist/Cakefoot-win64 /tmp && rm -rf /tmp/Cakefoot-win64
mv dist/protected/Cakefoot-linux /tmp && rm -rf /tmp/Cakefoot-linux
mv dist/protected/Cakefoot-win32 /tmp && rm -rf /tmp/Cakefoot-win32
mv dist/protected/Cakefoot-win64 /tmp && rm -rf /tmp/Cakefoot-win64