+15 -1

CMakeLists.txt

reviewed

··· 637 637 set(LIBRETRO_EXTENSION "a") 638 638 endif() 639 639 set_target_properties(tic80_libretro PROPERTIES SUFFIX "_partial.a") 640 640 - add_custom_command(TARGET tic80_libretro 640 640 + include(CheckCSourceCompiles) 641 641 + check_c_source_compiles( 642 642 + "#ifndef __MSDOS__ 643 643 + #error \"Not DOS\" 644 644 + #endif" 645 645 + IS_DOS 646 646 + ) 647 647 + 648 648 + if(IS_DOS) 649 649 + add_custom_command(TARGET tic80_libretro 650 650 + POST_BUILD 651 651 + COMMAND ${CMAKE_SOURCE_DIR}/build/libretro/merge_static.sh $(AR) ${CMAKE_BINARY_DIR}/lib/tic80_libretro${LIBRETRO_SUFFIX}.${LIBRETRO_EXTENSION} ${CMAKE_BINARY_DIR}/lib/tic80_libretro_partial.a ${CMAKE_BINARY_DIR}/lib/libtic80core.a ${CMAKE_BINARY_DIR}/lib/liblua.a ${CMAKE_BINARY_DIR}/lib/libblipbuf.a ${CMAKE_BINARY_DIR}/lib/libduktape.a ${CMAKE_BINARY_DIR}/lib/libwren.a ${CMAKE_BINARY_DIR}/lib/libwasm.a ${CMAKE_BINARY_DIR}/lib/libsquirrel.a ${CMAKE_BINARY_DIR}/lib/libgiflib.a ${CMAKE_BINARY_DIR}/lib/liblpeg.a ${CMAKE_BINARY_DIR}/lib/libzlib.a ${MRUBY_LIB}) 652 652 + else() 653 653 + add_custom_command(TARGET tic80_libretro 641 654 POST_BUILD 642 655 COMMAND ${CMAKE_SOURCE_DIR}/build/libretro/merge_static.sh $(AR) ${CMAKE_BINARY_DIR}/lib/tic80_libretro${LIBRETRO_SUFFIX}.${LIBRETRO_EXTENSION} ${CMAKE_BINARY_DIR}/lib/tic80_libretro_partial.a ${CMAKE_BINARY_DIR}/lib/libtic80core.a ${CMAKE_BINARY_DIR}/lib/liblua.a ${CMAKE_BINARY_DIR}/lib/libblipbuf.a ${CMAKE_BINARY_DIR}/lib/libduktape.a ${CMAKE_BINARY_DIR}/lib/libwren.a ${CMAKE_BINARY_DIR}/lib/libwasm.a ${CMAKE_BINARY_DIR}/lib/libsquirrel.a ${CMAKE_BINARY_DIR}/lib/libgiflib.a ${CMAKE_BINARY_DIR}/lib/liblpeg.a ${MRUBY_LIB}) 656 656 + endif() 643 657 else() 644 658 add_library(tic80_libretro SHARED 645 659 ${LIBRETRO_SRC}

+1 -5

src/cart.c

reviewed

··· 29 29 30 30 #include <string.h> 31 31 #include <stdlib.h> 32 32 - #include <assert.h> 33 33 - 34 34 - #if defined(DINGUX) && !defined(static_assert) 35 35 - #define static_assert _Static_assert 36 36 - #endif 32 32 + #include "tic_assert.h" 37 33 38 34 typedef enum 39 35 {

+1 -4

src/core/core.c

reviewed

··· 31 31 #include <ctype.h> 32 32 #include <stddef.h> 33 33 #include <time.h> 34 34 - #include <assert.h> 35 34 36 36 - #if defined(DINGUX) && !defined(static_assert) 37 37 - #define static_assert _Static_assert 38 38 - #endif 35 35 + #include "tic_assert.h" 39 36 40 37 #ifdef _3DS 41 38 #include <3ds.h>

+1 -5

src/core/io.c

reviewed

··· 23 23 #include "api.h" 24 24 #include "core.h" 25 25 26 26 - #include <assert.h> 27 27 - 28 28 - #if defined(DINGUX) && !defined(static_assert) 29 29 - #define static_assert _Static_assert 30 30 - #endif 26 26 + #include "tic_assert.h" 31 27 32 28 static_assert(sizeof(tic80_input) == 12, "tic80_input"); 33 29

+1 -5

src/core/sound.c

reviewed

··· 25 25 #include "core.h" 26 26 27 27 #include <string.h> 28 28 - #include <assert.h> 29 29 - 30 30 - #if defined(DINGUX) && !defined(static_assert) 31 31 - #define static_assert _Static_assert 32 32 - #endif 28 28 + #include "tic_assert.h" 33 29 34 30 #define ENVELOPE_FREQ_SCALE 2 35 31 #define SECONDS_PER_MINUTE 60

+1 -1

src/ext/png.c

reviewed

··· 26 26 #include <string.h> 27 27 #include <stdlib.h> 28 28 #include <png.h> 29 29 - #include <assert.h> 29 29 + #include "tic_assert.h" 30 30 31 31 #define RGBA_SIZE sizeof(u32) 32 32

+1 -1

src/studio/editors/code.c

reviewed

··· 24 24 #include "ext/history.h" 25 25 26 26 #include <ctype.h> 27 27 - #include <assert.h> 27 27 + #include "tic_assert.h" 28 28 29 29 #define TEXT_CURSOR_DELAY (TIC80_FRAMERATE / 2) 30 30 #define TEXT_CURSOR_BLINK_PERIOD TIC80_FRAMERATE

+5

src/tic_assert.h

reviewed

··· 1 1 + #include <assert.h> 2 2 + 3 3 + #if (defined(DINGUX) || defined(__DJGPP__)) && !defined(static_assert) 4 4 + #define static_assert _Static_assert 5 5 + #endif