ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-04 06:38:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge from essence cross compile #154

Browse Source
This commit is contained in:
gingerBill
2017-11-26 11:11:29 +00:00
parent df06236076
commit febcd73323
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+6 -4
View File
@@ -410,15 +410,17 @@ bool parse_build_flags(Array<String> args) {
#ifdef GB_SYSTEM_UNIX #ifdef GB_SYSTEM_UNIX
#ifdef GB_ARCH_64_BIT #ifdef GB_ARCH_64_BIT
if (str_eq_ignore_case(cross_compile_target, str_lit("Essence"))) { if (str_eq_ignore_case(cross_compile_target, str_lit("Essence"))) {
} else
#endif #endif
#endif #endif
} else { {
gb_printf_err("Unsupported cross compilation target '%.*s'\n", LIT(cross_compile_target)); gb_printf_err("Unsupported cross compilation target '%.*s'\n", LIT(cross_compile_target));
gb_printf_err("Currently supported targets: Essence (from 64-bit Unixes only)\n"); gb_printf_err("Currently supported targets: Essence (from 64-bit Unixes only)\n");
bad_flags = true; bad_flags = true;
} }
break; break;
} }
case BuildFlag_CrossLibDir: { case BuildFlag_CrossLibDir: {
GB_ASSERT(value.kind == ExactValue_String); GB_ASSERT(value.kind == ExactValue_String);
@@ -972,8 +974,8 @@ int main(int arg_count, char **arg_ptr) {
" -e _main " " -e _main "
#endif #endif
, linker, LIT(output_base), LIT(output_base), output_ext, , linker, LIT(output_base), LIT(output_base), output_ext,
lib_str, lib_str,
str_eq_ignore_case(cross_compile_target, str_lit("Essence")) ? "" : "-lc -lm", str_eq_ignore_case(cross_compile_target, str_lit("Essence")) ? "" : "-lc -lm",
LIT(build_context.link_flags), LIT(build_context.link_flags),
link_settings, link_settings,
LIT(cross_compile_lib_dir) LIT(cross_compile_lib_dir)