From b564e77f092fc6fb8efa87570e48b5d2362bebc5 Mon Sep 17 00:00:00 2001 From: Patrix Date: Sat, 28 Aug 2021 05:03:24 +0200 Subject: [PATCH] Removed .gitattributes file & updated formatting in CMakeLists.txt --- .gitattributes | 63 ------------------- dependencies/squirrel/squirrel/CMakeLists.txt | 26 ++++---- 2 files changed, 14 insertions(+), 75 deletions(-) delete mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 1ff0c42..0000000 --- a/.gitattributes +++ /dev/null @@ -1,63 +0,0 @@ -############################################################################### -# Set default behavior to automatically normalize line endings. -############################################################################### -* text=auto - -############################################################################### -# Set default behavior for command prompt diff. -# -# This is need for earlier builds of msysgit that does not have it on by -# default for csharp files. -# Note: This is only used by command line -############################################################################### -#*.cs diff=csharp - -############################################################################### -# Set the merge driver for project and solution files -# -# Merging from the command prompt will add diff markers to the files if there -# are conflicts (Merging from VS is not affected by the settings below, in VS -# the diff markers are never inserted). Diff markers may cause the following -# file extensions to fail to load in VS. An alternative would be to treat -# these files as binary and thus will always conflict and require user -# intervention with every merge. To do so, just uncomment the entries below -############################################################################### -#*.sln merge=binary -#*.csproj merge=binary -#*.vbproj merge=binary -#*.vcxproj merge=binary -#*.vcproj merge=binary -#*.dbproj merge=binary -#*.fsproj merge=binary -#*.lsproj merge=binary -#*.wixproj merge=binary -#*.modelproj merge=binary -#*.sqlproj merge=binary -#*.wwaproj merge=binary - -############################################################################### -# behavior for image files -# -# image files are treated as binary by default. -############################################################################### -#*.jpg binary -#*.png binary -#*.gif binary - -############################################################################### -# diff behavior for common document formats -# -# Convert binary document formats to text before diffing them. This feature -# is only available from the command line. Turn it on by uncommenting the -# entries below. -############################################################################### -#*.doc diff=astextplain -#*.DOC diff=astextplain -#*.docx diff=astextplain -#*.DOCX diff=astextplain -#*.dot diff=astextplain -#*.DOT diff=astextplain -#*.pdf diff=astextplain -#*.PDF diff=astextplain -#*.rtf diff=astextplain -#*.RTF diff=astextplain diff --git a/dependencies/squirrel/squirrel/CMakeLists.txt b/dependencies/squirrel/squirrel/CMakeLists.txt index 1e569ee..2700892 100644 --- a/dependencies/squirrel/squirrel/CMakeLists.txt +++ b/dependencies/squirrel/squirrel/CMakeLists.txt @@ -1,15 +1,17 @@ -set(SQUIRREL_SRC sqapi.cpp - sqbaselib.cpp - sqclass.cpp - sqcompiler.cpp - sqdebug.cpp - sqfuncstate.cpp - sqlexer.cpp - sqmem.cpp - sqobject.cpp - sqstate.cpp - sqtable.cpp - sqvm.cpp) +set(SQUIRREL_SRC + sqapi.cpp + sqbaselib.cpp + sqclass.cpp + sqcompiler.cpp + sqdebug.cpp + sqfuncstate.cpp + sqlexer.cpp + sqmem.cpp + sqobject.cpp + sqstate.cpp + sqtable.cpp + sqvm.cpp +) add_library(squirrel_static STATIC ${SQUIRREL_SRC})