Skip to content
This repository was archived by the owner on May 31, 2022. It is now read-only.

Commit 10bb28b

Browse files
author
Allen Webster
committed
Fix 32 bit windows build
1 parent 7c82223 commit 10bb28b

File tree

6 files changed

+144
-149
lines changed

6 files changed

+144
-149
lines changed

‎bin/4ed_build.cpp

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -180,17 +180,14 @@ get_defines_from_flags(Arena *arena, u32 flags){
180180
#if COMPILER_CL
181181

182182
#define CL_OPTS \
183-
"-W4 -wd4310 -wd4100 -wd4201 -wd4505 -wd4996 " \
184-
"-wd4127 -wd4510 -wd4512 -wd4610 -wd4390 " \
183+
"-W4 -wd4310 -wd4100 -wd4201 -wd4505 -wd4996 " \
184+
"-wd4127 -wd4510 -wd4512 -wd4610 -wd4390 " \
185185
"-wd4611 -wd4189 -WX -GR- -EHa- -nologo -FC"
186186

187-
#define CL_LIBS_X64 \
188-
"user32.lib winmm.lib gdi32.lib opengl32.lib comdlg32.lib userenv.lib " \
189-
FOREIGN_WIN "\\x64\\freetype.lib"
190-
191-
#define CL_LIBS_X86 \
192-
"user32.lib winmm.lib gdi32.lib opengl32.lib comdlg32.lib " \
193-
FOREIGN_WIN "\\x86\\freetype.lib"
187+
#define CL_LIBS_COMMON \
188+
"user32.lib winmm.lib gdi32.lib opengl32.lib comdlg32.lib userenv.lib "
189+
#define CL_LIBS_X64 CL_LIBS_COMMON FOREIGN_WIN "\\x64\\freetype.lib"
190+
#define CL_LIBS_X86 CL_LIBS_COMMON FOREIGN_WIN "\\x86\\freetype.lib"
194191

195192
#define CL_ICON "..\\4coder-non-source\\res\\icon.res"
196193

@@ -303,19 +300,19 @@ build(Arena *arena, u32 flags, u32 arch, char *code_path, char **code_files, cha
303300

304301
#if OS_LINUX
305302

306-
# define GCC_OPTS \
303+
# define GCC_OPTS \
307304
"-Wno-write-strings " \
308305
"-D_GNU_SOURCE -fPIC " \
309306
"-fno-threadsafe-statics -pthread " \
310307
"-Wno-unused-result " \
311308
"-std=c++11"
312309

313-
#define GCC_LIBS_COMMON \
310+
# define GCC_LIBS_COMMON \
314311
"-lX11 -lpthread -lm -lrt " \
315312
"-lGL -ldl -lXfixes -lfreetype -lfontconfig"
316313

317-
#define GCC_LIBS_X64 GCC_LIBS_COMMON
318-
#define GCC_LIBS_X86 GCC_LIBS_COMMON
314+
# define GCC_LIBS_X64 GCC_LIBS_COMMON
315+
# define GCC_LIBS_X86 GCC_LIBS_COMMON
319316

320317
#else
321318
# error gcc options not set for this platform
@@ -597,7 +594,7 @@ get_4coder_dist_name(Arena *arena, u32 platform, char *tier, u32 arch){
597594

598595
function void
599596
package_for_arch(Arena *arena, u32 arch, char *cdir, char *build_dir, char *pack_dir, i32 tier, char *tier_name, char *current_dist_tier, u32 flags, char** dist_files, i32 dist_file_count){
600-
char *arch_name = arch_names[arch];
597+
char *arch_name = arch_names[arch];
601598
char *parent_dir = fm_str(arena, current_dist_tier, "_", arch_name);
602599
char *dir = fm_str(arena, parent_dir, SLASH "4coder");
603600
char *zip_dir = fm_str(arena, pack_dir, SLASH, tier_name, "_", arch_name);

‎bin/build-x86.bat

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
@echo off
2-
3-
build.bat /DDEV_BUILD_X86
2+
bin\build.bat /DDEV_BUILD_X86

‎custom/4coder_file.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ data_from_file(Arena *arena, FILE *file){
1919
result.size = ftell(file);
2020
fseek(file, 0, SEEK_SET);
2121
result.str = push_array(arena, u8, result.size + 1);
22-
fread(result.str, 1, result.size, file);
22+
fread(result.str, 1, (size_t)result.size, file);
2323
result.str[result.size] = 0;
2424
}
2525
return(result);

‎custom/4coder_project_commands.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1032,7 +1032,7 @@ CUSTOM_DOC("Prints the current project to the file it was loaded from; prints in
10321032
for (String8Node *node = prj_string.first;
10331033
node != 0;
10341034
node = node->next){
1035-
fwrite(node->string.str, 1, node->string.size, file);
1035+
fwrite(node->string.str, 1, (size_t)node->string.size, file);
10361036
}
10371037
fclose(file);
10381038
print_message(app, str8_lit("Reloading project buffer\n"));

‎platform_win32/win32_4ed_functions.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,8 @@ system_memory_annotation_sig(){
122122
// 4ed path
123123
//
124124

125-
extern "C" {
126-
BOOL GetUserProfileDirectoryW(HANDLE hToken, LPWSTR lpProfileDir, LPDWORD lpcchSize);
127-
}
125+
extern "C" BOOL CALL_CONVENTION
126+
GetUserProfileDirectoryW(HANDLE hToken, LPWSTR lpProfileDir, LPDWORD lpcchSize);
128127

129128
internal
130129
system_get_path_sig(){

‎project.4coder

Lines changed: 128 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -2,146 +2,146 @@ version(2);
22
project_name = "4coder";
33

44
patterns = {
5-
"*.c",
6-
"*.cpp",
7-
"*.h",
8-
"*.m",
9-
"*.mm",
10-
"*.bat",
11-
"*.sh",
12-
"*.4coder",
13-
"*.txt",
5+
"*.c",
6+
"*.cpp",
7+
"*.h",
8+
"*.m",
9+
"*.mm",
10+
"*.bat",
11+
"*.sh",
12+
"*.4coder",
13+
"*.txt",
1414
};
1515
blacklist_patterns = {
16-
".*",
16+
".*",
1717
};
1818

1919
load_path_shared = { .path = ".", .recursive = true, .relative = true, };
2020

2121
load_paths = {
22-
.win = { load_path_shared },
23-
.linux = { load_path_shared },
24-
.mac = { load_path_shared },
22+
.win = { load_path_shared },
23+
.linux = { load_path_shared },
24+
.mac = { load_path_shared },
2525
};
2626

2727
commands = {
28-
.build_x64 = {
29-
.win = "echo build: x64 & bin\\build.bat",
30-
.linux = "echo build: x64 & bin/build-linux.sh",
31-
.out = "*compilation*",
32-
.footer_panel = true,
33-
.save_dirty_files = true,
34-
.cursor_at_end = false,
35-
},
36-
.build_x86 = {
37-
.win = "echo build: x86 & bin\\build.bat /DDEV_BUILD_X86",
38-
.linux = "echo build: x86 & bin/build-linux.sh /DDEV_BUILD_X86",
39-
.out = "*compilation*",
40-
.footer_panel = true,
41-
.save_dirty_files = true,
42-
.cursor_at_end = false,
43-
},
44-
.package = {
45-
.win = "echo package & bin\\package.bat",
46-
.linux = "echo package & bin/package.sh",
47-
.out = "*compilation*",
48-
.footer_panel = false,
49-
.save_dirty_files = true,
50-
.cursor_at_end = false,
51-
},
52-
.run_one_time = {
53-
.win = "pushd ..\\build & one_time",
54-
.linux = "pushd ../build & one_time",
55-
.out = "*run*",
56-
.footer_panel = false,
57-
.save_dirty_files = false,
58-
.cursor_at_end = false,
59-
},
60-
.build_custom_api_docs = {
61-
.win = "custom\\bin\\build_one_time docs\\4ed_doc_custom_api_main.cpp ..\\build",
62-
.out = "*compilation*",
63-
.footer_panel = true,
64-
.save_dirty_files = true,
65-
.cursor_at_end = false,
66-
},
67-
.build_C___lexer_generator = {
68-
.win = "custom\bin\build_one_time custom\languages\4coder_cpp_lexer_gen.cpp ..\build",
69-
.out = "*compilation*",
70-
.footer_panel = true,
71-
.save_dirty_files = true,
72-
.cursor_at_end = false,
73-
},
74-
.build_token_tester = {
75-
.win = "custom\bin\build_one_time custom\languages\4coder_cpp_lexer_test.cpp ..\build",
76-
.out = "*compilation*",
77-
.footer_panel = true,
78-
.save_dirty_files = true,
79-
.cursor_at_end = false,
80-
},
81-
.build_system_api = {
82-
.win = "custom\bin\build_one_time 4ed_system_api.cpp ..\build",
83-
.out = "*compilation*",
84-
.footer_panel = true,
85-
.save_dirty_files = true,
86-
.cursor_at_end = false,
87-
},
88-
.build_font_api = {
89-
.win = "custom\bin\build_one_time 4ed_font_api.cpp ..\build",
90-
.out = "*compilation*",
91-
.footer_panel = true,
92-
.save_dirty_files = true,
93-
.cursor_at_end = false,
94-
},
95-
.build_graphics_api = {
96-
.win = "custom\bin\build_one_time 4ed_graphics_api.cpp ..\build",
97-
.out = "*compilation*",
98-
.footer_panel = true,
99-
.save_dirty_files = true,
100-
.cursor_at_end = false,
101-
},
102-
.build_api_parser = {
103-
.win = "custom\bin\build_one_time 4ed_api_parser_main.cpp ..\build & copy /B ..\build\one_time.exe ..\build\api_parser.exe",
104-
.out = "*compilation*",
105-
.footer_panel = true,
106-
.save_dirty_files = true,
107-
.cursor_at_end = false,
108-
},
109-
.build_api_checker = {
110-
.win = "custom\bin\build_one_time 4ed_api_check.cpp ..\build & copy /B ..\build\one_time.exe ..\build\api_checker.exe",
111-
.out = "*compilation*",
112-
.footer_panel = true,
113-
.save_dirty_files = true,
114-
.cursor_at_end = false,
115-
},
116-
.build_keycode_generator = {
117-
.win = "custom\bin\build_one_time 4ed_generate_keycodes.cpp ..\build",
118-
.out = "*compilation*",
119-
.footer_panel = true,
120-
.save_dirty_files = true,
121-
.cursor_at_end = false,
122-
},
123-
.build_site_render = {
124-
.win = "custom\bin\build_one_time site/4ed_site_render_main.cpp ..\build",
125-
.out = "*compilation*",
126-
.footer_panel = true,
127-
.save_dirty_files = true,
128-
.cursor_at_end = false,
129-
},
130-
.generate_custom_api_master_list = {
131-
.win = "..\build\api_parser 4ed_api_implementation.cpp",
132-
.out = "*run*",
133-
.footer_panel = false,
134-
.save_dirty_files = false,
135-
.cursor_at_end = false,
136-
},
28+
.build_x64 = {
29+
.win = "echo build: x64 & bin\\build.bat",
30+
.linux = "echo build: x64 & bin/build-linux.sh",
31+
.out = "*compilation*",
32+
.footer_panel = true,
33+
.save_dirty_files = true,
34+
.cursor_at_end = false,
35+
},
36+
.build_x86 = {
37+
.win = "echo build: x86 & bin\\build.bat /DDEV_BUILD_X86",
38+
.linux = "echo build: x86 & bin/build-linux.sh /DDEV_BUILD_X86",
39+
.out = "*compilation*",
40+
.footer_panel = true,
41+
.save_dirty_files = true,
42+
.cursor_at_end = false,
43+
},
44+
.package = {
45+
.win = "echo package & bin\\package.bat",
46+
.linux = "echo package & bin/package.sh",
47+
.out = "*compilation*",
48+
.footer_panel = false,
49+
.save_dirty_files = true,
50+
.cursor_at_end = false,
51+
},
52+
.run_one_time = {
53+
.win = "pushd ..\\build & one_time",
54+
.linux = "pushd ../build & one_time",
55+
.out = "*run*",
56+
.footer_panel = false,
57+
.save_dirty_files = false,
58+
.cursor_at_end = false,
59+
},
60+
.build_custom_api_docs = {
61+
.win = "custom\\bin\\build_one_time docs\\4ed_doc_custom_api_main.cpp ..\\build",
62+
.out = "*compilation*",
63+
.footer_panel = true,
64+
.save_dirty_files = true,
65+
.cursor_at_end = false,
66+
},
67+
.build_C___lexer_generator = {
68+
.win = "custom\bin\build_one_time custom\languages\4coder_cpp_lexer_gen.cpp ..\build",
69+
.out = "*compilation*",
70+
.footer_panel = true,
71+
.save_dirty_files = true,
72+
.cursor_at_end = false,
73+
},
74+
.build_token_tester = {
75+
.win = "custom\bin\build_one_time custom\languages\4coder_cpp_lexer_test.cpp ..\build",
76+
.out = "*compilation*",
77+
.footer_panel = true,
78+
.save_dirty_files = true,
79+
.cursor_at_end = false,
80+
},
81+
.build_system_api = {
82+
.win = "custom\bin\build_one_time 4ed_system_api.cpp ..\build",
83+
.out = "*compilation*",
84+
.footer_panel = true,
85+
.save_dirty_files = true,
86+
.cursor_at_end = false,
87+
},
88+
.build_font_api = {
89+
.win = "custom\bin\build_one_time 4ed_font_api.cpp ..\build",
90+
.out = "*compilation*",
91+
.footer_panel = true,
92+
.save_dirty_files = true,
93+
.cursor_at_end = false,
94+
},
95+
.build_graphics_api = {
96+
.win = "custom\bin\build_one_time 4ed_graphics_api.cpp ..\build",
97+
.out = "*compilation*",
98+
.footer_panel = true,
99+
.save_dirty_files = true,
100+
.cursor_at_end = false,
101+
},
102+
.build_api_parser = {
103+
.win = "custom\bin\build_one_time 4ed_api_parser_main.cpp ..\build & copy /B ..\build\one_time.exe ..\build\api_parser.exe",
104+
.out = "*compilation*",
105+
.footer_panel = true,
106+
.save_dirty_files = true,
107+
.cursor_at_end = false,
108+
},
109+
.build_api_checker = {
110+
.win = "custom\bin\build_one_time 4ed_api_check.cpp ..\build & copy /B ..\build\one_time.exe ..\build\api_checker.exe",
111+
.out = "*compilation*",
112+
.footer_panel = true,
113+
.save_dirty_files = true,
114+
.cursor_at_end = false,
115+
},
116+
.build_keycode_generator = {
117+
.win = "custom\bin\build_one_time 4ed_generate_keycodes.cpp ..\build",
118+
.out = "*compilation*",
119+
.footer_panel = true,
120+
.save_dirty_files = true,
121+
.cursor_at_end = false,
122+
},
123+
.build_site_render = {
124+
.win = "custom\bin\build_one_time site/4ed_site_render_main.cpp ..\build",
125+
.out = "*compilation*",
126+
.footer_panel = true,
127+
.save_dirty_files = true,
128+
.cursor_at_end = false,
129+
},
130+
.generate_custom_api_master_list = {
131+
.win = "..\build\api_parser 4ed_api_implementation.cpp",
132+
.out = "*run*",
133+
.footer_panel = false,
134+
.save_dirty_files = false,
135+
.cursor_at_end = false,
136+
},
137137
};
138138

139139
fkey_command = {
140-
.F1 = "build_x64",
141-
.F3 = "build_site_render",
142-
.F4 = "run_one_time",
143-
.F5 = "build_C___lexer_generator",
144-
.F6 = "build_token_tester",
145-
.F11 = "package",
140+
.F1 = "build_x64",
141+
.F3 = "build_site_render",
142+
.F4 = "run_one_time",
143+
.F5 = "build_C___lexer_generator",
144+
.F6 = "build_token_tester",
145+
.F11 = "package",
146146
};
147147

0 commit comments

Comments
 (0)