Browse Source

Fix merge from essence cross compile #154

gingerBill 7 years ago
parent
commit
febcd73323
1 changed files with 6 additions and 4 deletions
  1. 6 4
      src/main.cpp

+ 6 - 4
src/main.cpp

@@ -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, 
-			str_eq_ignore_case(cross_compile_target, str_lit("Essence")) ? "" : "-lc -lm", 
+			lib_str,
+			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)