diff --git a/.gitattributes b/.gitattributes index 1bded486..cb3cbbf5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5,6 +5,7 @@ *.exe filter=lfs diff=lfs merge=lfs -text *.a filter=lfs diff=lfs merge=lfs -text *.o filter=lfs diff=lfs merge=lfs -text +*.so filter=lfs diff=lfs merge=lfs -text *.obj filter=lfs diff=lfs merge=lfs -text *.dll filter=lfs diff=lfs merge=lfs -text *.pdb filter=lfs diff=lfs merge=lfs -text @@ -12,5 +13,6 @@ *.jpg filter=lfs diff=lfs merge=lfs -text *.png filter=lfs diff=lfs merge=lfs -text *.psd filter=lfs diff=lfs merge=lfs -text +*.sln filter=lfs diff=lfs merge=lfs -text *.uasset filter=lfs diff=lfs merge=lfs -text *.umap filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore index 0306816a..e413afb2 100644 --- a/.gitignore +++ b/.gitignore @@ -21,9 +21,6 @@ gmon.out *.vcproj .ignore -Integration.code-workspace -Makefile - .vscode/** Saved/** Platforms/** @@ -31,3 +28,13 @@ Intermediate/** DerivedDataCache/** Binaries/** .vs/** + +Makefile + +luprex/build/** + +luprex/ext/eris-master/src/lua +luprex/ext/eris-master/src/luac +luprex/ext/eris-master/test/persist +luprex/ext/eris-master/test/unpersist + diff --git a/luprex/.gitignore b/luprex/.gitignore deleted file mode 100644 index 595b3783..00000000 --- a/luprex/.gitignore +++ /dev/null @@ -1,27 +0,0 @@ -a.out -gprof.out -gmon.out -luprex - -*~ -\#*# -.#* -*.obj -*.o -*.dll -*.exe -*.pdb -*.so -*.a -*.lib -*.ilk -*.exp -*.pdb - -build/** -.vscode/** -ext/eris-master/src/lua -ext/eris-master/src/luac -ext/eris-master/test/persist -ext/eris-master/test/unpersist - diff --git a/luprex/.vscode/tasks.json b/luprex/.vscode/tasks.json deleted file mode 100644 index 490cdcbe..00000000 --- a/luprex/.vscode/tasks.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "version": "2.0.0", - "tasks": [ - { - "label": "build luprex", - "type": "shell", - "command": "make", - "problemMatcher": { - "base": "$gcc", - "fileLocation": [ - "relative", - "${workspaceFolder}" - ] - }, - "options": { - "cwd": "${workspaceFolder}" - }, - "group": { - "kind": "build", - "isDefault": true - }, - "presentation": { - "clear": true, - "reveal": "always", - "panel": "shared", - "revealProblems": "never" - } - } - ] -} \ No newline at end of file diff --git a/luprex/diffs b/luprex/diffs deleted file mode 100644 index e69de29b..00000000