linux update file stuff
This commit is contained in:
parent
4f55fca356
commit
441a6d26ea
2
Makefile
2
Makefile
|
@ -4,7 +4,7 @@ WARNINGS := -Wno-write-strings
|
|||
PLAT_LINKS := -L/usr/local/lib -lX11 -lpthread -lm -lrt -lGL -ldl -lXfixes
|
||||
FLAGS := -fPIC -fno-threadsafe-statics -pthread -I../foreign
|
||||
|
||||
debug: FLAGS += -DFRED_KEEP_ASSERT=1 -DFRED_INTERNAL=0 -DFRED_SUPER -g -O0
|
||||
debug: FLAGS += -DFRED_INTERNAL=1 -DFRED_SUPER=1 -g -O0
|
||||
debug: ../4ed_app.so ../4ed
|
||||
|
||||
../4ed_app.so: $(CPP_FILES) $(H_FILES)
|
||||
|
|
980
linux_4ed.cpp
980
linux_4ed.cpp
File diff suppressed because it is too large
Load Diff
|
@ -20,7 +20,7 @@ sysshared_load_file(char *filename){
|
|||
|
||||
if (loading.size > 0){
|
||||
result.data.size = loading.size;
|
||||
result.data.data = (byte*)Win32GetMemory(result.data.size);
|
||||
result.data.data = (byte*)system_get_memory(result.data.size);
|
||||
|
||||
if (!result.data.data){
|
||||
system_file_load_end(loading, 0);
|
||||
|
@ -28,7 +28,7 @@ sysshared_load_file(char *filename){
|
|||
}
|
||||
else{
|
||||
if (!system_file_load_end(loading, (char*)result.data.data)){
|
||||
Win32FreeMemory(result.data.data);
|
||||
system_free_memory(result.data.data);
|
||||
result = file_data_zero();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue