update makefile target names, remove broken img
This commit is contained in:
parent
871581bdd3
commit
8f4aed0764
|
@ -1,3 +1,3 @@
|
|||
[submodule "lib/sb"]
|
||||
path = lib/sb
|
||||
url = https://git.nugget.fun/nugget/sb.git
|
||||
url = https://open.shampoo.ooo/shampoo/spacebox
|
||||
|
|
22
Makefile
22
Makefile
|
@ -16,6 +16,10 @@ SB_LIB_DIR := $(SB_DIR)lib/
|
|||
SDLGFX2_DIR := $(SB_LIB_DIR)sdl2-gfx/
|
||||
GLEW_DIR := $(SB_LIB_DIR)glew/
|
||||
|
||||
# C and C++ compiler commands
|
||||
CC := clang
|
||||
CXX := clang++
|
||||
|
||||
# Location of SDL config program
|
||||
SDLCONFIG := $(HOME)/local/sdl/bin/sdl2-config
|
||||
|
||||
|
@ -68,10 +72,10 @@ $(SRC_DIR)Pepy.o : $(SRC_H_FILES) $(SB_H_FILES)
|
|||
# Linux build #
|
||||
###############
|
||||
|
||||
linux : CFLAGS = -g -Wall -Wextra -O0 -fPIE -c -I$(SB_LIB_DIR) -I$(SB_SRC_DIR) $(SDL_CFLAGS)
|
||||
linux : CPP_FLAGS = $(CFLAGS) --std=c++17
|
||||
linux : LFLAGS = $(SDL_LFLAGS) -fPIE -lpthread -lGL -lGLESv2 -lSDL2_image -lSDL2_ttf -lSDL2_mixer -lstdc++fs
|
||||
linux : $(GLEW_DIR)glew.o $(addprefix $(SDLGFX2_DIR),SDL2_rotozoom.o SDL2_gfxPrimitives.o) \
|
||||
pepy : CFLAGS = -g -Wall -Wextra -O0 -fPIE -c -I$(SB_LIB_DIR) -I$(SB_SRC_DIR) $(SDL_CFLAGS)
|
||||
pepy : CPP_FLAGS = $(CFLAGS) --std=c++17
|
||||
pepy : LFLAGS = $(SDL_LFLAGS) -fPIE -lpthread -lGL -lGLESv2 -lSDL2_image -lSDL2_ttf -lSDL2_mixer -lstdc++fs
|
||||
pepy : $(GLEW_DIR)glew.o $(addprefix $(SDLGFX2_DIR),SDL2_rotozoom.o SDL2_gfxPrimitives.o) \
|
||||
$(SB_O_FILES) $(SRC_O_FILES)
|
||||
$(CREATE_FONT_SYMLINK)
|
||||
$(CXX) $^ $(LFLAGS) -D__LINUX__ -o pepy
|
||||
|
@ -90,11 +94,11 @@ EMSCRIPTEN_LFLAGS = -s MIN_WEBGL_VERSION=2 -s EXPORTED_FUNCTIONS="['_main']" -s
|
|||
EMSCRIPTEN_PRELOADS = --preload-file "BPmono.ttf"@/ --preload-file "config.json"@/ --preload-file "resource/"@/"resource/" \
|
||||
--preload-file "src/shader.vert"@/"src/" --preload-file "src/shader.frag"@/"src/"
|
||||
|
||||
emscripten : CC = $(EMSCRIPTENHOME)/emcc
|
||||
emscripten : CXX = $(EMSCRIPTENHOME)/em++
|
||||
emscripten : CFLAGS = $(EMSCRIPTEN_CFLAGS)
|
||||
emscripten : CPP_FLAGS = $(CFLAGS) --std=c++17
|
||||
emscripten : $(addprefix $(SDLGFX2_DIR),SDL2_rotozoom.o SDL2_gfxPrimitives.o) $(SB_O_FILES) $(SRC_O_FILES)
|
||||
index.html : CC = $(EMSCRIPTENHOME)/emcc
|
||||
index.html : CXX = $(EMSCRIPTENHOME)/em++
|
||||
index.html : CFLAGS = $(EMSCRIPTEN_CFLAGS)
|
||||
index.html : CPP_FLAGS = $(CFLAGS) --std=c++17
|
||||
index.html : $(addprefix $(SDLGFX2_DIR),SDL2_rotozoom.o SDL2_gfxPrimitives.o) $(SB_O_FILES) $(SRC_O_FILES)
|
||||
$(CREATE_FONT_SYMLINK)
|
||||
$(CXX) $^ $(CPP_FLAGS) $(EMSCRIPTEN_LFLAGS) $(EMSCRIPTEN_PRELOADS) -o "index.html"
|
||||
|
||||
|
|
|
@ -43,6 +43,13 @@ About
|
|||
|
||||
This is the first game planned for an online arcade at <https://shampoo.ooo>. It is also one of the first games made with the [SPACEBOX][] game framework. The initial prototype was made for [UWILLNOTLAST10SECONDS][].
|
||||
|
||||
### Pepy is a...
|
||||
|
||||
* media apparatus
|
||||
* bubble
|
||||
* lottery ball
|
||||
* technological marvel
|
||||
|
||||
Contact
|
||||
-------
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
{
|
||||
"screenshot-directory": "local/screenshots",
|
||||
"video-directory": "local/video",
|
||||
"enabled": true,
|
||||
"enabled": false,
|
||||
"write-mp4": true,
|
||||
"video-frame-length": 33.333,
|
||||
"max-video-memory": 2000,
|
||||
|
@ -20,7 +20,7 @@
|
|||
},
|
||||
"configuration":
|
||||
{
|
||||
"auto-refresh": true
|
||||
"auto-refresh": false
|
||||
},
|
||||
"keys":
|
||||
{
|
||||
|
|
2
lib/sb
2
lib/sb
|
@ -1 +1 @@
|
|||
Subproject commit dc2141c2c441d92b35979f3dac0d5d7e74e440d6
|
||||
Subproject commit ecce532abfac9198e61e8975f234a19239f74020
|
|
@ -67,8 +67,7 @@
|
|||
</head>
|
||||
<body>
|
||||
<div>
|
||||
<image style="width: 140px" src="resource/wad/Mike/0.png">Pepy, it's cuckoo time! Please make it as big as possible using the arrow keys in
|
||||
10 seconds.
|
||||
Pepy, it's cuckoo time! Please make it as big as possible using the arrow keys in 10 seconds.
|
||||
</div>
|
||||
<div id="game">
|
||||
<div id="loading">
|
||||
|
|
Loading…
Reference in New Issue