--- build.sh +++ build.sh @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/sh -ex format=0 console=0 @@ -51,8 +51,6 @@ then fi mkdir -p bin -CC="${CC:-cc}" -CFLAGS="${CFLAGS:--std=c89 -Wall -Wno-unknown-pragmas}" case "$(uname -s 2>/dev/null)" in MSYS_NT*|MINGW*) # MSYS2 on Windows FILE_LDFLAGS="-liberty" @@ -64,8 +62,7 @@ MSYS_NT*|MINGW*) # MSYS2 on Windows fi ;; Darwin) # macOS - CFLAGS="${CFLAGS} -Wno-typedef-redefinition -D_C99_SOURCE" - UXNEMU_LDFLAGS="$(sdl2-config --cflags --static-libs)" + UXNEMU_LDFLAGS="$(sdl2-config --cflags --libs)" ;; Linux|*) UXNEMU_LDFLAGS="-L/usr/local/lib $(sdl2-config --cflags --libs)" @@ -76,8 +73,6 @@ if [ $debug = 1 ]; then echo "[debug]" CFLAGS="${CFLAGS} -DDEBUG -Wpedantic -Wshadow -Wextra -Werror=implicit-int -Werror=incompatible-pointer-types -Werror=int-conversion -Wvla -g -Og -fsanitize=address -fsanitize=undefined" -else - CFLAGS="${CFLAGS} -DNDEBUG -O2 -g0 -s" fi ${CC} ${CFLAGS} src/uxnasm.c -o bin/uxnasm @@ -90,13 +85,3 @@ then fi if [ $norun = 1 ]; then exit; fi - -# Test version - -bin/uxnasm -v -bin/uxncli -v -bin/uxnemu -v - -# Start potato - -bin/uxnemu -2x