diff --git a/.gitignore b/.gitignore index afab69a5..1c2ebad1 100644 --- a/.gitignore +++ b/.gitignore @@ -56,6 +56,7 @@ perf.data* *.csproj.user binaries/*Debug binaries/*Release +build/.vs build/*.sdf build/*.suo build/*.opensdf diff --git a/build/Lol (vs2013).sln b/build/Lol (vs2013).sln index 556dd488..5d699d0e 100644 --- a/build/Lol (vs2013).sln +++ b/build/Lol (vs2013).sln @@ -53,7 +53,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "orbital", "..\games\orbital EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "- Engine -", "- Engine -", "{1AFD580B-98B8-4689-B661-38C41132C60E}" ProjectSection(SolutionItems) = preProject - config-build.xml = config-build.xml + msbuild\config-build.xml = msbuild\config-build.xml EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{3D341D8A-E400-4B1D-BC05-B5C35487D9B5}" @@ -164,7 +164,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sot3000", "..\games\sot3000 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Grunx", "Grunx", "{CE356481-3D75-425A-9970-766340FB88FC}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ld33", "..\games\grunx\grunx.vcxproj", "{775B46F7-03C4-4351-B78D-76088E028D14}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grunx", "..\games\grunx\grunx.vcxproj", "{775B46F7-03C4-4351-B78D-76088E028D14}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -865,7 +865,7 @@ Global {81C83B42-D00A-4FA3-9A3D-80F9D46524BF} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} {65114D40-9450-4B2D-B051-7A75E97C88E1} = {1DFE1729-4F1B-47CA-9819-72431FE14E25} {B9A255A0-2B92-4801-AF6C-354535A6E105} = {65114D40-9450-4B2D-B051-7A75E97C88E1} - {CE356481-3D75-425A-9970-766340FB88FC} = {928A359C-9C41-400A-8D2D-A054B33A79F5} + {CE356481-3D75-425A-9970-766340FB88FC} = {1DFE1729-4F1B-47CA-9819-72431FE14E25} {775B46F7-03C4-4351-B78D-76088E028D14} = {CE356481-3D75-425A-9970-766340FB88FC} EndGlobalSection EndGlobal diff --git a/build/Lol (vs2015).sln b/build/Lol (vs2015).sln index c2eb58c9..a994c4c4 100644 --- a/build/Lol (vs2015).sln +++ b/build/Lol (vs2015).sln @@ -53,7 +53,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "orbital", "..\games\orbital EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "- Engine -", "- Engine -", "{1AFD580B-98B8-4689-B661-38C41132C60E}" ProjectSection(SolutionItems) = preProject - config-build.xml = config-build.xml + msbuild\config-build.xml = msbuild\config-build.xml EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{3D341D8A-E400-4B1D-BC05-B5C35487D9B5}" diff --git a/src/lua/lollua.vcxproj.filters b/src/lua/lollua.vcxproj.filters new file mode 100644 index 00000000..78c46b4e --- /dev/null +++ b/src/lua/lollua.vcxproj.filters @@ -0,0 +1,183 @@ + + + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + upstream + + + + + {6fed84e3-30c6-4d41-8fd3-f3a43bc169a4} + + + \ No newline at end of file