implement our own gui module, drop microui
This commit is contained in:
parent
2555bec8eb
commit
8baf5f06ea
25 changed files with 495 additions and 507 deletions
24
pxl8.sh
24
pxl8.sh
|
|
@ -82,7 +82,7 @@ compile_source_file() {
|
|||
|
||||
|
||||
make_lib_dirs() {
|
||||
mkdir -p lib/linenoise lib/fennel lib/microui/src lib/miniz
|
||||
mkdir -p lib/linenoise lib/fennel lib/miniz
|
||||
}
|
||||
|
||||
print_error() {
|
||||
|
|
@ -216,17 +216,6 @@ update_luajit() {
|
|||
print_info "Updated LuaJIT (${version})"
|
||||
}
|
||||
|
||||
update_microui() {
|
||||
print_info "Fetching microui"
|
||||
|
||||
if curl -sL --max-time 5 -o lib/microui/src/microui.c https://raw.githubusercontent.com/rxi/microui/master/src/microui.c 2>/dev/null && \
|
||||
curl -sL --max-time 5 -o lib/microui/src/microui.h https://raw.githubusercontent.com/rxi/microui/master/src/microui.h 2>/dev/null; then
|
||||
print_info "Updated microui"
|
||||
else
|
||||
print_error "Failed to download microui"
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
update_miniz() {
|
||||
print_info "Fetching miniz"
|
||||
|
|
@ -291,8 +280,7 @@ case "$COMMAND" in
|
|||
mkdir -p "$BUILDDIR"
|
||||
mkdir -p "$BINDIR"
|
||||
|
||||
if [[ ! -f "lib/microui/src/microui.c" ]] || \
|
||||
[[ ! -d "lib/luajit" ]] || \
|
||||
if [[ ! -d "lib/luajit" ]] || \
|
||||
[[ ! -f "lib/linenoise/linenoise.c" ]] || \
|
||||
[[ ! -f "lib/miniz/miniz.c" ]] || \
|
||||
[[ ! -f "lib/fennel/fennel.lua" ]]; then
|
||||
|
|
@ -302,7 +290,6 @@ case "$COMMAND" in
|
|||
update_fennel
|
||||
update_linenoise
|
||||
update_luajit
|
||||
update_microui
|
||||
update_miniz
|
||||
fi
|
||||
|
||||
|
|
@ -333,13 +320,13 @@ case "$COMMAND" in
|
|||
print_info "Compiler cache: ccache enabled"
|
||||
fi
|
||||
|
||||
INCLUDES="-Isrc -Ilib -Ilib/microui/src -Ilib/luajit/src -Ilib/linenoise -Ilib/miniz"
|
||||
INCLUDES="-Isrc -Ilib -Ilib/luajit/src -Ilib/linenoise -Ilib/miniz"
|
||||
COMPILE_FLAGS="$CFLAGS $INCLUDES"
|
||||
DEP_COMPILE_FLAGS="$DEP_CFLAGS $INCLUDES"
|
||||
|
||||
EXECUTABLE="$BINDIR/pxl8"
|
||||
|
||||
LIB_SOURCE_FILES="lib/linenoise/linenoise.c lib/microui/src/microui.c lib/miniz/miniz.c"
|
||||
LIB_SOURCE_FILES="lib/linenoise/linenoise.c lib/miniz/miniz.c"
|
||||
|
||||
PXL8_SOURCE_FILES="
|
||||
src/pxl8.c
|
||||
|
|
@ -359,7 +346,7 @@ case "$COMMAND" in
|
|||
src/pxl8_tilemap.c
|
||||
src/pxl8_tilesheet.c
|
||||
src/pxl8_transition.c
|
||||
src/pxl8_ui.c
|
||||
src/pxl8_gui.c
|
||||
src/pxl8_vfx.c
|
||||
src/pxl8_world.c
|
||||
"
|
||||
|
|
@ -473,7 +460,6 @@ case "$COMMAND" in
|
|||
update_fennel
|
||||
update_linenoise
|
||||
update_luajit
|
||||
update_microui
|
||||
update_miniz
|
||||
print_info "All dependencies updated"
|
||||
;;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue