this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

winxp/win7 macro definition plus fixed some warnings

+10 -5
+3
include/tic80_config.h
··· 37 37 # undef __TIC_WINDOWS__ 38 38 # define __TIC_WINDOWS__ 1 39 39 # define TIC_MODULE_EXT ".dll" 40 + # if defined(_MSC_VER) && defined(_USING_V110_SDK71_) 41 + # define __TIC_WIN7__ 1 42 + # endif 40 43 #endif 41 44 42 45 #if defined(ANDROID) || defined(__ANDROID__)
+3 -3
src/studio/fs.c
··· 157 157 return str; 158 158 } 159 159 160 - #if defined(_MSC_VER) && defined(_USING_V110_SDK71_) 160 + #if defined(__TIC_WIN7__) 161 161 162 162 time_t FileTimeToTimeT(FILETIME* ft) { 163 163 ULARGE_INTEGER ull; ··· 218 218 #define tic_rmdir _wrmdir 219 219 220 220 // use the shim (see above) if we're targeting Windows XP 221 - #if defined(_MSC_VER) && defined(_USING_V110_SDK71_) 221 + #if defined(__TIC_WIN7__) 222 222 #define tic_stat _wstat_win32_shim 223 223 #else 224 224 #define tic_stat _wstat ··· 270 270 271 271 if(netData->type == net_get_done) 272 272 { 273 - if(json_parse(netData->done.data, netData->done.size)) 273 + if(json_parse((char*)netData->done.data, netData->done.size)) 274 274 { 275 275 typedef char string[TICNAME_MAX]; 276 276
+3 -1
src/studio/screens/console.c
··· 3721 3721 { 3722 3722 case net_get_done: 3723 3723 { 3724 - if(json_parse(data->done.data, data->done.size)) 3724 + if(json_parse((char*)data->done.data, data->done.size)) 3725 3725 { 3726 3726 s32 major = json_int("major", 0); 3727 3727 s32 minor = json_int("minor", 0); ··· 3742 3742 } 3743 3743 } 3744 3744 } 3745 + break; 3746 + default: 3745 3747 break; 3746 3748 } 3747 3749 }
+1 -1
src/studio/system.h
··· 37 37 #define TIC_NAME_FULL TIC_NAME " tiny computer" 38 38 #define TIC_TITLE TIC_NAME_FULL " " TIC_VERSION 39 39 #define TIC_HOST "tic80.com" 40 - #if defined(_MSC_VER) && defined(_USING_V110_SDK71_) 40 + #if defined(__TIC_WIN7__) 41 41 #define TIC_WEBSITE_PROTOCOL "http://" 42 42 #else 43 43 #define TIC_WEBSITE_PROTOCOL "https://"