Merge with base

This commit is contained in:
Krzosa Karol
2022-02-21 17:39:19 +01:00
parent 4b6cd41c01
commit fd8ce7d1a9
7 changed files with 6200 additions and 6589 deletions

View File

@@ -1,6 +1,7 @@
/*
* The OS layer should expect ABGR writes to the screen, the bitmap is bottom up(origin 0,0 is in left bottom corner)
*/
#if 0
#define _CRT_SECURE_NO_WARNINGS
#include "platform.h"
@@ -183,7 +184,7 @@ void OS::message(int debug, const char* format, ...) {
}
}
char* OS::read_file(const char* path) {
char* OS::read_file(const char* path) {
char* result = 0;
FILE* f = fopen(path, "rb");
if (f) {
@@ -206,4 +207,6 @@ char* OS::read_file(const char* path) {
}
return result;
}
}
#endif