LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

More PSIBIN changes...

Browse Source
This commit is contained in:
Bastian M. Wojek 2009-09-20 12:55:12 +00:00
parent e3ac790371
commit 74cc2ad8d1
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -278,7 +278,7 @@ case "$host" in
*-*-cygwin) *-*-cygwin)
LOCAL_BIN_CXXFLAGS="${LOCAL_BIN_CXXFLAGS}" LOCAL_BIN_CXXFLAGS="${LOCAL_BIN_CXXFLAGS}"
LOCAL_LIB_CXXFLAGS="${LOCAL_BIN_CXXFLAGS} -D_DLL" 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_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" LOCAL_LIB_LDFLAGS="-no-undefined ${LOCAL_BIN_LDFLAGS} -Wl,--export-all-symbols"
;; ;;

14
src/classes/Makefile.am
View File

@ -62,14 +62,10 @@ dict_cpp_sources = \
PStartupHandlerDict.cpp \ PStartupHandlerDict.cpp \
PUserFcnBaseDict.cpp PUserFcnBaseDict.cpp
ext_source_dir = $(top_srcdir)/src/external/MuSR_software/Class_MuSR_PSI include_HEADERS = $(h_sources)
ext_h_sources = $(ext_source_dir)/MuSR_td_PSI_bin.h $(ext_source_dir)/tydefs.h noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
ext_cpp_sources = $(ext_source_dir)/MuSR_td_PSI_bin.cpp
include_HEADERS = $(h_sources) $(ext_source_dir)/MuSR_td_PSI_bin.h INCLUDES = -I$(top_srcdir)/src/include $(PSIBIN_CFLAGS) $(LEM_CFLAGS) $(FFTW3_CFLAGS) $(GSL_CFLAGS) $(BOOST_CFLAGS) $(ROOT_CFLAGS)
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)
AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS) AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources) BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources)
@ -81,8 +77,8 @@ CLEANFILES = *Dict.cpp *Dict.h *~ core
lib_LTLIBRARIES = libPMusr.la 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_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources)
libPMusr_la_LIBADD = $(LEM_LIBS) $(FFTW3_LIBS) $(GSL_LIBS) $(ROOT_LIBS) 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) libPMusr_la_LDFLAGS = -version-info $(MUSR_LIBRARY_VERSION) -release $(MUSR_RELEASE) $(AM_LDFLAGS)
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig

2
src/external/MuSR_software/Class_MuSR_PSI/tydefs.h vendored
View File

@ -149,7 +149,7 @@ typedef unsigned char BoolEnum;
#else /* other operating system */ #else /* other operating system */
//#ifdef _WIN32 //#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" #define MODEFS_CC_SYS "Compiled for Microsoft Windows 32-bit or Linux operating system"
typedef short Int16; typedef short Int16;