ps
/
4coder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/4coder/4coder

This commit is contained in:
Allen Webster 2016-05-28 18:25:41 -04:00
parent 2e8ea5f07f 441a6d26ea
commit 7b4f422744
3 changed files with 454 additions and 538 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -4,7 +4,7 @@ WARNINGS := -Wno-write-strings
PLAT_LINKS := -L/usr/local/lib -lX11 -lpthread -lm -lrt -lGL -ldl -lXfixes PLAT_LINKS := -L/usr/local/lib -lX11 -lpthread -lm -lrt -lGL -ldl -lXfixes
FLAGS := -fPIC -fno-threadsafe-statics -pthread -I../foreign 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 debug: ../4ed_app.so ../4ed
../4ed_app.so: $(CPP_FILES) $(H_FILES) ../4ed_app.so: $(CPP_FILES) $(H_FILES)

970
linux_4ed.cpp
View File

File diff suppressed because it is too large Load Diff

4
system_shared.cpp
View File

@ -20,7 +20,7 @@ sysshared_load_file(char *filename){
if (loading.size > 0){ if (loading.size > 0){
result.data.size = loading.size; 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){ if (!result.data.data){
system_file_load_end(loading, 0); system_file_load_end(loading, 0);
@ -28,7 +28,7 @@ sysshared_load_file(char *filename){
} }
else{ else{
if (!system_file_load_end(loading, (char*)result.data.data)){ if (!system_file_load_end(loading, (char*)result.data.data)){
Win32FreeMemory(result.data.data); system_free_memory(result.data.data);
result = file_data_zero(); result = file_data_zero();
} }
} }