update build scripts for ubuntu

GeoDaCenter · Mar 6, 2017 · 9e5b518 · 9e5b518
1 parent e12817d
commit 9e5b518
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/BuildTools/ubuntu/build64.sh b/BuildTools/ubuntu/build64.sh
@@ -598,8 +598,8 @@ echo "% Building wxWidgets 3.0.2 %"
 echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
 # sudo apt-get install libgtk2.0-dev libglu1-mesa-dev libgl1-mesa-dev
 {
-    LIB_NAME=wxWidgets-3.0.2
-    LIB_URL="https://dl.dropboxusercontent.com/u/145979/geoda_libraries/wxWidgets-3.0.2.tar.bz2"
+    LIB_NAME=wxWidgets-3.1.0
+    LIB_URL="https://dl.dropboxusercontent.com/u/145979/geoda_libraries/wxWidgets-3.1.0.tar.bz2"
 
     LIB_FILENAME=$(basename "$LIB_URL" ".tar")
     LIB_CHECKER=wx-config

diff --git a/BuildTools/ubuntu/dep/gdal-1.9.2/GDALmake.opt b/BuildTools/ubuntu/dep/gdal-1.9.2/GDALmake.opt
@@ -69,8 +69,8 @@ INST_MAN	=	${prefix}/share/gdal/man
 INST_HTML	=	$(HOME)/www/gdal
 
 CPPFLAGS	=  -I$(GDAL_ROOT)/port  -I$(GDAL_ROOT)/gcore  -I$(GDAL_ROOT)/ogr  -I$(GDAL_ROOT)/ogr/ogrsf_frmts -I$(GDAL_ROOT)/alg
-CFLAGS		=  -g -O2 -Wall -Wdeclaration-after-statement $(USER_DEFS)
-CXXFLAGS	=  -g -O2 -Wall $(USER_DEFS)
+CFLAGS		=  -O2 -Wall -Wdeclaration-after-statement $(USER_DEFS)
+CXXFLAGS	=  -O2 -Wall $(USER_DEFS)
 LDFLAGS     = 
 
 RANLIB		=	ranlib

diff --git a/GeoDamake.ubuntu.opt b/GeoDamake.ubuntu.opt
@@ -19,7 +19,7 @@ LIBS = $(WXLIBS) \
         $(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 
+        -L/usr/lib/x86_64-linux-gnu -lGL -lGLU -lglut -lrt -lidn -lssl -lrtmp -lwebkitgtk-1.0
 # Note: Library -lrtmp causes a missing library problem at runtime on
 #       Ubuntu 14.10 and later.