tschoonj

; NSIS2 Script for GTK2-Runtime
; by Alexander Shaduri <ashaduri 'at' gmail.com>.
; Compatible with NSIS Unicode 2.45.
; Public Domain

; The naming convention is:
; Product: GTK2-Runtime;
; Directory and package names: gtk2-runtime.
; The reason for this is that when gtk3 comes out, it

tschoonj

2015-05-25 14:55:34 +0100

./configure
--prefix=/usr/local/Cellar/gdal/1.11.2_1
--mandir=/usr/local/Cellar/gdal/1.11.2_1/share/man
--disable-debug
--with-local=/usr/local/Cellar/gdal/1.11.2_1
--with-threads
--with-libtool
--with-pcraster=internal

tschoonj

bin_PROGRAMS = plplot-test
plplot_test_SOURCES = main.cpp \
                      PLplotWindow.h \
                      PLplotWindow.cpp \
                      PLplotDrawingArea.h \
                      PLplotDrawingArea.cpp
plplot_test_CPPFLAGS= $(plplotcxx_CFLAGS) $(gtkmm_CFLAGS)
plplot_test_LDADD = $(plplotcxx_LIBS) $(gtkmm_LIBS)

tschoonj

diff --git a/CMakeModules/FindPlplot.cmake b/CMakeModules/FindPlplot.cmake
index a503f8c..ad13e7a 100644
--- a/CMakeModules/FindPlplot.cmake
+++ b/CMakeModules/FindPlplot.cmake
@@ -9,8 +9,8 @@
 #
 
 
-find_library(PLPLOT_LIBRARY NAMES plplotd)
-find_library(PLPLOTCXX_LIBRARY NAMES plplotcxxd)

tschoonj

diff --git a/gio/Makefile.am b/gio/Makefile.am
index e993e2f..6eab656 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -131,7 +131,7 @@ endif
 
 if OS_COCOA
 settings_sources += \
-	gnextstepsettingsbackend.c
+	gnextstepsettingsbackend.m

tschoonj

diff --git a/src/gui/canvasview.cpp b/src/gui/canvasview.cpp
index 076f704..9cf4504 100644
--- a/src/gui/canvasview.cpp
+++ b/src/gui/canvasview.cpp
@@ -33,7 +33,7 @@
 #	include <config.h>
 #endif
 
-#include <sigc++/adaptors/hide.h>
+#include <sigc++/sigc++.h>

tschoonj

diff --git a/src/synfig/main.cpp b/src/synfig/main.cpp
index b60637d..2242598 100644
--- a/src/synfig/main.cpp
+++ b/src/synfig/main.cpp
@@ -289,22 +289,22 @@ synfig::Main::Main(const synfig::String& basepath,ProgressCallback *cb):
 		locations.push_back(getenv("SYNFIG_MODULE_LIST"));
 	else
 	{
-		locations.push_back("./"MODULE_LIST_FILENAME);
+		locations.push_back("./" MODULE_LIST_FILENAME);

tschoonj

diff --git a/src/hed/acc/JobDescriptionParser/ARCJSDLParser.cpp b/src/hed/acc/JobDescriptionParser/ARCJSDLParser.cpp
index eab7a58..78ace1a 100644
--- a/src/hed/acc/JobDescriptionParser/ARCJSDLParser.cpp
+++ b/src/hed/acc/JobDescriptionParser/ARCJSDLParser.cpp
@@ -225,7 +225,7 @@ namespace Arc {
     if (bool(xmlBenchmark["BenchmarkType"]) &&
         bool(xmlBenchmark["BenchmarkValue"]) &&
         stringto(xmlBenchmark["BenchmarkValue"], value))
-      benchmark = std::make_pair<std::string, int>((std::string)xmlBenchmark["BenchmarkType"], value);
+      benchmark = std::make_pair((std::string)xmlBenchmark["BenchmarkType"], value);

tschoonj

/*
 * compile with gcc -o gtkextra-print-export `pkg-config --cflags gtkextra-3.0` gtkextra-print-export.c `pkg-config --libs gtkextra-3.0`
 */


#include <gtkextra/gtkextra.h>
#include <cairo-ps.h>
#include <cairo-pdf.h>
#include <math.h>
#include <string.h>

tschoonj

#python bindings will only be built if all buildtools are available, hence the following automake conditional
if ENABLE_PYTHON
#our python extension module
pyexec_LTLIBRARIES = _mytest.la
_mytest_la_CFLAGS = $(PYTHON_CFLAGS) -I$(top_srcdir)/include $(PYTHON_CPPFLAGS)
#link to the C-library
#probably on Windows one will need to link against the python dll as well
_mytest_la_LIBADD = ../src/mytest.la
#the source code for our extensions module
#nodist because this file will be generated by swig