diff --git a/CMakeLists.txt b/CMakeLists.txt index fe15772d..0e3e4d62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,10 +7,12 @@ if(ANDROID OR EMSCRIPTEN) set(BUILD_SOKOL_DEFAULT OFF) set(BUILD_LIBRETRO_DEFAULT OFF) set(BUILD_DEMO_CARTS_DEFAULT OFF) + set(BUILD_PLAYER_DEFAULT OFF) else() set(BUILD_SOKOL_DEFAULT ON) set(BUILD_LIBRETRO_DEFAULT ON) set(BUILD_DEMO_CARTS_DEFAULT ON) + set(BUILD_PLAYER_DEFAULT ON) endif() option(BUILD_SDL "SDL Enabled" ON) @@ -18,6 +20,7 @@ option(BUILD_SOKOL "Sokol Enabled" ${BUILD_SOKOL_DEFAULT}) option(BUILD_LIBRETRO "libretro Enabled" ${BUILD_LIBRETRO_DEFAULT}) option(BUILD_DEMO_CARTS "Demo Carts Enabled" ${BUILD_DEMO_CARTS_DEFAULT}) option(BUILD_PRO "Build PRO version" FALSE) +option(BUILD_PLAYER "Build standalone players" ${BUILD_PLAYER_DEFAULT}) if (BAREMETALPI) @@ -110,10 +113,9 @@ else() set(CMAKE_C_STANDARD 99) - -if(EMSCRIPTEN) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s USE_SDL=2") -endif() + if(EMSCRIPTEN) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s USE_SDL=2") + endif() endif() @@ -308,30 +310,23 @@ if(BUILD_SDL AND NOT EMSCRIPTEN) endif() ################################ -# SDL2 renderer example +# SDL2 standalone cart player ################################ -set(EXAMPLE_DIR ${CMAKE_SOURCE_DIR}/examples) -if(BUILD_SDL AND NOT EMSCRIPTEN AND NOT ANDROID) - set(EXAMPLE_SRC - ${EXAMPLE_DIR}/sdl/main.c - ) +if(BUILD_PLAYER) - if(WIN32) - add_executable(sdl-renderer WIN32 ${EXAMPLE_SRC}) - else() - add_executable(sdl-renderer ${EXAMPLE_SRC}) - endif() + add_executable(player-sdl WIN32 ${CMAKE_SOURCE_DIR}/src/player/sdl.c) - target_include_directories(sdl-renderer PRIVATE ${THIRDPARTY_DIR}/sdl2/include) - target_include_directories(sdl-renderer PRIVATE ${CMAKE_SOURCE_DIR}/include) - target_include_directories(sdl-renderer PRIVATE ${CMAKE_SOURCE_DIR}/src) + target_include_directories(player-sdl PRIVATE + ${THIRDPARTY_DIR}/sdl2/include + ${CMAKE_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR}/src) if(MINGW) - target_link_libraries(sdl-renderer mingw32) + target_link_libraries(player-sdl mingw32) endif() - target_link_libraries(sdl-renderer tic80core SDL2-static SDL2main) + target_link_libraries(player-sdl tic80core SDL2-static SDL2main) endif() ################################ @@ -383,29 +378,23 @@ target_include_directories(sokol PRIVATE ${THIRDPARTY_DIR}/sokol) endif() ################################ -# Sokol renderer example +# Sokol standalone cart player ################################ -if(BUILD_SOKOL) -set(SOKOL_SRC - ${EXAMPLE_DIR}/sokol/main.c -) +if(BUILD_PLAYER AND BUILD_SOKOL) -if(WIN32) - add_executable(sokol-renderer WIN32 ${SOKOL_SRC}) -else() - add_executable(sokol-renderer ${SOKOL_SRC}) -endif() + add_executable(player-sokol WIN32 ${CMAKE_SOURCE_DIR}/src/player/sokol.c) -if(MINGW) - target_link_libraries(sokol-renderer mingw32) -endif() + if(MINGW) + target_link_libraries(player-sokol mingw32) + endif() -target_include_directories(sokol-renderer PRIVATE ${CMAKE_SOURCE_DIR}/include) -target_include_directories(sokol-renderer PRIVATE ${THIRDPARTY_DIR}/sokol) -target_include_directories(sokol-renderer PRIVATE ${CMAKE_SOURCE_DIR}/src) + target_include_directories(player-sokol PRIVATE + ${CMAKE_SOURCE_DIR}/include + ${THIRDPARTY_DIR}/sokol + ${CMAKE_SOURCE_DIR}/src) -target_link_libraries(sokol-renderer tic80core sokol) + target_link_libraries(player-sokol tic80core sokol) endif() ################################ @@ -559,7 +548,7 @@ add_library(zlib STATIC ${ZLIB_SRC}) ################################ if(BUILD_DEMO_CARTS) - set(BIN2TXT_DIR ${CMAKE_SOURCE_DIR}/tools/bin2txt) + set(BIN2TXT_DIR ${CMAKE_SOURCE_DIR}/build/tools/bin2txt) set(BIN2TXT_SRC ${BIN2TXT_DIR}/bin2txt.c ) @@ -582,7 +571,7 @@ if(BUILD_DEMO_CARTS) get_filename_component(cart_name ${CART_FILE} NAME) - set(OUTNAME ${CMAKE_SOURCE_DIR}/bin/assets/${cart_name}.dat) + set(OUTNAME ${CMAKE_SOURCE_DIR}/build/assets/${cart_name}.dat) list(APPEND DEMO_CARTS_OUT ${OUTNAME}) diff --git a/bin/.gitignore b/bin/.gitignore deleted file mode 100644 index c76d23a4..00000000 --- a/bin/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -* -!.gitignore -!assets -!assets/* \ No newline at end of file diff --git a/bin/assets/benchmark.tic.dat b/build/assets/benchmark.tic.dat similarity index 100% rename from bin/assets/benchmark.tic.dat rename to build/assets/benchmark.tic.dat diff --git a/bin/assets/config.tic.dat b/build/assets/config.tic.dat similarity index 100% rename from bin/assets/config.tic.dat rename to build/assets/config.tic.dat diff --git a/bin/assets/fenneldemo.tic.dat b/build/assets/fenneldemo.tic.dat similarity index 100% rename from bin/assets/fenneldemo.tic.dat rename to build/assets/fenneldemo.tic.dat diff --git a/bin/assets/fire.tic.dat b/build/assets/fire.tic.dat similarity index 100% rename from bin/assets/fire.tic.dat rename to build/assets/fire.tic.dat diff --git a/bin/assets/font.tic.dat b/build/assets/font.tic.dat similarity index 100% rename from bin/assets/font.tic.dat rename to build/assets/font.tic.dat diff --git a/bin/assets/jsdemo.tic.dat b/build/assets/jsdemo.tic.dat similarity index 100% rename from bin/assets/jsdemo.tic.dat rename to build/assets/jsdemo.tic.dat diff --git a/bin/assets/luademo.tic.dat b/build/assets/luademo.tic.dat similarity index 100% rename from bin/assets/luademo.tic.dat rename to build/assets/luademo.tic.dat diff --git a/bin/assets/moondemo.tic.dat b/build/assets/moondemo.tic.dat similarity index 100% rename from bin/assets/moondemo.tic.dat rename to build/assets/moondemo.tic.dat diff --git a/bin/assets/music.tic.dat b/build/assets/music.tic.dat similarity index 100% rename from bin/assets/music.tic.dat rename to build/assets/music.tic.dat diff --git a/bin/assets/p3d.tic.dat b/build/assets/p3d.tic.dat similarity index 100% rename from bin/assets/p3d.tic.dat rename to build/assets/p3d.tic.dat diff --git a/bin/assets/palette.tic.dat b/build/assets/palette.tic.dat similarity index 100% rename from bin/assets/palette.tic.dat rename to build/assets/palette.tic.dat diff --git a/bin/assets/quest.tic.dat b/build/assets/quest.tic.dat similarity index 100% rename from bin/assets/quest.tic.dat rename to build/assets/quest.tic.dat diff --git a/bin/assets/sfx.tic.dat b/build/assets/sfx.tic.dat similarity index 100% rename from bin/assets/sfx.tic.dat rename to build/assets/sfx.tic.dat diff --git a/bin/assets/squirreldemo.tic.dat b/build/assets/squirreldemo.tic.dat similarity index 100% rename from bin/assets/squirreldemo.tic.dat rename to build/assets/squirreldemo.tic.dat diff --git a/bin/assets/tetris.tic.dat b/build/assets/tetris.tic.dat similarity index 100% rename from bin/assets/tetris.tic.dat rename to build/assets/tetris.tic.dat diff --git a/bin/assets/wrendemo.tic.dat b/build/assets/wrendemo.tic.dat similarity index 100% rename from bin/assets/wrendemo.tic.dat rename to build/assets/wrendemo.tic.dat diff --git a/tools/bin2txt/bin2txt.c b/build/tools/bin2txt/bin2txt.c similarity index 100% rename from tools/bin2txt/bin2txt.c rename to build/tools/bin2txt/bin2txt.c diff --git a/build/uwp/gif/gif.vcxproj b/build/uwp/gif/gif.vcxproj deleted file mode 100644 index 0fe82bac..00000000 --- a/build/uwp/gif/gif.vcxproj +++ /dev/null @@ -1,209 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - - - - {bc1084df-210a-48d6-a077-761d8c16947b} - StaticLibrary - gif - en-US - 14.0 - true - Windows Store - 10.0.14393.0 - 10.0.14393.0 - 10.0 - - - - StaticLibrary - true - v140 - - - StaticLibrary - true - v140 - - - StaticLibrary - true - v140 - - - StaticLibrary - false - true - v140 - - - StaticLibrary - false - true - v140 - - - StaticLibrary - false - true - v140 - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - false - - - false - - - false - - - false - - - false - - - - NotUsing - false - true - _CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) - - - Console - false - false - - - - - NotUsing - false - true - _CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) - - - Console - false - false - - - - - NotUsing - false - true - _CRT_SECURE_NO_WARNINGS;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) - - - Console - false - false - - - - - NotUsing - false - true - _CRT_SECURE_NO_WARNINGS;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) - - - Console - false - false - - - - - NotUsing - false - true - _CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) - - - Console - false - false - - - - - NotUsing - false - true - _CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) - - - Console - false - false - - - - - - diff --git a/build/uwp/gif/gif.vcxproj.filters b/build/uwp/gif/gif.vcxproj.filters deleted file mode 100644 index 97667901..00000000 --- a/build/uwp/gif/gif.vcxproj.filters +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/build/uwp/include/dirent.h b/build/uwp/include/dirent.h deleted file mode 100644 index 47d17fd9..00000000 --- a/build/uwp/include/dirent.h +++ /dev/null @@ -1,950 +0,0 @@ -/* -* Dirent interface for Microsoft Visual Studio -* Version 1.21 -* -* Copyright (C) 2006-2012 Toni Ronkko -* This file is part of dirent. Dirent may be freely distributed -* under the MIT license. For all details and documentation, see -* https://github.com/tronkko/dirent -*/ -#ifndef DIRENT_H -#define DIRENT_H - -/* -* Include windows.h without Windows Sockets 1.1 to prevent conflicts with -* Windows Sockets 2.0. -*/ -#ifndef WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN -#endif -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* Indicates that d_type field is available in dirent structure */ -#define _DIRENT_HAVE_D_TYPE - -/* Indicates that d_namlen field is available in dirent structure */ -#define _DIRENT_HAVE_D_NAMLEN - -/* Entries missing from MSVC 6.0 */ -#if !defined(FILE_ATTRIBUTE_DEVICE) -# define FILE_ATTRIBUTE_DEVICE 0x40 -#endif - -/* File type and permission flags for stat(), general mask */ -#if !defined(S_IFMT) -# define S_IFMT _S_IFMT -#endif - -/* Directory bit */ -#if !defined(S_IFDIR) -# define S_IFDIR _S_IFDIR -#endif - -/* Character device bit */ -#if !defined(S_IFCHR) -# define S_IFCHR _S_IFCHR -#endif - -/* Pipe bit */ -#if !defined(S_IFFIFO) -# define S_IFFIFO _S_IFFIFO -#endif - -/* Regular file bit */ -#if !defined(S_IFREG) -# define S_IFREG _S_IFREG -#endif - -/* Read permission */ -#if !defined(S_IREAD) -# define S_IREAD _S_IREAD -#endif - -/* Write permission */ -#if !defined(S_IWRITE) -# define S_IWRITE _S_IWRITE -#endif - -/* Execute permission */ -#if !defined(S_IEXEC) -# define S_IEXEC _S_IEXEC -#endif - -/* Pipe */ -#if !defined(S_IFIFO) -# define S_IFIFO _S_IFIFO -#endif - -/* Block device */ -#if !defined(S_IFBLK) -# define S_IFBLK 0 -#endif - -/* Link */ -#if !defined(S_IFLNK) -# define S_IFLNK 0 -#endif - -/* Socket */ -#if !defined(S_IFSOCK) -# define S_IFSOCK 0 -#endif - -/* Read user permission */ -#if !defined(S_IRUSR) -# define S_IRUSR S_IREAD -#endif - -/* Write user permission */ -#if !defined(S_IWUSR) -# define S_IWUSR S_IWRITE -#endif - -/* Execute user permission */ -#if !defined(S_IXUSR) -# define S_IXUSR 0 -#endif - -/* Read group permission */ -#if !defined(S_IRGRP) -# define S_IRGRP 0 -#endif - -/* Write group permission */ -#if !defined(S_IWGRP) -# define S_IWGRP 0 -#endif - -/* Execute group permission */ -#if !defined(S_IXGRP) -# define S_IXGRP 0 -#endif - -/* Read others permission */ -#if !defined(S_IROTH) -# define S_IROTH 0 -#endif - -/* Write others permission */ -#if !defined(S_IWOTH) -# define S_IWOTH 0 -#endif - -/* Execute others permission */ -#if !defined(S_IXOTH) -# define S_IXOTH 0 -#endif - -/* Maximum length of file name */ -#if !defined(PATH_MAX) -# define PATH_MAX MAX_PATH -#endif -#if !defined(FILENAME_MAX) -# define FILENAME_MAX MAX_PATH -#endif -#if !defined(NAME_MAX) -# define NAME_MAX FILENAME_MAX -#endif - -/* File type flags for d_type */ -#define DT_UNKNOWN 0 -#define DT_REG S_IFREG -#define DT_DIR S_IFDIR -#define DT_FIFO S_IFIFO -#define DT_SOCK S_IFSOCK -#define DT_CHR S_IFCHR -#define DT_BLK S_IFBLK -#define DT_LNK S_IFLNK - -/* Macros for converting between st_mode and d_type */ -#define IFTODT(mode) ((mode) & S_IFMT) -#define DTTOIF(type) (type) - -/* -* File type macros. Note that block devices, sockets and links cannot be -* distinguished on Windows and the macros S_ISBLK, S_ISSOCK and S_ISLNK are -* only defined for compatibility. These macros should always return false -* on Windows. -*/ -#if !defined(S_ISFIFO) -# define S_ISFIFO(mode) (((mode) & S_IFMT) == S_IFIFO) -#endif -#if !defined(S_ISDIR) -# define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR) -#endif -#if !defined(S_ISREG) -# define S_ISREG(mode) (((mode) & S_IFMT) == S_IFREG) -#endif -#if !defined(S_ISLNK) -# define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK) -#endif -#if !defined(S_ISSOCK) -# define S_ISSOCK(mode) (((mode) & S_IFMT) == S_IFSOCK) -#endif -#if !defined(S_ISCHR) -# define S_ISCHR(mode) (((mode) & S_IFMT) == S_IFCHR) -#endif -#if !defined(S_ISBLK) -# define S_ISBLK(mode) (((mode) & S_IFMT) == S_IFBLK) -#endif - -/* Return the exact length of d_namlen without zero terminator */ -#define _D_EXACT_NAMLEN(p) ((p)->d_namlen) - -/* Return number of bytes needed to store d_namlen */ -#define _D_ALLOC_NAMLEN(p) (PATH_MAX) - - -#ifdef __cplusplus -extern "C" { -#endif - - - /* Wide-character version */ - struct _wdirent { - /* Always zero */ - long d_ino; - - /* Structure size */ - unsigned short d_reclen; - - /* Length of name without \0 */ - size_t d_namlen; - - /* File type */ - int d_type; - - /* File name */ - wchar_t d_name[PATH_MAX]; - }; - typedef struct _wdirent _wdirent; - - struct _WDIR { - /* Current directory entry */ - struct _wdirent ent; - - /* Private file data */ - WIN32_FIND_DATAW data; - - /* True if data is valid */ - int cached; - - /* Win32 search handle */ - HANDLE handle; - - /* Initial directory name */ - wchar_t *patt; - }; - typedef struct _WDIR _WDIR; - - static _WDIR *_wopendir(const wchar_t *dirname); - static struct _wdirent *_wreaddir(_WDIR *dirp); - static int _wclosedir(_WDIR *dirp); - static void _wrewinddir(_WDIR* dirp); - - - /* For compatibility with Symbian */ -#define wdirent _wdirent -#define WDIR _WDIR -#define wopendir _wopendir -#define wreaddir _wreaddir -#define wclosedir _wclosedir -#define wrewinddir _wrewinddir - - - /* Multi-byte character versions */ - struct dirent { - /* Always zero */ - long d_ino; - - /* Structure size */ - unsigned short d_reclen; - - /* Length of name without \0 */ - size_t d_namlen; - - /* File type */ - int d_type; - - /* File name */ - char d_name[PATH_MAX]; - }; - typedef struct dirent dirent; - - struct DIR { - struct dirent ent; - struct _WDIR *wdirp; - }; - typedef struct DIR DIR; - - static DIR *opendir(const char *dirname); - static struct dirent *readdir(DIR *dirp); - static int closedir(DIR *dirp); - static void rewinddir(DIR* dirp); - - - /* Internal utility functions */ - static WIN32_FIND_DATAW *dirent_first(_WDIR *dirp); - static WIN32_FIND_DATAW *dirent_next(_WDIR *dirp); - - static int dirent_mbstowcs_s( - size_t *pReturnValue, - wchar_t *wcstr, - size_t sizeInWords, - const char *mbstr, - size_t count); - - static int dirent_wcstombs_s( - size_t *pReturnValue, - char *mbstr, - size_t sizeInBytes, - const wchar_t *wcstr, - size_t count); - - static void dirent_set_errno(int error); - - /* - * Open directory stream DIRNAME for read and return a pointer to the - * internal working area that is used to retrieve individual directory - * entries. - */ - static _WDIR* - _wopendir( - const wchar_t *dirname) - { - _WDIR *dirp = NULL; - int error; - - /* Must have directory name */ - if (dirname == NULL || dirname[0] == '\0') { - dirent_set_errno(ENOENT); - return NULL; - } - - /* Allocate new _WDIR structure */ - dirp = (_WDIR*)malloc(sizeof(struct _WDIR)); - if (dirp != NULL) { - DWORD n; - - /* Reset _WDIR structure */ - dirp->handle = INVALID_HANDLE_VALUE; - dirp->patt = NULL; - dirp->cached = 0; - - /* Compute the length of full path plus zero terminator - * - * Note that on WinRT there's no way to convert relative paths - * into absolute paths, so just assume its an absolute path. - */ -# if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP) - n = wcslen(dirname); -# else - n = GetFullPathNameW(dirname, 0, NULL, NULL); -# endif - - /* Allocate room for absolute directory name and search pattern */ - dirp->patt = (wchar_t*)malloc(sizeof(wchar_t) * n + 16); - if (dirp->patt) { - - /* - * Convert relative directory name to an absolute one. This - * allows rewinddir() to function correctly even when current - * working directory is changed between opendir() and rewinddir(). - * - * Note that on WinRT there's no way to convert relative paths - * into absolute paths, so just assume its an absolute path. - */ -# if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP) - wcsncpy_s(dirp->patt, n + 1, dirname, n); -# else - n = GetFullPathNameW(dirname, n, dirp->patt, NULL); -# endif - if (n > 0) { - wchar_t *p; - - /* Append search pattern \* to the directory name */ - p = dirp->patt + n; - if (dirp->patt < p) { - switch (p[-1]) { - case '\\': - case '/': - case ':': - /* Directory ends in path separator, e.g. c:\temp\ */ - /*NOP*/; - break; - - default: - /* Directory name doesn't end in path separator */ - *p++ = '\\'; - } - } - *p++ = '*'; - *p = '\0'; - - /* Open directory stream and retrieve the first entry */ - if (dirent_first(dirp)) { - /* Directory stream opened successfully */ - error = 0; - } - else { - /* Cannot retrieve first entry */ - error = 1; - dirent_set_errno(ENOENT); - } - - } - else { - /* Cannot retrieve full path name */ - dirent_set_errno(ENOENT); - error = 1; - } - - } - else { - /* Cannot allocate memory for search pattern */ - error = 1; - } - - } - else { - /* Cannot allocate _WDIR structure */ - error = 1; - } - - /* Clean up in case of error */ - if (error && dirp) { - _wclosedir(dirp); - dirp = NULL; - } - - return dirp; - } - - /* - * Read next directory entry. The directory entry is returned in dirent - * structure in the d_name field. Individual directory entries returned by - * this function include regular files, sub-directories, pseudo-directories - * "." and ".." as well as volume labels, hidden files and system files. - */ - static struct _wdirent* - _wreaddir( - _WDIR *dirp) - { - WIN32_FIND_DATAW *datap; - struct _wdirent *entp; - - /* Read next directory entry */ - datap = dirent_next(dirp); - if (datap) { - size_t n; - DWORD attr; - - /* Pointer to directory entry to return */ - entp = &dirp->ent; - - /* - * Copy file name as wide-character string. If the file name is too - * long to fit in to the destination buffer, then truncate file name - * to PATH_MAX characters and zero-terminate the buffer. - */ - n = 0; - while (n + 1 < PATH_MAX && datap->cFileName[n] != 0) { - entp->d_name[n] = datap->cFileName[n]; - n++; - } - dirp->ent.d_name[n] = 0; - - /* Length of file name excluding zero terminator */ - entp->d_namlen = n; - - /* File type */ - attr = datap->dwFileAttributes; - if ((attr & FILE_ATTRIBUTE_DEVICE) != 0) { - entp->d_type = DT_CHR; - } - else if ((attr & FILE_ATTRIBUTE_DIRECTORY) != 0) { - entp->d_type = DT_DIR; - } - else { - entp->d_type = DT_REG; - } - - /* Reset dummy fields */ - entp->d_ino = 0; - entp->d_reclen = sizeof(struct _wdirent); - - } - else { - - /* Last directory entry read */ - entp = NULL; - - } - - return entp; - } - - /* - * Close directory stream opened by opendir() function. This invalidates the - * DIR structure as well as any directory entry read previously by - * _wreaddir(). - */ - static int - _wclosedir( - _WDIR *dirp) - { - int ok; - if (dirp) { - - /* Release search handle */ - if (dirp->handle != INVALID_HANDLE_VALUE) { - FindClose(dirp->handle); - dirp->handle = INVALID_HANDLE_VALUE; - } - - /* Release search pattern */ - if (dirp->patt) { - free(dirp->patt); - dirp->patt = NULL; - } - - /* Release directory structure */ - free(dirp); - ok = /*success*/0; - - } - else { - /* Invalid directory stream */ - dirent_set_errno(EBADF); - ok = /*failure*/-1; - } - return ok; - } - - /* - * Rewind directory stream such that _wreaddir() returns the very first - * file name again. - */ - static void - _wrewinddir( - _WDIR* dirp) - { - if (dirp) { - /* Release existing search handle */ - if (dirp->handle != INVALID_HANDLE_VALUE) { - FindClose(dirp->handle); - } - - /* Open new search handle */ - dirent_first(dirp); - } - } - - /* Get first directory entry (internal) */ - static WIN32_FIND_DATAW* - dirent_first( - _WDIR *dirp) - { - WIN32_FIND_DATAW *datap; - - /* Open directory and retrieve the first entry */ - dirp->handle = FindFirstFileExW( - dirp->patt, FindExInfoStandard, &dirp->data, - FindExSearchNameMatch, NULL, 0); - if (dirp->handle != INVALID_HANDLE_VALUE) { - - /* a directory entry is now waiting in memory */ - datap = &dirp->data; - dirp->cached = 1; - - } - else { - - /* Failed to re-open directory: no directory entry in memory */ - dirp->cached = 0; - datap = NULL; - - } - return datap; - } - - /* Get next directory entry (internal) */ - static WIN32_FIND_DATAW* - dirent_next( - _WDIR *dirp) - { - WIN32_FIND_DATAW *p; - - /* Get next directory entry */ - if (dirp->cached != 0) { - - /* A valid directory entry already in memory */ - p = &dirp->data; - dirp->cached = 0; - - } - else if (dirp->handle != INVALID_HANDLE_VALUE) { - - /* Get the next directory entry from stream */ - if (FindNextFileW(dirp->handle, &dirp->data) != FALSE) { - /* Got a file */ - p = &dirp->data; - } - else { - /* The very last entry has been processed or an error occured */ - FindClose(dirp->handle); - dirp->handle = INVALID_HANDLE_VALUE; - p = NULL; - } - - } - else { - - /* End of directory stream reached */ - p = NULL; - - } - - return p; - } - - /* - * Open directory stream using plain old C-string. - */ - static DIR* - opendir( - const char *dirname) - { - struct DIR *dirp; - int error; - - /* Must have directory name */ - if (dirname == NULL || dirname[0] == '\0') { - dirent_set_errno(ENOENT); - return NULL; - } - - /* Allocate memory for DIR structure */ - dirp = (DIR*)malloc(sizeof(struct DIR)); - if (dirp) { - wchar_t wname[PATH_MAX]; - size_t n; - - /* Convert directory name to wide-character string */ - error = dirent_mbstowcs_s(&n, wname, PATH_MAX, dirname, PATH_MAX); - if (!error) { - - /* Open directory stream using wide-character name */ - dirp->wdirp = _wopendir(wname); - if (dirp->wdirp) { - /* Directory stream opened */ - error = 0; - } - else { - /* Failed to open directory stream */ - error = 1; - } - - } - else { - /* - * Cannot convert file name to wide-character string. This - * occurs if the string contains invalid multi-byte sequences or - * the output buffer is too small to contain the resulting - * string. - */ - error = 1; - } - - } - else { - /* Cannot allocate DIR structure */ - error = 1; - } - - /* Clean up in case of error */ - if (error && dirp) { - free(dirp); - dirp = NULL; - } - - return dirp; - } - - /* - * Read next directory entry. - * - * When working with text consoles, please note that file names returned by - * readdir() are represented in the default ANSI code page while any output to - * console is typically formatted on another code page. Thus, non-ASCII - * characters in file names will not usually display correctly on console. The - * problem can be fixed in two ways: (1) change the character set of console - * to 1252 using chcp utility and use Lucida Console font, or (2) use - * _cprintf function when writing to console. The _cprinf() will re-encode - * ANSI strings to the console code page so many non-ASCII characters will - * display correcly. - */ - static struct dirent* - readdir( - DIR *dirp) - { - WIN32_FIND_DATAW *datap; - struct dirent *entp; - - /* Read next directory entry */ - datap = dirent_next(dirp->wdirp); - if (datap) { - size_t n; - int error; - - /* Attempt to convert file name to multi-byte string */ - error = dirent_wcstombs_s( - &n, dirp->ent.d_name, PATH_MAX, datap->cFileName, PATH_MAX); - - /* - * If the file name cannot be represented by a multi-byte string, - * then attempt to use old 8+3 file name. This allows traditional - * Unix-code to access some file names despite of unicode - * characters, although file names may seem unfamiliar to the user. - * - * Be ware that the code below cannot come up with a short file - * name unless the file system provides one. At least - * VirtualBox shared folders fail to do this. - */ - if (error && datap->cAlternateFileName[0] != '\0') { - error = dirent_wcstombs_s( - &n, dirp->ent.d_name, PATH_MAX, - datap->cAlternateFileName, PATH_MAX); - } - - if (!error) { - DWORD attr; - - /* Initialize directory entry for return */ - entp = &dirp->ent; - - /* Length of file name excluding zero terminator */ - entp->d_namlen = n - 1; - - /* File attributes */ - attr = datap->dwFileAttributes; - if ((attr & FILE_ATTRIBUTE_DEVICE) != 0) { - entp->d_type = DT_CHR; - } - else if ((attr & FILE_ATTRIBUTE_DIRECTORY) != 0) { - entp->d_type = DT_DIR; - } - else { - entp->d_type = DT_REG; - } - - /* Reset dummy fields */ - entp->d_ino = 0; - entp->d_reclen = sizeof(struct dirent); - - } - else { - /* - * Cannot convert file name to multi-byte string so construct - * an errornous directory entry and return that. Note that - * we cannot return NULL as that would stop the processing - * of directory entries completely. - */ - entp = &dirp->ent; - entp->d_name[0] = '?'; - entp->d_name[1] = '\0'; - entp->d_namlen = 1; - entp->d_type = DT_UNKNOWN; - entp->d_ino = 0; - entp->d_reclen = 0; - } - - } - else { - /* No more directory entries */ - entp = NULL; - } - - return entp; - } - - /* - * Close directory stream. - */ - static int - closedir( - DIR *dirp) - { - int ok; - if (dirp) { - - /* Close wide-character directory stream */ - ok = _wclosedir(dirp->wdirp); - dirp->wdirp = NULL; - - /* Release multi-byte character version */ - free(dirp); - - } - else { - - /* Invalid directory stream */ - dirent_set_errno(EBADF); - ok = /*failure*/-1; - - } - return ok; - } - - /* - * Rewind directory stream to beginning. - */ - static void - rewinddir( - DIR* dirp) - { - /* Rewind wide-character string directory stream */ - _wrewinddir(dirp->wdirp); - } - - /* Convert multi-byte string to wide character string */ - static int - dirent_mbstowcs_s( - size_t *pReturnValue, - wchar_t *wcstr, - size_t sizeInWords, - const char *mbstr, - size_t count) - { - int error; - -#if defined(_MSC_VER) && _MSC_VER >= 1400 - - /* Microsoft Visual Studio 2005 or later */ - error = mbstowcs_s(pReturnValue, wcstr, sizeInWords, mbstr, count); - -#else - - /* Older Visual Studio or non-Microsoft compiler */ - size_t n; - - /* Convert to wide-character string (or count characters) */ - n = mbstowcs(wcstr, mbstr, sizeInWords); - if (!wcstr || n < count) { - - /* Zero-terminate output buffer */ - if (wcstr && sizeInWords) { - if (n >= sizeInWords) { - n = sizeInWords - 1; - } - wcstr[n] = 0; - } - - /* Length of resuting multi-byte string WITH zero terminator */ - if (pReturnValue) { - *pReturnValue = n + 1; - } - - /* Success */ - error = 0; - - } - else { - - /* Could not convert string */ - error = 1; - - } - -#endif - - return error; - } - - /* Convert wide-character string to multi-byte string */ - static int - dirent_wcstombs_s( - size_t *pReturnValue, - char *mbstr, - size_t sizeInBytes, /* max size of mbstr */ - const wchar_t *wcstr, - size_t count) - { - int error; - -#if defined(_MSC_VER) && _MSC_VER >= 1400 - - /* Microsoft Visual Studio 2005 or later */ - error = wcstombs_s(pReturnValue, mbstr, sizeInBytes, wcstr, count); - -#else - - /* Older Visual Studio or non-Microsoft compiler */ - size_t n; - - /* Convert to multi-byte string (or count the number of bytes needed) */ - n = wcstombs(mbstr, wcstr, sizeInBytes); - if (!mbstr || n < count) { - - /* Zero-terminate output buffer */ - if (mbstr && sizeInBytes) { - if (n >= sizeInBytes) { - n = sizeInBytes - 1; - } - mbstr[n] = '\0'; - } - - /* Length of resulting multi-bytes string WITH zero-terminator */ - if (pReturnValue) { - *pReturnValue = n + 1; - } - - /* Success */ - error = 0; - - } - else { - - /* Cannot convert string */ - error = 1; - - } - -#endif - - return error; - } - - /* Set errno variable */ - static void - dirent_set_errno( - int error) - { -#if defined(_MSC_VER) && _MSC_VER >= 1400 - - /* Microsoft Visual Studio 2005 and later */ - _set_errno(error); - -#else - - /* Non-Microsoft compiler or older Microsoft compiler */ - errno = error; - -#endif - } - - -#ifdef __cplusplus -} -#endif -#endif /*DIRENT_H*/ diff --git a/build/uwp/lua/lua.vcxproj b/build/uwp/lua/lua.vcxproj deleted file mode 100644 index 664e0874..00000000 --- a/build/uwp/lua/lua.vcxproj +++ /dev/null @@ -1,248 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {53802f21-41da-4ac1-8b62-0dac2ccb8af8} - StaticLibrary - lua - en-US - 14.0 - true - Windows Store - 10.0.14393.0 - 10.0.14393.0 - 10.0 - - - - StaticLibrary - true - v140 - - - StaticLibrary - true - v140 - - - StaticLibrary - true - v140 - - - StaticLibrary - false - true - v140 - - - StaticLibrary - false - true - v140 - - - StaticLibrary - false - true - v140 - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - false - - - false - - - false - - - false - - - false - - - - NotUsing - false - true - LUA_COMPAT_5_2;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ..\..\..\include\lua;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - 4244;4267 - - - Console - false - false - - - - - NotUsing - false - true - LUA_COMPAT_5_2;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ..\..\..\include\lua;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - 4244;4267 - - - Console - false - false - - - - - NotUsing - false - true - LUA_COMPAT_5_2;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) - ..\..\..\include\lua;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - 4244;4267 - - - Console - false - false - - - - - NotUsing - false - true - LUA_COMPAT_5_2;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) - ..\..\..\include\lua;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - 4244;4267 - - - Console - false - false - - - - - NotUsing - false - true - LUA_COMPAT_5_2;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ..\..\..\include\lua;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - 4244;4267 - - - Console - false - false - - - - - NotUsing - false - true - LUA_COMPAT_5_2;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ..\..\..\include\lua;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - 4244;4267 - - - Console - false - false - - - - - - diff --git a/build/uwp/lua/lua.vcxproj.filters b/build/uwp/lua/lua.vcxproj.filters deleted file mode 100644 index d97176e0..00000000 --- a/build/uwp/lua/lua.vcxproj.filters +++ /dev/null @@ -1,125 +0,0 @@ - - - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tga;tiff;tif;png;wav;mfcribbon-ms - - - {f1922cfd-595d-4973-b7d1-2dfcc365256f} - - - {69e69bed-ec9a-42f1-a359-fa3fff9e70d8} - - - {3d301d9e-c295-4dc6-b19f-bdb40f8cfe85} - - - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua - - - lua\lib - - - lua\lib - - - lua\lib - - - lua\lib - - - lua\lib - - - lua\lib - - - lua\lib - - - lua\lib - - - lua\lib - - - lpeg - - - lpeg - - - lpeg - - - lpeg - - - lpeg - - - \ No newline at end of file diff --git a/build/uwp/sdl-gpu-static/sdl-gpu-static.vcxproj b/build/uwp/sdl-gpu-static/sdl-gpu-static.vcxproj deleted file mode 100644 index a2bf10d3..00000000 --- a/build/uwp/sdl-gpu-static/sdl-gpu-static.vcxproj +++ /dev/null @@ -1,220 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - - {361dfddb-f86e-4c2c-abee-03acf4b8ac33} - StaticLibrary - sdl_gpu_static - en-US - 14.0 - true - Windows Store - 10.0.14393.0 - 10.0.14393.0 - 10.0 - - - - StaticLibrary - true - v140 - - - StaticLibrary - true - v140 - - - StaticLibrary - true - v140 - - - StaticLibrary - false - true - v140 - - - StaticLibrary - false - true - v140 - - - StaticLibrary - false - true - v140 - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - false - - - false - - - false - - - false - - - false - - - - NotUsing - false - false - ..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\3rd-party\sdl-gpu\include;..\..\..\3rd-party\sdl-gpu\src;..\..\..\3rd-party\sdl-gpu\src\externals\glew;..\..\..\3rd-party\sdl-gpu\src\externals\glew\GL;..\..\..\3rd-party\sdl-gpu\src\externals\stb_image;..\..\..\3rd-party\sdl-gpu\src\externals\stb_image_write;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - SDL_GPU_DISABLE_GLES_1;SDL_GPU_DISABLE_GLES_3;SDL_GPU_DISABLE_OPENGL;GL_GLEXT_PROTOTYPES;%(PreprocessorDefinitions) - - - Console - false - false - - - - - NotUsing - false - false - ..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\3rd-party\sdl-gpu\include;..\..\..\3rd-party\sdl-gpu\src;..\..\..\3rd-party\sdl-gpu\src\externals\glew;..\..\..\3rd-party\sdl-gpu\src\externals\glew\GL;..\..\..\3rd-party\sdl-gpu\src\externals\stb_image;..\..\..\3rd-party\sdl-gpu\src\externals\stb_image_write;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - SDL_GPU_DISABLE_GLES_1;SDL_GPU_DISABLE_GLES_3;SDL_GPU_DISABLE_OPENGL;GL_GLEXT_PROTOTYPES;%(PreprocessorDefinitions) - - - Console - false - false - - - - - NotUsing - false - false - ..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\3rd-party\sdl-gpu\include;..\..\..\3rd-party\sdl-gpu\src;..\..\..\3rd-party\sdl-gpu\src\externals\glew;..\..\..\3rd-party\sdl-gpu\src\externals\glew\GL;..\..\..\3rd-party\sdl-gpu\src\externals\stb_image;..\..\..\3rd-party\sdl-gpu\src\externals\stb_image_write;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - SDL_GPU_DISABLE_GLES_1;SDL_GPU_DISABLE_GLES_3;SDL_GPU_DISABLE_OPENGL;GL_GLEXT_PROTOTYPES;%(PreprocessorDefinitions) - - - Console - false - false - - - - - NotUsing - false - false - ..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\3rd-party\sdl-gpu\include;..\..\..\3rd-party\sdl-gpu\src;..\..\..\3rd-party\sdl-gpu\src\externals\glew;..\..\..\3rd-party\sdl-gpu\src\externals\glew\GL;..\..\..\3rd-party\sdl-gpu\src\externals\stb_image;..\..\..\3rd-party\sdl-gpu\src\externals\stb_image_write;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - SDL_GPU_DISABLE_GLES_1;SDL_GPU_DISABLE_GLES_3;SDL_GPU_DISABLE_OPENGL;GL_GLEXT_PROTOTYPES;%(PreprocessorDefinitions) - - - Console - false - false - - - - - NotUsing - false - false - ..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\3rd-party\sdl-gpu\include;..\..\..\3rd-party\sdl-gpu\src;..\..\..\3rd-party\sdl-gpu\src\externals\glew;..\..\..\3rd-party\sdl-gpu\src\externals\glew\GL;..\..\..\3rd-party\sdl-gpu\src\externals\stb_image;..\..\..\3rd-party\sdl-gpu\src\externals\stb_image_write;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - SDL_GPU_DISABLE_GLES_1;SDL_GPU_DISABLE_GLES_3;SDL_GPU_DISABLE_OPENGL;GL_GLEXT_PROTOTYPES;%(PreprocessorDefinitions) - - - Console - false - false - - - - - NotUsing - false - false - ..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\3rd-party\sdl-gpu\include;..\..\..\3rd-party\sdl-gpu\src;..\..\..\3rd-party\sdl-gpu\src\externals\glew;..\..\..\3rd-party\sdl-gpu\src\externals\glew\GL;..\..\..\3rd-party\sdl-gpu\src\externals\stb_image;..\..\..\3rd-party\sdl-gpu\src\externals\stb_image_write;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - SDL_GPU_DISABLE_GLES_1;SDL_GPU_DISABLE_GLES_3;SDL_GPU_DISABLE_OPENGL;GL_GLEXT_PROTOTYPES;%(PreprocessorDefinitions) - - - Console - false - false - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/build/uwp/sdl-gpu-static/sdl-gpu-static.vcxproj.filters b/build/uwp/sdl-gpu-static/sdl-gpu-static.vcxproj.filters deleted file mode 100644 index 8d95540c..00000000 --- a/build/uwp/sdl-gpu-static/sdl-gpu-static.vcxproj.filters +++ /dev/null @@ -1,28 +0,0 @@ - - - - - {c3550c01-2588-4878-8d79-ead29ff8053e} - - - - - src - - - src - - - src - - - src - - - src - - - src - - - \ No newline at end of file diff --git a/build/uwp/store/0.png b/build/uwp/store/0.png deleted file mode 100644 index 6fe7cddb..00000000 Binary files a/build/uwp/store/0.png and /dev/null differ diff --git a/build/uwp/store/1.png b/build/uwp/store/1.png deleted file mode 100644 index 1b2a132e..00000000 Binary files a/build/uwp/store/1.png and /dev/null differ diff --git a/build/uwp/store/2.png b/build/uwp/store/2.png deleted file mode 100644 index cbe8e79d..00000000 Binary files a/build/uwp/store/2.png and /dev/null differ diff --git a/build/uwp/store/3.png b/build/uwp/store/3.png deleted file mode 100644 index 702bf943..00000000 Binary files a/build/uwp/store/3.png and /dev/null differ diff --git a/build/uwp/studio/studio.vcxproj b/build/uwp/studio/studio.vcxproj deleted file mode 100644 index 16f7ed1d..00000000 --- a/build/uwp/studio/studio.vcxproj +++ /dev/null @@ -1,247 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - {978f53db-f959-4cb4-84a7-463af29949be} - - - {bc1084df-210a-48d6-a077-761d8c16947b} - - - {53802f21-41da-4ac1-8b62-0dac2ccb8af8} - - - {9c39acf1-5f52-4a2b-a467-9f2805d6174b} - - - - {6a22403a-6cf5-49f2-a012-ec04c9496306} - DynamicLibrary - studio - en-US - 14.0 - true - Windows Store - 10.0.14393.0 - 10.0.14393.0 - 10.0 - - - - DynamicLibrary - true - v140 - - - DynamicLibrary - true - v140 - - - DynamicLibrary - true - v140 - - - DynamicLibrary - false - true - v140 - - - DynamicLibrary - false - true - v140 - - - DynamicLibrary - false - true - v140 - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - false - - - false - false - - - false - false - - - false - false - - - false - false - - - false - false - - - - NotUsing - false - TIC80_SHARED;_WINDLL;%(PreprocessorDefinitions) - ..\include;..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\zlib-1.2.8;$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - false - - - Console - false - false - - - - - NotUsing - false - TIC80_SHARED;_WINDLL;%(PreprocessorDefinitions) - ..\include;..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\zlib-1.2.8;$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - false - - - Console - false - false - - - - - NotUsing - false - TIC80_SHARED;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) - ..\include;..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\zlib-1.2.8;$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - false - - - Console - false - false - - - - - NotUsing - false - TIC80_SHARED;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) - ..\include;..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\zlib-1.2.8;$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - false - - - Console - false - false - - - - - NotUsing - false - TIC80_SHARED;_WINDLL;%(PreprocessorDefinitions) - ..\include;..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\zlib-1.2.8;$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - false - - - Console - false - false - - - - - NotUsing - false - TIC80_SHARED;_WINDLL;%(PreprocessorDefinitions) - ..\include;..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\zlib-1.2.8;$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - false - - - Console - false - false - - - - - - \ No newline at end of file diff --git a/build/uwp/studio/studio.vcxproj.filters b/build/uwp/studio/studio.vcxproj.filters deleted file mode 100644 index 8e69249b..00000000 --- a/build/uwp/studio/studio.vcxproj.filters +++ /dev/null @@ -1,73 +0,0 @@ - - - - - {fd391d6f-58f5-4aba-a1f1-41bf34081296} - - - {cf22f775-8c8b-4047-a23c-fa216fa3b08f} - - - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src\ext - - - src\ext - - - \ No newline at end of file diff --git a/build/uwp/tic/Assets/LockScreenLogo.scale-200.png b/build/uwp/tic/Assets/LockScreenLogo.scale-200.png deleted file mode 100644 index 8494252f..00000000 Binary files a/build/uwp/tic/Assets/LockScreenLogo.scale-200.png and /dev/null differ diff --git a/build/uwp/tic/Assets/SplashScreen.scale-200.png b/build/uwp/tic/Assets/SplashScreen.scale-200.png deleted file mode 100644 index d64f5b10..00000000 Binary files a/build/uwp/tic/Assets/SplashScreen.scale-200.png and /dev/null differ diff --git a/build/uwp/tic/Assets/Square150x150Logo.scale-200.png b/build/uwp/tic/Assets/Square150x150Logo.scale-200.png deleted file mode 100644 index acc6f6f9..00000000 Binary files a/build/uwp/tic/Assets/Square150x150Logo.scale-200.png and /dev/null differ diff --git a/build/uwp/tic/Assets/Square44x44Logo.scale-200.png b/build/uwp/tic/Assets/Square44x44Logo.scale-200.png deleted file mode 100644 index 77862f06..00000000 Binary files a/build/uwp/tic/Assets/Square44x44Logo.scale-200.png and /dev/null differ diff --git a/build/uwp/tic/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/build/uwp/tic/Assets/Square44x44Logo.targetsize-24_altform-unplated.png deleted file mode 100644 index f4f504f6..00000000 Binary files a/build/uwp/tic/Assets/Square44x44Logo.targetsize-24_altform-unplated.png and /dev/null differ diff --git a/build/uwp/tic/Assets/StoreLogo.png b/build/uwp/tic/Assets/StoreLogo.png deleted file mode 100644 index 7f4f595d..00000000 Binary files a/build/uwp/tic/Assets/StoreLogo.png and /dev/null differ diff --git a/build/uwp/tic/Assets/Wide310x150Logo.scale-200.png b/build/uwp/tic/Assets/Wide310x150Logo.scale-200.png deleted file mode 100644 index bf38e66d..00000000 Binary files a/build/uwp/tic/Assets/Wide310x150Logo.scale-200.png and /dev/null differ diff --git a/build/uwp/tic/Package.appxmanifest b/build/uwp/tic/Package.appxmanifest deleted file mode 100644 index f5fddbfc..00000000 --- a/build/uwp/tic/Package.appxmanifest +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - TIC-80 - Nesbox - Assets\StoreLogo.png - - - - - - - - - - - - - - - - - - - - diff --git a/build/uwp/tic/packages.config b/build/uwp/tic/packages.config deleted file mode 100644 index 70c3dea0..00000000 --- a/build/uwp/tic/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/build/uwp/tic/tic.sln b/build/uwp/tic/tic.sln deleted file mode 100644 index 924a807e..00000000 --- a/build/uwp/tic/tic.sln +++ /dev/null @@ -1,152 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tic", "tic.vcxproj", "{7F895641-6C8F-4481-BD81-57785A4BEB09}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "..\lua\lua.vcxproj", "{53802F21-41DA-4AC1-8B62-0DAC2CCB8AF8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gif", "..\gif\gif.vcxproj", "{BC1084DF-210A-48D6-A077-761D8C16947B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tic80", "..\tic80\tic80.vcxproj", "{9C39ACF1-5F52-4A2B-A467-9F2805D6174B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2-UWP", "..\..\..\3rd-party\SDL2-2.0.7\VisualC-WinRT\UWP_VS2015\SDL-UWP.vcxproj", "{89E9B32E-A86A-47C3-A948-D2B1622925CE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib-uwp", "..\..\..\3rd-party\zlib-1.2.8\winrt\zlib-uwp\zlib-uwp.vcxproj", "{978F53DB-F959-4CB4-84A7-463AF29949BE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wren", "..\wren\wren.vcxproj", "{BBB0D01A-B124-416C-BE26-E6993154A555}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "studio", "..\studio\studio.vcxproj", "{6A22403A-6CF5-49F2-A012-EC04C9496306}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdl-gpu-static", "..\sdl-gpu-static\sdl-gpu-static.vcxproj", "{361DFDDB-F86E-4C2C-ABEE-03ACF4B8AC33}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|ARM = Release|ARM - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7F895641-6C8F-4481-BD81-57785A4BEB09}.Debug|ARM.ActiveCfg = Debug|ARM - {7F895641-6C8F-4481-BD81-57785A4BEB09}.Debug|ARM.Build.0 = Debug|ARM - {7F895641-6C8F-4481-BD81-57785A4BEB09}.Debug|ARM.Deploy.0 = Debug|ARM - {7F895641-6C8F-4481-BD81-57785A4BEB09}.Debug|x64.ActiveCfg = Debug|x64 - {7F895641-6C8F-4481-BD81-57785A4BEB09}.Debug|x64.Build.0 = Debug|x64 - {7F895641-6C8F-4481-BD81-57785A4BEB09}.Debug|x64.Deploy.0 = Debug|x64 - {7F895641-6C8F-4481-BD81-57785A4BEB09}.Debug|x86.ActiveCfg = Debug|Win32 - {7F895641-6C8F-4481-BD81-57785A4BEB09}.Debug|x86.Build.0 = Debug|Win32 - {7F895641-6C8F-4481-BD81-57785A4BEB09}.Debug|x86.Deploy.0 = Debug|Win32 - {7F895641-6C8F-4481-BD81-57785A4BEB09}.Release|ARM.ActiveCfg = Release|ARM - {7F895641-6C8F-4481-BD81-57785A4BEB09}.Release|ARM.Build.0 = Release|ARM - {7F895641-6C8F-4481-BD81-57785A4BEB09}.Release|ARM.Deploy.0 = Release|ARM - {7F895641-6C8F-4481-BD81-57785A4BEB09}.Release|x64.ActiveCfg = Release|x64 - {7F895641-6C8F-4481-BD81-57785A4BEB09}.Release|x64.Build.0 = Release|x64 - {7F895641-6C8F-4481-BD81-57785A4BEB09}.Release|x64.Deploy.0 = Release|x64 - {7F895641-6C8F-4481-BD81-57785A4BEB09}.Release|x86.ActiveCfg = Release|Win32 - {7F895641-6C8F-4481-BD81-57785A4BEB09}.Release|x86.Build.0 = Release|Win32 - {7F895641-6C8F-4481-BD81-57785A4BEB09}.Release|x86.Deploy.0 = Release|Win32 - {53802F21-41DA-4AC1-8B62-0DAC2CCB8AF8}.Debug|ARM.ActiveCfg = Debug|ARM - {53802F21-41DA-4AC1-8B62-0DAC2CCB8AF8}.Debug|ARM.Build.0 = Debug|ARM - {53802F21-41DA-4AC1-8B62-0DAC2CCB8AF8}.Debug|x64.ActiveCfg = Debug|x64 - {53802F21-41DA-4AC1-8B62-0DAC2CCB8AF8}.Debug|x64.Build.0 = Debug|x64 - {53802F21-41DA-4AC1-8B62-0DAC2CCB8AF8}.Debug|x86.ActiveCfg = Debug|Win32 - {53802F21-41DA-4AC1-8B62-0DAC2CCB8AF8}.Debug|x86.Build.0 = Debug|Win32 - {53802F21-41DA-4AC1-8B62-0DAC2CCB8AF8}.Release|ARM.ActiveCfg = Release|ARM - {53802F21-41DA-4AC1-8B62-0DAC2CCB8AF8}.Release|ARM.Build.0 = Release|ARM - {53802F21-41DA-4AC1-8B62-0DAC2CCB8AF8}.Release|x64.ActiveCfg = Release|x64 - {53802F21-41DA-4AC1-8B62-0DAC2CCB8AF8}.Release|x64.Build.0 = Release|x64 - {53802F21-41DA-4AC1-8B62-0DAC2CCB8AF8}.Release|x86.ActiveCfg = Release|Win32 - {53802F21-41DA-4AC1-8B62-0DAC2CCB8AF8}.Release|x86.Build.0 = Release|Win32 - {BC1084DF-210A-48D6-A077-761D8C16947B}.Debug|ARM.ActiveCfg = Debug|ARM - {BC1084DF-210A-48D6-A077-761D8C16947B}.Debug|ARM.Build.0 = Debug|ARM - {BC1084DF-210A-48D6-A077-761D8C16947B}.Debug|x64.ActiveCfg = Debug|x64 - {BC1084DF-210A-48D6-A077-761D8C16947B}.Debug|x64.Build.0 = Debug|x64 - {BC1084DF-210A-48D6-A077-761D8C16947B}.Debug|x86.ActiveCfg = Debug|Win32 - {BC1084DF-210A-48D6-A077-761D8C16947B}.Debug|x86.Build.0 = Debug|Win32 - {BC1084DF-210A-48D6-A077-761D8C16947B}.Release|ARM.ActiveCfg = Release|ARM - {BC1084DF-210A-48D6-A077-761D8C16947B}.Release|ARM.Build.0 = Release|ARM - {BC1084DF-210A-48D6-A077-761D8C16947B}.Release|x64.ActiveCfg = Release|x64 - {BC1084DF-210A-48D6-A077-761D8C16947B}.Release|x64.Build.0 = Release|x64 - {BC1084DF-210A-48D6-A077-761D8C16947B}.Release|x86.ActiveCfg = Release|Win32 - {BC1084DF-210A-48D6-A077-761D8C16947B}.Release|x86.Build.0 = Release|Win32 - {9C39ACF1-5F52-4A2B-A467-9F2805D6174B}.Debug|ARM.ActiveCfg = Debug|ARM - {9C39ACF1-5F52-4A2B-A467-9F2805D6174B}.Debug|ARM.Build.0 = Debug|ARM - {9C39ACF1-5F52-4A2B-A467-9F2805D6174B}.Debug|x64.ActiveCfg = Debug|x64 - {9C39ACF1-5F52-4A2B-A467-9F2805D6174B}.Debug|x64.Build.0 = Debug|x64 - {9C39ACF1-5F52-4A2B-A467-9F2805D6174B}.Debug|x86.ActiveCfg = Debug|Win32 - {9C39ACF1-5F52-4A2B-A467-9F2805D6174B}.Debug|x86.Build.0 = Debug|Win32 - {9C39ACF1-5F52-4A2B-A467-9F2805D6174B}.Release|ARM.ActiveCfg = Release|ARM - {9C39ACF1-5F52-4A2B-A467-9F2805D6174B}.Release|ARM.Build.0 = Release|ARM - {9C39ACF1-5F52-4A2B-A467-9F2805D6174B}.Release|x64.ActiveCfg = Release|x64 - {9C39ACF1-5F52-4A2B-A467-9F2805D6174B}.Release|x64.Build.0 = Release|x64 - {9C39ACF1-5F52-4A2B-A467-9F2805D6174B}.Release|x86.ActiveCfg = Release|Win32 - {9C39ACF1-5F52-4A2B-A467-9F2805D6174B}.Release|x86.Build.0 = Release|Win32 - {89E9B32E-A86A-47C3-A948-D2B1622925CE}.Debug|ARM.ActiveCfg = Debug|ARM - {89E9B32E-A86A-47C3-A948-D2B1622925CE}.Debug|ARM.Build.0 = Debug|ARM - {89E9B32E-A86A-47C3-A948-D2B1622925CE}.Debug|x64.ActiveCfg = Debug|x64 - {89E9B32E-A86A-47C3-A948-D2B1622925CE}.Debug|x64.Build.0 = Debug|x64 - {89E9B32E-A86A-47C3-A948-D2B1622925CE}.Debug|x86.ActiveCfg = Debug|Win32 - {89E9B32E-A86A-47C3-A948-D2B1622925CE}.Debug|x86.Build.0 = Debug|Win32 - {89E9B32E-A86A-47C3-A948-D2B1622925CE}.Release|ARM.ActiveCfg = Release|ARM - {89E9B32E-A86A-47C3-A948-D2B1622925CE}.Release|ARM.Build.0 = Release|ARM - {89E9B32E-A86A-47C3-A948-D2B1622925CE}.Release|x64.ActiveCfg = Release|x64 - {89E9B32E-A86A-47C3-A948-D2B1622925CE}.Release|x64.Build.0 = Release|x64 - {89E9B32E-A86A-47C3-A948-D2B1622925CE}.Release|x86.ActiveCfg = Release|Win32 - {89E9B32E-A86A-47C3-A948-D2B1622925CE}.Release|x86.Build.0 = Release|Win32 - {978F53DB-F959-4CB4-84A7-463AF29949BE}.Debug|ARM.ActiveCfg = Debug|ARM - {978F53DB-F959-4CB4-84A7-463AF29949BE}.Debug|ARM.Build.0 = Debug|ARM - {978F53DB-F959-4CB4-84A7-463AF29949BE}.Debug|x64.ActiveCfg = Debug|x64 - {978F53DB-F959-4CB4-84A7-463AF29949BE}.Debug|x64.Build.0 = Debug|x64 - {978F53DB-F959-4CB4-84A7-463AF29949BE}.Debug|x86.ActiveCfg = Debug|Win32 - {978F53DB-F959-4CB4-84A7-463AF29949BE}.Debug|x86.Build.0 = Debug|Win32 - {978F53DB-F959-4CB4-84A7-463AF29949BE}.Release|ARM.ActiveCfg = Release|ARM - {978F53DB-F959-4CB4-84A7-463AF29949BE}.Release|ARM.Build.0 = Release|ARM - {978F53DB-F959-4CB4-84A7-463AF29949BE}.Release|x64.ActiveCfg = Release|x64 - {978F53DB-F959-4CB4-84A7-463AF29949BE}.Release|x64.Build.0 = Release|x64 - {978F53DB-F959-4CB4-84A7-463AF29949BE}.Release|x86.ActiveCfg = Release|Win32 - {978F53DB-F959-4CB4-84A7-463AF29949BE}.Release|x86.Build.0 = Release|Win32 - {BBB0D01A-B124-416C-BE26-E6993154A555}.Debug|ARM.ActiveCfg = Debug|ARM - {BBB0D01A-B124-416C-BE26-E6993154A555}.Debug|ARM.Build.0 = Debug|ARM - {BBB0D01A-B124-416C-BE26-E6993154A555}.Debug|x64.ActiveCfg = Debug|x64 - {BBB0D01A-B124-416C-BE26-E6993154A555}.Debug|x64.Build.0 = Debug|x64 - {BBB0D01A-B124-416C-BE26-E6993154A555}.Debug|x86.ActiveCfg = Debug|Win32 - {BBB0D01A-B124-416C-BE26-E6993154A555}.Debug|x86.Build.0 = Debug|Win32 - {BBB0D01A-B124-416C-BE26-E6993154A555}.Release|ARM.ActiveCfg = Release|ARM - {BBB0D01A-B124-416C-BE26-E6993154A555}.Release|ARM.Build.0 = Release|ARM - {BBB0D01A-B124-416C-BE26-E6993154A555}.Release|x64.ActiveCfg = Release|x64 - {BBB0D01A-B124-416C-BE26-E6993154A555}.Release|x64.Build.0 = Release|x64 - {BBB0D01A-B124-416C-BE26-E6993154A555}.Release|x86.ActiveCfg = Release|Win32 - {BBB0D01A-B124-416C-BE26-E6993154A555}.Release|x86.Build.0 = Release|Win32 - {6A22403A-6CF5-49F2-A012-EC04C9496306}.Debug|ARM.ActiveCfg = Debug|ARM - {6A22403A-6CF5-49F2-A012-EC04C9496306}.Debug|ARM.Build.0 = Debug|ARM - {6A22403A-6CF5-49F2-A012-EC04C9496306}.Debug|x64.ActiveCfg = Debug|x64 - {6A22403A-6CF5-49F2-A012-EC04C9496306}.Debug|x64.Build.0 = Debug|x64 - {6A22403A-6CF5-49F2-A012-EC04C9496306}.Debug|x86.ActiveCfg = Debug|Win32 - {6A22403A-6CF5-49F2-A012-EC04C9496306}.Debug|x86.Build.0 = Debug|Win32 - {6A22403A-6CF5-49F2-A012-EC04C9496306}.Release|ARM.ActiveCfg = Release|ARM - {6A22403A-6CF5-49F2-A012-EC04C9496306}.Release|ARM.Build.0 = Release|ARM - {6A22403A-6CF5-49F2-A012-EC04C9496306}.Release|x64.ActiveCfg = Release|x64 - {6A22403A-6CF5-49F2-A012-EC04C9496306}.Release|x64.Build.0 = Release|x64 - {6A22403A-6CF5-49F2-A012-EC04C9496306}.Release|x86.ActiveCfg = Release|Win32 - {6A22403A-6CF5-49F2-A012-EC04C9496306}.Release|x86.Build.0 = Release|Win32 - {361DFDDB-F86E-4C2C-ABEE-03ACF4B8AC33}.Debug|ARM.ActiveCfg = Debug|ARM - {361DFDDB-F86E-4C2C-ABEE-03ACF4B8AC33}.Debug|ARM.Build.0 = Debug|ARM - {361DFDDB-F86E-4C2C-ABEE-03ACF4B8AC33}.Debug|x64.ActiveCfg = Debug|x64 - {361DFDDB-F86E-4C2C-ABEE-03ACF4B8AC33}.Debug|x64.Build.0 = Debug|x64 - {361DFDDB-F86E-4C2C-ABEE-03ACF4B8AC33}.Debug|x86.ActiveCfg = Debug|Win32 - {361DFDDB-F86E-4C2C-ABEE-03ACF4B8AC33}.Debug|x86.Build.0 = Debug|Win32 - {361DFDDB-F86E-4C2C-ABEE-03ACF4B8AC33}.Release|ARM.ActiveCfg = Release|ARM - {361DFDDB-F86E-4C2C-ABEE-03ACF4B8AC33}.Release|ARM.Build.0 = Release|ARM - {361DFDDB-F86E-4C2C-ABEE-03ACF4B8AC33}.Release|x64.ActiveCfg = Release|x64 - {361DFDDB-F86E-4C2C-ABEE-03ACF4B8AC33}.Release|x64.Build.0 = Release|x64 - {361DFDDB-F86E-4C2C-ABEE-03ACF4B8AC33}.Release|x86.ActiveCfg = Release|Win32 - {361DFDDB-F86E-4C2C-ABEE-03ACF4B8AC33}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/build/uwp/tic/tic.vcxproj b/build/uwp/tic/tic.vcxproj deleted file mode 100644 index d6b886b6..00000000 --- a/build/uwp/tic/tic.vcxproj +++ /dev/null @@ -1,270 +0,0 @@ - - - - {7f895641-6c8f-4481-bd81-57785a4beb09} - tic - en-US - 14.0 - true - Windows Store - 10.0.14393.0 - 10.0.14393.0 - 10.0 - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - Application - true - v140 - - - Application - true - v140 - - - Application - true - v140 - - - Application - false - true - v140 - true - - - Application - false - true - v140 - true - - - Application - false - true - v140 - true - - - - - - - - - - - - - - - - - - - - - - - - - tic_StoreKey.pfx - D14111A1389AE6F9821F879C5D6D066D87718B43 - False - Always - x86|x64|arm - - - - /bigobj %(AdditionalOptions) - 4453;28204 - false - NotUsing - ..\include;..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\3rd-party\sdl-gpu\include;..\..\..\3rd-party\zlib-1.2.8;..\..\..\3rd-party\SDL2_net-2.0.1;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - - - _WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;LUA_COMPAT_5_2;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) - - - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib;WindowsApp.lib;%(AdditionalDependencies) - /nodefaultlib:vccorlibd /nodefaultlib:msvcrtd vccorlibd.lib msvcrtd.lib - - - - - /bigobj %(AdditionalOptions) - 4453;28204 - false - NotUsing - ..\include;..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\3rd-party\sdl-gpu\include;..\..\..\3rd-party\zlib-1.2.8;..\..\..\3rd-party\SDL2_net-2.0.1;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - - - _WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;LUA_COMPAT_5_2;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) - - - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib;WindowsApp.lib;%(AdditionalDependencies) - /nodefaultlib:vccorlib /nodefaultlib:msvcrt vccorlib.lib msvcrt.lib - - - - - /bigobj %(AdditionalOptions) - 4453;28204 - false - NotUsing - ..\include;..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\3rd-party\sdl-gpu\include;..\..\..\3rd-party\zlib-1.2.8;..\..\..\3rd-party\SDL2_net-2.0.1;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - - - _WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;LUA_COMPAT_5_2;_UNICODE;UNICODE;%(PreprocessorDefinitions) - - - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib;WindowsApp.lib;%(AdditionalDependencies) - /nodefaultlib:vccorlibd /nodefaultlib:msvcrtd vccorlibd.lib msvcrtd.lib - - - - - /bigobj %(AdditionalOptions) - 4453;28204 - false - NotUsing - ..\include;..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\3rd-party\sdl-gpu\include;..\..\..\3rd-party\zlib-1.2.8;..\..\..\3rd-party\SDL2_net-2.0.1;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - - - _WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;LUA_COMPAT_5_2;_UNICODE;UNICODE;%(PreprocessorDefinitions) - - - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib;WindowsApp.lib;%(AdditionalDependencies) - /nodefaultlib:vccorlib /nodefaultlib:msvcrt vccorlib.lib msvcrt.lib - - - - - /bigobj %(AdditionalOptions) - 4453;28204 - false - NotUsing - ..\include;..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\3rd-party\sdl-gpu\include;..\..\..\3rd-party\zlib-1.2.8;..\..\..\3rd-party\SDL2_net-2.0.1;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - - - _WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;LUA_COMPAT_5_2;_UNICODE;UNICODE;%(PreprocessorDefinitions) - - - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib;WindowsApp.lib;%(AdditionalDependencies) - /nodefaultlib:vccorlibd /nodefaultlib:msvcrtd vccorlibd.lib msvcrtd.lib - - - - - /bigobj %(AdditionalOptions) - 4453;28204 - false - NotUsing - ..\include;..\..\..\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\SDL2-2.0.7\include;..\..\..\3rd-party\sdl-gpu\include;..\..\..\3rd-party\zlib-1.2.8;..\..\..\3rd-party\SDL2_net-2.0.1;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - - - _WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;LUA_COMPAT_5_2;_UNICODE;UNICODE;%(PreprocessorDefinitions) - - - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib;WindowsApp.lib;%(AdditionalDependencies) - /nodefaultlib:vccorlib /nodefaultlib:msvcrt vccorlib.lib msvcrt.lib - - - - - Designer - - - - - - - - - - - - - - - - - {89e9b32e-a86a-47c3-a948-d2b1622925ce} - - - {361dfddb-f86e-4c2c-abee-03acf4b8ac33} - - - {6a22403a-6cf5-49f2-a012-ec04c9496306} - - - - - true - true - true - true - true - true - - - - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/build/uwp/tic/tic.vcxproj.filters b/build/uwp/tic/tic.vcxproj.filters deleted file mode 100644 index ed685a24..00000000 --- a/build/uwp/tic/tic.vcxproj.filters +++ /dev/null @@ -1,77 +0,0 @@ - - - - - 5fd31c85-b0c7-45fe-a8e6-8cc5dcfd285d - bmp;fbx;gif;jpg;jpeg;tga;tiff;tif;png - - - {6dbd8d4d-dffd-4a4e-a7f6-d8357c295022} - - - {4a787b83-e89b-4707-b2a5-cb6c79ba169e} - - - {6cfada12-6c33-4060-be5d-20da24e5ff84} - - - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - Assets - - - - - - - - - - - - - - src\ext - - - src - - - - src\ext\net - - - src\ext\net - - - src\ext\net - - - src - - - src - - - - - - \ No newline at end of file diff --git a/build/uwp/tic/tic.vcxproj.user b/build/uwp/tic/tic.vcxproj.user deleted file mode 100644 index 62e32776..00000000 --- a/build/uwp/tic/tic.vcxproj.user +++ /dev/null @@ -1,33 +0,0 @@ - - - - false - True - True - x86|x64|arm - - - UWPRemoteDebugger - XboxOne - - - WindowsDeviceDebugger - XboxOne - - - AppHostLocalDebugger - XboxOne - - - XboxOne - AppHostLocalDebugger - - - XboxOne - AppHostLocalDebugger - - - XboxOne - AppHostLocalDebugger - - \ No newline at end of file diff --git a/build/uwp/tic80/tic80.vcxproj b/build/uwp/tic80/tic80.vcxproj deleted file mode 100644 index 0fece8b6..00000000 --- a/build/uwp/tic80/tic80.vcxproj +++ /dev/null @@ -1,245 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - - - - - - {bc1084df-210a-48d6-a077-761d8c16947b} - - - {53802f21-41da-4ac1-8b62-0dac2ccb8af8} - - - {bbb0d01a-b124-416c-be26-e6993154a555} - - - - {9c39acf1-5f52-4a2b-a467-9f2805d6174b} - DynamicLibrary - tic80 - en-US - 14.0 - true - Windows Store - 10.0.14393.0 - 10.0.14393.0 - 10.0 - - - - DynamicLibrary - true - v140 - - - DynamicLibrary - true - v140 - - - DynamicLibrary - true - v140 - - - DynamicLibrary - false - true - v140 - - - DynamicLibrary - false - true - v140 - - - DynamicLibrary - false - true - v140 - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - false - - - false - false - - - false - false - - - false - false - - - false - false - - - false - false - - - - NotUsing - false - ..\..\..\include;..\..\..\3rd-party\wren\src\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\duktape\src;..\..\..\3rd-party\blip-buf;..\..\..\3rd-party\moonscript;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - LUA_COMPAT_5_2;_CRT_SECURE_NO_WARNINGS;TIC80_SHARED;_WINDLL;%(PreprocessorDefinitions) - false - - - Console - false - false - - - - - - - NotUsing - false - ..\..\..\include;..\..\..\3rd-party\wren\src\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\duktape\src;..\..\..\3rd-party\blip-buf;..\..\..\3rd-party\moonscript;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - LUA_COMPAT_5_2;_CRT_SECURE_NO_WARNINGS;TIC80_SHARED;_WINDLL;%(PreprocessorDefinitions) - false - - - Console - false - false - - - - - - - NotUsing - false - ..\..\..\include;..\..\..\3rd-party\wren\src\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\duktape\src;..\..\..\3rd-party\blip-buf;..\..\..\3rd-party\moonscript;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - LUA_COMPAT_5_2;_CRT_SECURE_NO_WARNINGS;TIC80_SHARED;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) - false - - - Console - false - false - - - - - - - NotUsing - false - ..\..\..\include;..\..\..\3rd-party\wren\src\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\duktape\src;..\..\..\3rd-party\blip-buf;..\..\..\3rd-party\moonscript;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - LUA_COMPAT_5_2;_CRT_SECURE_NO_WARNINGS;TIC80_SHARED;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) - false - - - Console - false - false - - - - - - - NotUsing - false - ..\..\..\include;..\..\..\3rd-party\wren\src\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\duktape\src;..\..\..\3rd-party\blip-buf;..\..\..\3rd-party\moonscript;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - LUA_COMPAT_5_2;_CRT_SECURE_NO_WARNINGS;TIC80_SHARED;_WINDLL;%(PreprocessorDefinitions) - false - - - Console - false - false - - - - - - - NotUsing - false - ..\..\..\include;..\..\..\3rd-party\wren\src\include;..\..\..\3rd-party\lua-5.3.1\src;..\..\..\3rd-party\giflib-5.1.4\lib;..\..\..\3rd-party\duktape\src;..\..\..\3rd-party\blip-buf;..\..\..\3rd-party\moonscript;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - LUA_COMPAT_5_2;_CRT_SECURE_NO_WARNINGS;TIC80_SHARED;_WINDLL;%(PreprocessorDefinitions) - false - - - Console - false - false - - - - - - - - \ No newline at end of file diff --git a/build/uwp/tic80/tic80.vcxproj.filters b/build/uwp/tic80/tic80.vcxproj.filters deleted file mode 100644 index db436211..00000000 --- a/build/uwp/tic80/tic80.vcxproj.filters +++ /dev/null @@ -1,43 +0,0 @@ - - - - - {7fef5e56-dbab-4c46-9b74-272938095273} - - - {b58ae033-7ba6-4374-96d2-041873673e45} - - - {8029f6c9-1965-4fa9-811f-a9f1cf42fd8a} - - - - - src - - - src - - - src - - - src - - - src - - - src\ext - - - src\ext\duktape - - - src\ext - - - src - - - \ No newline at end of file diff --git a/build/uwp/wren/wren.vcxproj b/build/uwp/wren/wren.vcxproj deleted file mode 100644 index b446ef04..00000000 --- a/build/uwp/wren/wren.vcxproj +++ /dev/null @@ -1,210 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - - - - - {bbb0d01a-b124-416c-be26-e6993154a555} - StaticLibrary - wren - en-US - 14.0 - true - Windows Store - 10.0.14393.0 - 10.0.14393.0 - 10.0 - - - - StaticLibrary - true - v140 - - - StaticLibrary - true - v140 - - - StaticLibrary - true - v140 - - - StaticLibrary - false - true - v140 - - - StaticLibrary - false - true - v140 - - - StaticLibrary - false - true - v140 - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - false - - - false - - - false - - - false - - - false - - - - NotUsing - false - false - ..\..\..\3rd-party\wren\src\include;..\..\..\3rd-party\wren\src\optional;..\..\..\3rd-party\wren\src\vm;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - - - Console - false - false - - - - - NotUsing - false - false - ..\..\..\3rd-party\wren\src\include;..\..\..\3rd-party\wren\src\optional;..\..\..\3rd-party\wren\src\vm;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - - - Console - false - false - - - - - NotUsing - false - false - ..\..\..\3rd-party\wren\src\include;..\..\..\3rd-party\wren\src\optional;..\..\..\3rd-party\wren\src\vm;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - - - Console - false - false - - - - - NotUsing - false - false - ..\..\..\3rd-party\wren\src\include;..\..\..\3rd-party\wren\src\optional;..\..\..\3rd-party\wren\src\vm;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - - - Console - false - false - - - - - NotUsing - false - false - ..\..\..\3rd-party\wren\src\include;..\..\..\3rd-party\wren\src\optional;..\..\..\3rd-party\wren\src\vm;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - - - Console - false - false - - - - - NotUsing - false - false - ..\..\..\3rd-party\wren\src\include;..\..\..\3rd-party\wren\src\optional;..\..\..\3rd-party\wren\src\vm;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - - - Console - false - false - - - - - - \ No newline at end of file diff --git a/build/uwp/wren/wren.vcxproj.filters b/build/uwp/wren/wren.vcxproj.filters deleted file mode 100644 index 9872fd88..00000000 --- a/build/uwp/wren/wren.vcxproj.filters +++ /dev/null @@ -1,43 +0,0 @@ - - - - - {7ad0ea3c-f232-4a85-aa42-acd2fd0f1d6b} - - - {530552c5-b8aa-496d-8bd6-255dc647f6b8} - - - {9e502f35-bbe6-4594-980c-c1645d31225e} - - - - - src\vm - - - src\vm - - - src\vm - - - src\vm - - - src\vm - - - src\vm - - - src\vm - - - src\optional - - - src\optional - - - \ No newline at end of file diff --git a/build/windows/studio/studio.vcxproj.user b/build/windows/studio/studio.vcxproj.user deleted file mode 100644 index 6e2aec7a..00000000 --- a/build/windows/studio/studio.vcxproj.user +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/docs/logo/logo16.png b/docs/logo/logo16.png deleted file mode 100644 index c3fa13c0..00000000 Binary files a/docs/logo/logo16.png and /dev/null differ diff --git a/docs/logo/logo32.png b/docs/logo/logo32.png deleted file mode 100644 index abdd0459..00000000 Binary files a/docs/logo/logo32.png and /dev/null differ diff --git a/docs/logo/logo48.png b/docs/logo/logo48.png deleted file mode 100644 index 98899cde..00000000 Binary files a/docs/logo/logo48.png and /dev/null differ diff --git a/docs/logo/logo64.png b/docs/logo/logo64.png deleted file mode 100644 index 47cc1276..00000000 Binary files a/docs/logo/logo64.png and /dev/null differ diff --git a/src/config.c b/src/config.c index df33f479..8191c75e 100644 --- a/src/config.c +++ b/src/config.c @@ -293,7 +293,7 @@ static void setDefault(Config* config) { static const u8 DefaultBiosZip[] = { - #include "../bin/assets/config.tic.dat" + #include "../build/assets/config.tic.dat" }; u8* embedBios = NULL; diff --git a/src/console.c b/src/console.c index 33e69c01..a8067be2 100644 --- a/src/console.c +++ b/src/console.c @@ -507,7 +507,7 @@ static void* getDemoCart(Console* console, ScriptLang script, s32* size) { static const u8 LuaDemoRom[] = { - #include "../bin/assets/luademo.tic.dat" + #include "../build/assets/luademo.tic.dat" }; demo = LuaDemoRom; @@ -520,7 +520,7 @@ static void* getDemoCart(Console* console, ScriptLang script, s32* size) { static const u8 MoonDemoRom[] = { - #include "../bin/assets/moondemo.tic.dat" + #include "../build/assets/moondemo.tic.dat" }; demo = MoonDemoRom; @@ -534,7 +534,7 @@ static void* getDemoCart(Console* console, ScriptLang script, s32* size) { static const u8 FennelDemoRom[] = { - #include "../bin/assets/fenneldemo.tic.dat" + #include "../build/assets/fenneldemo.tic.dat" }; demo = FennelDemoRom; @@ -551,7 +551,7 @@ static void* getDemoCart(Console* console, ScriptLang script, s32* size) { static const u8 JsDemoRom[] = { - #include "../bin/assets/jsdemo.tic.dat" + #include "../build/assets/jsdemo.tic.dat" }; demo = JsDemoRom; @@ -565,7 +565,7 @@ static void* getDemoCart(Console* console, ScriptLang script, s32* size) { static const u8 WrenDemoRom[] = { - #include "../bin/assets/wrendemo.tic.dat" + #include "../build/assets/wrendemo.tic.dat" }; demo = WrenDemoRom; @@ -579,7 +579,7 @@ static void* getDemoCart(Console* console, ScriptLang script, s32* size) { static const u8 SquirrelDemoRom[] = { - #include "../bin/assets/squirreldemo.tic.dat" + #include "../build/assets/squirreldemo.tic.dat" }; demo = SquirrelDemoRom; @@ -1426,47 +1426,47 @@ static void onConsoleInstallDemosCommand(Console* console, const char* param) { static const u8 DemoFire[] = { - #include "../bin/assets/fire.tic.dat" + #include "../build/assets/fire.tic.dat" }; static const u8 DemoP3D[] = { - #include "../bin/assets/p3d.tic.dat" + #include "../build/assets/p3d.tic.dat" }; static const u8 DemoSFX[] = { - #include "../bin/assets/sfx.tic.dat" + #include "../build/assets/sfx.tic.dat" }; static const u8 DemoPalette[] = { - #include "../bin/assets/palette.tic.dat" + #include "../build/assets/palette.tic.dat" }; static const u8 DemoFont[] = { - #include "../bin/assets/font.tic.dat" + #include "../build/assets/font.tic.dat" }; static const u8 DemoMusic[] = { - #include "../bin/assets/music.tic.dat" + #include "../build/assets/music.tic.dat" }; static const u8 GameQuest[] = { - #include "../bin/assets/quest.tic.dat" + #include "../build/assets/quest.tic.dat" }; static const u8 GameTetris[] = { - #include "../bin/assets/tetris.tic.dat" + #include "../build/assets/tetris.tic.dat" }; static const u8 Benchmark[] = { - #include "../bin/assets/benchmark.tic.dat" + #include "../build/assets/benchmark.tic.dat" }; FileSystem* fs = console->fs; diff --git a/examples/sdl/main.c b/src/player/sdl.c similarity index 100% rename from examples/sdl/main.c rename to src/player/sdl.c diff --git a/examples/sokol/main.c b/src/player/sokol.c similarity index 100% rename from examples/sokol/main.c rename to src/player/sokol.c diff --git a/tools/bin2txt/makefile b/tools/bin2txt/makefile deleted file mode 100644 index 71312c2b..00000000 --- a/tools/bin2txt/makefile +++ /dev/null @@ -1,17 +0,0 @@ -OPT=-O3 -Wall -std=c99 -SRC=bin2txt.c -3RD_PARTY = ../../3rd-party -INCLUDE=-I$(3RD_PARTY)/zlib-1.2.11 -PRE_BUILT = $(3RD_PARTY)/pre-built -LIB=-lz - -all: windows - -windows: $(SRC) - gcc $(OPT) $(SRC) $(INCLUDE) -L$(PRE_BUILT)/mingw $(LIB) -o bin2txt.exe - -linux: $(SRC) - gcc $(OPT) $(SRC) $(INCLUDE) $(LIB) -o bin2txt - -macosx: $(SRC) - gcc $(OPT) $(SRC) $(INCLUDE) $(LIB) -o bin2txt