Merge remote-tracking branch 'origin/master'

GeoDaCenter · Jun 4, 2017 · 7647d3d · 7647d3d
2 parents c7a3b47 + d00525b
commit 7647d3d
Show file tree

Hide file tree

Showing 144 changed files with 55,931 additions and 7,792 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,13 @@
 *~
 
 *.deb
+*.gwt
+*.gal
+*.pyc
+
+swig/*.gwt
+swig/_geoda.so
+swig/geoda.pyc
 
 BuildTools/centos/libraries/
 BuildTools/centos/temp/
@@ -13,6 +20,7 @@ BuildTools/ubuntu/build/
 
 BuildTools/windows/.vs/
 BuildTools/windows/temp/
+BuildTools/windows/enc_temp_folder/
 BuildTools/windows/Debug/
 BuildTools/windows/Release/
 BuildTools/windows/ipch/
@@ -88,3 +96,4 @@ BuildTools/macosx/temp1/boost_1_57_0/b2
 *.xcworkspacedata
 
 *.plist
+.vs/slnx.sqlite
diff --git a/Algorithms/GNUmakefile b/Algorithms/GNUmakefile
@@ -0,0 +1,16 @@
+
+include ../GeoDamake.opt
+
+#include ./file.lst
+
+CPPFLAGS 	:=	$(CPPFLAGS)
+CXXFLAGS 	:=	$(CXXFLAGS)
+
+CXX_SRCS := $(wildcard *.cpp)
+OBJ := ${CXX_SRCS:.cpp=.o}
+
+default: $(O_OBJ:.o=.$(OBJ_EXT))
+
+clean:
+	rm -f *.o 
+