소스 검색

Merge pull request #144 from Hejsil/newline-fix

Newline fix for paq script on windows
Komari Spaghetti 5 년 전
부모
커밋
bbae32e4f6
2개의 변경된 파일7개의 추가작업 그리고 4개의 파일을 삭제
  1. 3 0
      .gitattributes
  2. 4 4
      src/build.py

+ 3 - 0
.gitattributes

@@ -1,3 +1,6 @@
 # Github language settings
 # Github language settings
 *.h linguist-language=c
 *.h linguist-language=c
 *.c linguist-language=c
 *.c linguist-language=c
+
+*.h text eol=auto
+*.c text eol=auto

+ 4 - 4
src/build.py

@@ -134,7 +134,7 @@ for f in intro_files:
     sys.stdout.write(open(f, 'r').read())
     sys.stdout.write(open(f, 'r').read())
 print("*/")
 print("*/")
 
 
-# print(os.linesep + "#ifndef " + macro + "_SINGLE_HEADER");
+# print("\n#ifndef " + macro + "_SINGLE_HEADER");
 # print("#define " + macro + "_SINGLE_HEADER");
 # print("#define " + macro + "_SINGLE_HEADER");
 print("#ifndef NK_SINGLE_FILE");
 print("#ifndef NK_SINGLE_FILE");
 print("  #define NK_SINGLE_FILE");
 print("  #define NK_SINGLE_FILE");
@@ -145,7 +145,7 @@ for f in pub_files:
     sys.stdout.write(open(f, 'r').read())
     sys.stdout.write(open(f, 'r').read())
 # print("#endif /* " + macro + "_SINGLE_HEADER */");
 # print("#endif /* " + macro + "_SINGLE_HEADER */");
 
 
-print(os.linesep + "#ifdef " + macro + "_IMPLEMENTATION");
+print("\n#ifdef " + macro + "_IMPLEMENTATION");
 print("");
 print("");
 
 
 for f in priv_files1:
 for f in priv_files1:
@@ -160,8 +160,8 @@ for f in priv_files2:
 
 
 print("#endif /* " + macro + "_IMPLEMENTATION */");
 print("#endif /* " + macro + "_IMPLEMENTATION */");
 
 
-print(os.linesep + "/*")
+print("\n/*")
 for f in outro_files:
 for f in outro_files:
     sys.stdout.write(open(f, 'r').read())
     sys.stdout.write(open(f, 'r').read())
-print("*/" + os.linesep)
+print("*/\n")