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

Revert "Changed tab width was on 2 now 4"

Browse Source 
This reverts commit fc7c0ca3b0.
This commit is contained in:
Platin21
2020-10-31 22:30:03 +01:00
parent fc7c0ca3b0
commit f29f7351e9
1 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+31 -25
View File
@@ -341,13 +341,16 @@ i32 linker_stage(lbGenerator *gen) {
String lib_name = lib; String lib_name = lib;
lib_name = remove_extension_from_path(lib_name); lib_name = remove_extension_from_path(lib_name);
lib_str = gb_string_append_fmt(lib_str, " -framework %.*s ", LIT(lib_name)); lib_str = gb_string_append_fmt(lib_str, " -framework %.*s ", LIT(lib_name));
} else if (string_ends_with(lib, str_lit(".a")) || string_ends_with(lib, str_lit(".o")) || string_ends_with(lib, str_lit(".dylib"))) { } else if (string_ends_with(lib, str_lit(".a")) ||
// For: string_ends_with(lib, str_lit(".o")) ||
// object string_ends_with(lib, str_lit(".dylib")))
// dynamic lib {
// static libs, absolute full path relative to the file in which the lib was imported from // For:
lib_str = gb_string_append_fmt(lib_str, " %.*s ", LIT(lib)); // object
} else { // dynamic lib
// static libs, absolute full path relative to the file in which the lib was imported from
lib_str = gb_string_append_fmt(lib_str, " %.*s ", LIT(lib));
} else {
// dynamic or static system lib, just link regularly searching system library paths // dynamic or static system lib, just link regularly searching system library paths
lib_str = gb_string_append_fmt(lib_str, " -l%.*s ", LIT(lib)); lib_str = gb_string_append_fmt(lib_str, " -l%.*s ", LIT(lib));
} }
@@ -431,12 +434,12 @@ i32 linker_stage(lbGenerator *gen) {
" -e _main " " -e _main "
#endif #endif
, linker, object_files, LIT(output_base), LIT(output_ext), , linker, object_files, LIT(output_base), LIT(output_ext),
#if defined(GB_SYSTEM_OSX) #if defined(GB_SYSTEM_OSX)
"-lSystem -lm -syslibroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk -L/usr/local/lib", "-lSystem -lm -syslibroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk -L/usr/local/lib",
#else #else
"-lc -lm", "-lc -lm",
#endif #endif
lib_str, lib_str,
LIT(build_context.link_flags), LIT(build_context.link_flags),
LIT(build_context.extra_linker_flags), LIT(build_context.extra_linker_flags),
link_settings); link_settings);
@@ -2136,13 +2139,16 @@ int main(int arg_count, char const **arg_ptr) {
String lib_name = lib; String lib_name = lib;
lib_name = remove_extension_from_path(lib_name); lib_name = remove_extension_from_path(lib_name);
lib_str = gb_string_append_fmt(lib_str, " -framework %.*s ", LIT(lib_name)); lib_str = gb_string_append_fmt(lib_str, " -framework %.*s ", LIT(lib_name));
} else if (string_ends_with(lib, str_lit(".a")) || string_ends_with(lib, str_lit(".o")) || string_ends_with(lib, str_lit(".dylib"))) { } else if (string_ends_with(lib, str_lit(".a")) ||
// For: string_ends_with(lib, str_lit(".o")) ||
// object string_ends_with(lib, str_lit(".dylib")))
// dynamic lib {
// static libs, absolute full path relative to the file in which the lib was imported from // For:
lib_str = gb_string_append_fmt(lib_str, " %.*s ", LIT(lib)); // object
} else { // dynamic lib
// static libs, absolute full path relative to the file in which the lib was imported from
lib_str = gb_string_append_fmt(lib_str, " %.*s ", LIT(lib));
} else {
// dynamic or static system lib, just link regularly searching system library paths // dynamic or static system lib, just link regularly searching system library paths
lib_str = gb_string_append_fmt(lib_str, " -l%.*s ", LIT(lib)); lib_str = gb_string_append_fmt(lib_str, " -l%.*s ", LIT(lib));
} }
@@ -2220,11 +2226,11 @@ int main(int arg_count, char const **arg_ptr) {
#endif #endif
, linker, LIT(output_base), LIT(output_base), LIT(output_ext), , linker, LIT(output_base), LIT(output_base), LIT(output_ext),
lib_str, lib_str,
#if defined(GB_SYSTEM_OSX) #if defined(GB_SYSTEM_OSX)
"-lSystem -lm -syslibroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk -L/usr/local/lib", "-lSystem -lm -syslibroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk -L/usr/local/lib",
#else #else
"-lc -lm", "-lc -lm",
#endif #endif
LIT(build_context.link_flags), LIT(build_context.link_flags),
LIT(build_context.extra_linker_flags), LIT(build_context.extra_linker_flags),
link_settings); link_settings);