From bdb17a7e652ce98e977195502a535f40bd252c13 Mon Sep 17 00:00:00 2001 From: Tycho Bickerstaff Date: Tue, 10 Dec 2013 18:39:09 +0000 Subject: added cmake ignores to gitignore --- .gitignore | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index b0ad11d53..e8037b564 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,7 @@ Symbols cloc-ignored.txt cloc.xml cloc.xsl -*.ncb + *.ncb *.user *.suo /EveryNight.cmd @@ -15,6 +15,7 @@ cloc.xsl # emacs stuff *.*~ +*~ # world inside source ChunkWorx.ini @@ -32,3 +33,11 @@ logs players world world_nether + +#cmake stuff +CMakeFiles/ +cmake_install.cmake +CMakeCache.txt +Makefile + +*.a -- cgit v1.2.3 From 4300d0866d9943d9d276f1c49aa9ee1a1ca4e817 Mon Sep 17 00:00:00 2001 From: Tycho Bickerstaff Date: Tue, 10 Dec 2013 21:44:11 +0000 Subject: removed accedentailly commited object files --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index e8037b564..2fb040264 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ CMakeCache.txt Makefile *.a +*.d -- cgit v1.2.3 From 572d48be524f9bfac7b4f6b2c1e748717829b37d Mon Sep 17 00:00:00 2001 From: Tycho Bickerstaff Date: Tue, 10 Dec 2013 21:47:23 +0000 Subject: removed more accedentailly commited object files --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 2fb040264..383b55f07 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,8 @@ Makefile *.a *.d +CMakeCache.txt +CMakeFiles +Makefile +cmake_install.cmake +install_mainfest.txt -- cgit v1.2.3 From daccfd9c6e7e6644dae92057cf2c52f5834377a1 Mon Sep 17 00:00:00 2001 From: Tycho Bickerstaff Date: Tue, 10 Dec 2013 22:43:21 +0000 Subject: more cmake changes --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 383b55f07..26fe1eaac 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ CMakeFiles Makefile cmake_install.cmake install_mainfest.txt +src/MCServer -- cgit v1.2.3 From 7dd1561a883a28ffa275e1a097bd82853b4cc6f8 Mon Sep 17 00:00:00 2001 From: Tycho Bickerstaff Date: Wed, 18 Dec 2013 23:54:55 +0000 Subject: fixed bindings generation --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 26fe1eaac..97bcfbd04 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,5 @@ Makefile cmake_install.cmake install_mainfest.txt src/MCServer +lib/tolua++/tolua +src/Bindings/Bindings.* -- cgit v1.2.3 From 7d096c41f71103489a855c9e838801d333897e60 Mon Sep 17 00:00:00 2001 From: tycho Date: Thu, 19 Dec 2013 15:07:45 +0000 Subject: fixed a number of windows issues --- .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 97bcfbd04..e3e704bb7 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,10 @@ install_mainfest.txt src/MCServer lib/tolua++/tolua src/Bindings/Bindings.* + +#win32 cmake stuff +*.vcxproj +*.vcxproj.filters +*.opensdf +*.sdf +*.sln -- cgit v1.2.3 From 162b085d803db549a0d70ce607f8ec0e025ebcf0 Mon Sep 17 00:00:00 2001 From: tycho Date: Fri, 20 Dec 2013 00:31:52 +0000 Subject: fixed include paths on windows and added build dir to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index b00a88503..c07822b49 100644 --- a/.gitignore +++ b/.gitignore @@ -52,6 +52,7 @@ install_mainfest.txt src/MCServer lib/tolua++/tolua src/Bindings/Bindings.* +MCServer.dir/ #win32 cmake stuff *.vcxproj -- cgit v1.2.3