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

Fix 32 bit windows build

This commit is contained in:
Allen Webster 2021-01-24 15:30:57 -08:00
parent 7c822233c5
commit 10bb28bb40
6 changed files with 144 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/4ed_build.cpp
View File

@ -184,13 +184,10 @@ get_defines_from_flags(Arena *arena, u32 flags){
"-wd4127 -wd4510 -wd4512 -wd4610 -wd4390 " \ "-wd4127 -wd4510 -wd4512 -wd4610 -wd4390 " \
"-wd4611 -wd4189 -WX -GR- -EHa- -nologo -FC" "-wd4611 -wd4189 -WX -GR- -EHa- -nologo -FC"
#define CL_LIBS_X64 \ #define CL_LIBS_COMMON \
"user32.lib winmm.lib gdi32.lib opengl32.lib comdlg32.lib userenv.lib " \ "user32.lib winmm.lib gdi32.lib opengl32.lib comdlg32.lib userenv.lib "
FOREIGN_WIN "\\x64\\freetype.lib" #define CL_LIBS_X64 CL_LIBS_COMMON FOREIGN_WIN "\\x64\\freetype.lib"
#define CL_LIBS_X86 CL_LIBS_COMMON FOREIGN_WIN "\\x86\\freetype.lib"
#define CL_LIBS_X86 \
"user32.lib winmm.lib gdi32.lib opengl32.lib comdlg32.lib " \
FOREIGN_WIN "\\x86\\freetype.lib"
#define CL_ICON "..\\4coder-non-source\\res\\icon.res" #define CL_ICON "..\\4coder-non-source\\res\\icon.res"

3
bin/build-x86.bat
View File

@ -1,3 +1,2 @@
@echo off @echo off
bin\build.bat /DDEV_BUILD_X86
build.bat /DDEV_BUILD_X86

2
custom/4coder_file.cpp
View File

@ -19,7 +19,7 @@ data_from_file(Arena *arena, FILE *file){
result.size = ftell(file); result.size = ftell(file);
fseek(file, 0, SEEK_SET); fseek(file, 0, SEEK_SET);
result.str = push_array(arena, u8, result.size + 1); result.str = push_array(arena, u8, result.size + 1);
fread(result.str, 1, result.size, file); fread(result.str, 1, (size_t)result.size, file);
result.str[result.size] = 0; result.str[result.size] = 0;
} }
return(result); return(result);

2
custom/4coder_project_commands.cpp
View File

@ -1032,7 +1032,7 @@ CUSTOM_DOC("Prints the current project to the file it was loaded from; prints in
for (String8Node *node = prj_string.first; for (String8Node *node = prj_string.first;
node != 0; node != 0;
node = node->next){ node = node->next){
fwrite(node->string.str, 1, node->string.size, file); fwrite(node->string.str, 1, (size_t)node->string.size, file);
} }
fclose(file); fclose(file);
print_message(app, str8_lit("Reloading project buffer\n")); print_message(app, str8_lit("Reloading project buffer\n"));

5
platform_win32/win32_4ed_functions.cpp
View File

@ -122,9 +122,8 @@ system_memory_annotation_sig(){
// 4ed path // 4ed path
// //
extern "C" { extern "C" BOOL CALL_CONVENTION
BOOL GetUserProfileDirectoryW(HANDLE hToken, LPWSTR lpProfileDir, LPDWORD lpcchSize); GetUserProfileDirectoryW(HANDLE hToken, LPWSTR lpProfileDir, LPDWORD lpcchSize);
}
internal internal
system_get_path_sig(){ system_get_path_sig(){