update build scripts on mac osx

BuildTools/macosx/build.sh

@@ -441,7 +441,7 @@ if ! [ -f "$PREFIX/lib/$LIB_CHECKER" ] ; then
     cd $LIB_NAME
     if [[ $NODEBUG -eq 1 ]] ; then
         # no debug
-    	./configure CC="$GDA_CC" CXX="$GDA_CXX" CFLAGS="$GDA_CFLAGS" CXXFLAGS="$GDA_CXXFLAGS" LDFLAGS="$GDA_LDFLAGS" --with-jpeg=internal --prefix=$PREFIX --with-freexl=$PREFIX --with-libiconv-prefix="-L/usr/lib" --with-sqlite3=$PREFIX --with-spatialite=$PREFIX --with-static-proj4=$PREFIX --with-curl=$PREFIX/bin/curl-config --with-geos=$PREFIX/bin/geos-config --with-libkml=$PREFIX --with-xerces=$PREFIX --with-xerces-inc="$PREFIX/include" --with-xerces-lib="-L$PREFIX/lib -lxerces-c -framework CoreServices" --with-pg=$PREFIX/bin/pg_config --enable-debug
+    	./configure CC="$GDA_CC" CXX="$GDA_CXX" CFLAGS="$GDA_CFLAGS" CXXFLAGS="$GDA_CXXFLAGS" LDFLAGS="$GDA_LDFLAGS" --with-jpeg=internal --prefix=$PREFIX --with-freexl=$PREFIX --with-libiconv-prefix="-L/usr/lib" --with-sqlite3=$PREFIX --with-spatialite=$PREFIX --with-static-proj4=$PREFIX --with-curl=$PREFIX/bin/curl-config --with-geos=$PREFIX/bin/geos-config --with-libkml=$PREFIX --with-xerces=$PREFIX --with-xerces-inc="$PREFIX/include" --with-xerces-lib="-L$PREFIX/lib -lxerces-c -framework CoreServices" --with-pg=$PREFIX/bin/pg_config
     else
         # with debug
     	./configure CC="$GDA_CC" CXX="$GDA_CXX" CFLAGS="$GDA_CFLAGS" CXXFLAGS="$GDA_CXXFLAGS" LDFLAGS="$GDA_LDFLAGS" --with-jpeg=internal --prefix=$PREFIX --with-freexl=$PREFIX --with-libiconv-prefix="-L/usr/lib" --with-sqlite3=$PREFIX --with-spatialite=$PREFIX --with-static-proj4=$PREFIX --with-curl=$PREFIX/bin/curl-config --with-geos=$PREFIX/bin/geos-config --with-libkml=$PREFIX --with-xerces=$PREFIX --with-xerces-inc="$PREFIX/include" --with-xerces-lib="-L$PREFIX/lib -lxerces-c -framework CoreServices" --with-pg=$PREFIX/bin/pg_config --enable-debug

GeoDamake.opt

@@ -2,35 +2,33 @@ GeoDa_ROOT	=	$(GEODA_HOME)/../..
 
 TARGET      = GeoDa
 
-CC	=   /usr/bin/gcc	
-CXX =	/usr/bin/g++ 
-LD	=	/usr/bin/g++ 
+CC	=	gcc
+CXX     =	g++ -Os -arch x86_64
+LD	=	g++ -arch x86_64
 RM	=	/bin/rm -f
 
-WXLIBS  = $(shell $(GEODA_HOME)/libraries/bin/wx-config --libs xrc,stc,richtext,ribbon,propgrid,aui,gl,html,webview,qa,adv,core,xml,net,base)
+WXLIBS  = $(shell $(GEODA_HOME)/libraries/bin/wx-config --libs xrc,stc,richtext,ribbon,propgrid,aui,gl,html,qa,adv,core,webview,xml,net,base)
 WX_HEADER = $(shell $(GEODA_HOME)/libraries/bin/wx-config --cppflags)
 
-LIBS = $(WXLIBS) \
-        $(GEODA_HOME)/temp/CLAPACK-3.2.1/lapack.a \
-        $(GEODA_HOME)/temp/CLAPACK-3.2.1/libf2c.a \
-        $(GEODA_HOME)/temp/CLAPACK-3.2.1/blas.a \
-        $(GEODA_HOME)/temp/CLAPACK-3.2.1/tmglib.a \
-        $(GEODA_HOME)/libraries/include/boost/stage/lib/libboost_thread.a \
-        $(GEODA_HOME)/libraries/include/boost/stage/lib/libboost_system.a \
-        $(GEODA_HOME)/libraries/lib/libjson_spirit.a \
-        -L$(GEODA_HOME)/libraries/lib -lgdal -lcurl -lcares \
-        -L/usr/lib/x86_64-linux-gnu -lGL -lGLU -lglut -lrt -lidn -lssl -lrtmp 
-# Note: Library -lrtmp causes a missing library problem at runtime on
-#       Ubuntu 14.10 and later.
+LIBS	=	$(WXLIBS) \
+            $(GEODA_HOME)/temp/CLAPACK-3.2.1/blas.a \
+            $(GEODA_HOME)/temp/CLAPACK-3.2.1/F2CLIBS/libf2c.a \
+            $(GEODA_HOME)/temp/CLAPACK-3.2.1/lapack.a \
+            -L/usr/lib -liconv \
+            -L$(GEODA_HOME)/libraries/lib -lgdal -lcurl \
+            $(GEODA_HOME)/libraries/include/boost/stage/lib/libboost_thread.a \
+            $(GEODA_HOME)/libraries/include/boost/stage/lib/libboost_system.a \
+	    $(GEODA_HOME)/libraries/lib/libjson_spirit.a
+
 
 BOOST_HEADER = -I$(GEODA_HOME)/libraries/include/boost 
 
-GDAL_HEADER = -I$(GEODA_HOME)/libraries/include -I/usr/include
+GDAL_HEADER = -I$(GEODA_HOME)/libraries/include
 
-CPPFLAGS	=  -I$(GeoDa_ROOT)
-CFLAGS		=  -O2 -Wdeclaration-after-statement $(USER_DEFS) $(GDAL_HEADER)
-CXXFLAGS	=  -O2 $(USER_DEFS) $(WX_HEADER) $(BOOST_HEADER) $(GDAL_HEADER)
-LDFLAGS     = 
+CPPFLAGS	=  -I$(GeoDa_ROOT) $(USER_LOG)
+CFLAGS		=  -Os -arch x86_64  -Wall -Wdeclaration-after-statement $(USER_DEFS) $(GDAL_HEADER)  
+CXXFLAGS	=  -Os -arch x86_64  -Wall $(USER_DEFS) $(WX_HEADER) $(BOOST_HEADER) $(GDAL_HEADER)
+LDFLAGS     = -arch x86_64
 
 OBJ_EXT     = o