diff options
| author | Zhang Xianyi <traits.zhang@gmail.com> | 2013-11-02 15:59:00 +0800 |
|---|---|---|
| committer | Zhang Xianyi <traits.zhang@gmail.com> | 2013-11-02 15:59:00 +0800 |
| commit | 6d9d70c55c5755d3ca666d92f626539c23063dd6 (patch) | |
| tree | 595f0df39ba05903c777fae8ef6bb1c11ddd1a36 | |
| parent | dfd1064d7be6b5c43759c38cab79f094a453e906 (diff) | |
| download | openblas-6d9d70c55c5755d3ca666d92f626539c23063dd6.tar.gz openblas-6d9d70c55c5755d3ca666d92f626539c23063dd6.tar.bz2 openblas-6d9d70c55c5755d3ca666d92f626539c23063dd6.zip | |
Fixed #315. Added OPENBLAS_ prefix to openblas_config.h.
| -rw-r--r-- | Makefile.install | 4 | ||||
| -rw-r--r-- | openblas_config_template.h | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/Makefile.install b/Makefile.install index cbe98bc5b..8319b46db 100644 --- a/Makefile.install +++ b/Makefile.install @@ -23,8 +23,8 @@ install : lib.grd #for inc @echo \#ifndef OPENBLAS_CONFIG_H > $(OPENBLAS_INCLUDE_DIR)/openblas_config.h @echo \#define OPENBLAS_CONFIG_H >> $(OPENBLAS_INCLUDE_DIR)/openblas_config.h - @cat config_last.h >> $(OPENBLAS_INCLUDE_DIR)/openblas_config.h - @echo \#define VERSION \" OpenBLAS $(VERSION) \" >> $(OPENBLAS_INCLUDE_DIR)/openblas_config.h + @awk '{print $$1, "OPENBLAS_"$$2, $$3}' config_last.h >> $(OPENBLAS_INCLUDE_DIR)/openblas_config.h + @echo \#define OPENBLAS_VERSION \" OpenBLAS $(VERSION) \" >> $(OPENBLAS_INCLUDE_DIR)/openblas_config.h @cat openblas_config_template.h >> $(OPENBLAS_INCLUDE_DIR)/openblas_config.h @echo \#endif \/\* OPENBLAS_CONFIG_H \*\/ >> $(OPENBLAS_INCLUDE_DIR)/openblas_config.h diff --git a/openblas_config_template.h b/openblas_config_template.h index 1017caff9..3b3435b0e 100644 --- a/openblas_config_template.h +++ b/openblas_config_template.h @@ -1,8 +1,8 @@ /*This is only for "make install" target.*/ -#if defined(OS_WINNT) || defined(OS_CYGWIN_NT) || defined(OS_INTERIX) -#define WINDOWS_ABI -#define OS_WINDOWS +#if defined(OPENBLAS_OS_WINNT) || defined(OPENBLAS_OS_CYGWIN_NT) || defined(OPENBLAS_OS_INTERIX) +#define OPENBLAS_WINDOWS_ABI +#define OPENBLAS_OS_WINDOWS #ifdef DOUBLE #define DOUBLE_DEFINED DOUBLE @@ -10,23 +10,23 @@ #endif #endif -#ifdef NEEDBUNDERSCORE +#ifdef OPENBLAS_NEEDBUNDERSCORE #define BLASFUNC(FUNC) FUNC##_ #else #define BLASFUNC(FUNC) FUNC #endif -#ifdef QUAD_PRECISION +#ifdef OPENBLAS_QUAD_PRECISION typedef struct { unsigned long x[2]; } xdouble; -#elif defined EXPRECISION +#elif defined OPENBLAS_EXPRECISION #define xdouble long double #else #define xdouble double #endif -#if defined(OS_WINDOWS) && defined(__64BIT__) +#if defined(OPENBLAS_OS_WINDOWS) && defined(OPENBLAS___64BIT__) typedef long long BLASLONG; typedef unsigned long long BLASULONG; #else @@ -34,7 +34,7 @@ typedef long BLASLONG; typedef unsigned long BLASULONG; #endif -#ifdef USE64BITINT +#ifdef OPENBLAS_USE64BITINT typedef BLASLONG blasint; #else typedef int blasint; |