From 74cc2ad8d137582869d2a449114a0a7ec050c353 Mon Sep 17 00:00:00 2001
From: "Bastian M. Wojek" <basti@kth.se>
Date: Sun, 20 Sep 2009 12:55:12 +0000
Subject: [PATCH] More PSIBIN changes...

---
 configure.ac                                       |  2 +-
 src/classes/Makefile.am                            | 14 +++++---------
 src/external/MuSR_software/Class_MuSR_PSI/tydefs.h |  2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index 38702112..9205cb11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -278,7 +278,7 @@ case "$host" in
   *-*-cygwin)
     LOCAL_BIN_CXXFLAGS="${LOCAL_BIN_CXXFLAGS}"
     LOCAL_LIB_CXXFLAGS="${LOCAL_BIN_CXXFLAGS} -D_DLL"
-    LOCAL_PSIBIN_LIB_CXXFLAGS="${LOCAL_LIB_CXXFLAGS} -D_WIN32"
+    LOCAL_PSIBIN_LIB_CXXFLAGS="${LOCAL_LIB_CXXFLAGS} -D_WIN32GCC"
     LOCAL_BIN_LDFLAGS="${LOCAL_BIN_LDFLAGS} -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc"
     LOCAL_LIB_LDFLAGS="-no-undefined ${LOCAL_BIN_LDFLAGS} -Wl,--export-all-symbols"
     ;;
diff --git a/src/classes/Makefile.am b/src/classes/Makefile.am
index 5a2e3544..96324f8b 100644
--- a/src/classes/Makefile.am
+++ b/src/classes/Makefile.am
@@ -62,14 +62,10 @@ dict_cpp_sources = \
   PStartupHandlerDict.cpp \
   PUserFcnBaseDict.cpp
 
-ext_source_dir = $(top_srcdir)/src/external/MuSR_software/Class_MuSR_PSI
-ext_h_sources = $(ext_source_dir)/MuSR_td_PSI_bin.h $(ext_source_dir)/tydefs.h
-ext_cpp_sources = $(ext_source_dir)/MuSR_td_PSI_bin.cpp 
+include_HEADERS = $(h_sources)
+noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
 
-include_HEADERS = $(h_sources) $(ext_source_dir)/MuSR_td_PSI_bin.h
-noinst_HEADERS = $(h_linkdef) $(dict_h_sources) $(ext_source_dir)/tydefs.h
-
-INCLUDES = -I$(top_srcdir)/src/include -I$(ext_source_dir) $(LEM_CFLAGS) $(FFTW3_CFLAGS) $(GSL_CFLAGS) $(BOOST_CFLAGS) $(ROOT_CFLAGS)
+INCLUDES = -I$(top_srcdir)/src/include $(PSIBIN_CFLAGS) $(LEM_CFLAGS) $(FFTW3_CFLAGS) $(GSL_CFLAGS) $(BOOST_CFLAGS) $(ROOT_CFLAGS)
 AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
 
 BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources)
@@ -81,8 +77,8 @@ CLEANFILES = *Dict.cpp *Dict.h *~ core
 
 lib_LTLIBRARIES = libPMusr.la
 
-libPMusr_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources) $(ext_h_sources) $(ext_cpp_sources)
-libPMusr_la_LIBADD = $(LEM_LIBS) $(FFTW3_LIBS) $(GSL_LIBS) $(ROOT_LIBS)
+libPMusr_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources)
+libPMusr_la_LIBADD = $(PSIBIN_LIBS) $(LEM_LIBS) $(FFTW3_LIBS) $(GSL_LIBS) $(ROOT_LIBS)
 libPMusr_la_LDFLAGS = -version-info $(MUSR_LIBRARY_VERSION) -release $(MUSR_RELEASE) $(AM_LDFLAGS)
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/src/external/MuSR_software/Class_MuSR_PSI/tydefs.h b/src/external/MuSR_software/Class_MuSR_PSI/tydefs.h
index 31f26d9a..0ff11720 100644
--- a/src/external/MuSR_software/Class_MuSR_PSI/tydefs.h
+++ b/src/external/MuSR_software/Class_MuSR_PSI/tydefs.h
@@ -149,7 +149,7 @@ typedef  unsigned       char    BoolEnum;
 #else /* other operating system */
 
 //#ifdef _WIN32
-#if (defined(_WIN32) || defined(__linux__))
+#if (defined(_WIN32) || defined(__linux__) || defined(_WIN32GCC))
 #define MODEFS_CC_SYS "Compiled for Microsoft Windows 32-bit or Linux operating system"
 
 typedef                 short    Int16;