소스 검색

Revert "Changed tab width was on 2 now 4"

This reverts commit fc7c0ca3b0413a90fabd5d41a43bff227e61477f.
Platin21 4 년 전
부모
커밋
f29f7351e9
1개의 변경된 파일31개의 추가작업 그리고 25개의 파일을 삭제
  1. 31 25
      src/main.cpp

+ 31 - 25
src/main.cpp

@@ -341,13 +341,16 @@ i32 linker_stage(lbGenerator *gen) {
 					String lib_name = lib;
 					lib_name = remove_extension_from_path(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"))) {
-                        // For:
-                        // object 
-                        // 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 {
+				} else if (string_ends_with(lib, str_lit(".a")) || 
+                     string_ends_with(lib, str_lit(".o")) || 
+                     string_ends_with(lib, str_lit(".dylib"))) 
+        {
+          // For:
+          // object 
+          // 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
 					lib_str = gb_string_append_fmt(lib_str, " -l%.*s ", LIT(lib));
 				}
@@ -431,12 +434,12 @@ i32 linker_stage(lbGenerator *gen) {
 				" -e _main "
 			#endif
 			, linker, object_files, LIT(output_base), LIT(output_ext),
-            #if defined(GB_SYSTEM_OSX)
-                "-lSystem -lm -syslibroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk -L/usr/local/lib",
-            #else
-                "-lc -lm",
-            #endif
-            lib_str,
+      #if defined(GB_SYSTEM_OSX)
+        "-lSystem -lm -syslibroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk -L/usr/local/lib",
+      #else
+        "-lc -lm",
+      #endif
+      lib_str,
 			LIT(build_context.link_flags),
 			LIT(build_context.extra_linker_flags),
 			link_settings);
@@ -2136,13 +2139,16 @@ int main(int arg_count, char const **arg_ptr) {
 						String lib_name = lib;
 						lib_name = remove_extension_from_path(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"))) {
-                        // For:
-                        // object 
-                        // 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 {
+					} else if (string_ends_with(lib, str_lit(".a")) || 
+                     string_ends_with(lib, str_lit(".o")) || 
+                     string_ends_with(lib, str_lit(".dylib"))) 
+        {
+          // For:
+          // object 
+          // 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
 						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
 				, linker, LIT(output_base), LIT(output_base), LIT(output_ext),
 				lib_str,
-                #if defined(GB_SYSTEM_OSX)
-                    "-lSystem -lm -syslibroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk -L/usr/local/lib",
-                #else
-                    "-lc -lm",
-                #endif
+        #if defined(GB_SYSTEM_OSX)
+          "-lSystem -lm -syslibroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk -L/usr/local/lib",
+        #else
+          "-lc -lm",
+        #endif
 				LIT(build_context.link_flags),
 				LIT(build_context.extra_linker_flags),
 				link_settings);