dan/TIC-80-guile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch '#320'

Browse Source 
# Conflicts:
#	.gitignore
#	.travis.yml
#	Makefile
#	bin/assets/config.tic.dat
#	bin/assets/fenneldemo.tic.dat
#	bin/assets/tic.js.dat
#	build.sh
#	build/windows/example/example.vcxproj
#	build/windows/sdl-gpu/sdl-gpu.vcxproj
#	build/windows/studio/studio.vcxproj
#	build/windows/tic/tic.aps
#	build/windows/tic/tic.rc
#	build/windows/tic80/tic80.vcxproj
#	build/windows/zlib/zlib.vcxproj
#	build/windows/zlib/zlib.vcxproj.filters
#	include/tic80_config.h
This commit is contained in:
Vadim Grigoruk
2018-09-04 11:13:20 +03:00
parent c60a132ab1 f40f98a3c7
commit b41b0436ab
65 changed files with 584 additions and 4909 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/bin2txt/bin2txt.c
View File

@@ -6,6 +6,8 @@
int main(int argc, char** argv)
{
int res = -1;
if(argc >= 3)
{
bool useZip = false;
@@ -57,8 +59,10 @@ int main(int argc, char** argv)
fprintf(txt, "0x%02x, ", buffer[i]);
fclose(txt);
res = 0;
}
else printf("cannot open bin file\n");
else printf("cannot open text file\n");
free(buffer);
}
@@ -68,5 +72,5 @@ int main(int argc, char** argv)
}
else printf("usage: bin2txt <bin> <txt>\n");
return 0;
return res;
}