Skip to content

Commit

Permalink
Merge pull request #891 from lixun910/master
Browse files Browse the repository at this point in the history
GeoDa v1.10.0 pull request
  • Loading branch information
lixun910 committed Jun 4, 2017
2 parents 8ffaaf4 + 7647d3d commit 61d45de
Show file tree
Hide file tree
Showing 144 changed files with 55,931 additions and 7,792 deletions.
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
*~

*.deb
*.gwt
*.gal
*.pyc

swig/*.gwt
swig/_geoda.so
swig/geoda.pyc

BuildTools/centos/libraries/
BuildTools/centos/temp/
Expand All @@ -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/
Expand Down Expand Up @@ -88,3 +96,4 @@ BuildTools/macosx/temp1/boost_1_57_0/b2
*.xcworkspacedata

*.plist
.vs/slnx.sqlite
16 changes: 16 additions & 0 deletions Algorithms/GNUmakefile
Original file line number Diff line number Diff line change
@@ -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

Loading

0 comments on commit 61d45de

Please sign in to comment.