From ad3eed423f2e9decb6b14ab7dbc739ae142c0de8 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Wed, 29 Jan 2014 17:28:30 +0100 Subject: [PATCH] qmake build works again --- qmake/config.h | 24 ++++++++++++++++++++++++ qmake/fougdatax.pro | 3 ++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 qmake/config.h diff --git a/qmake/config.h b/qmake/config.h new file mode 100644 index 0000000..0fd381f --- /dev/null +++ b/qmake/config.h @@ -0,0 +1,24 @@ +#ifndef FOUG_CONFIG_H +#define FOUG_CONFIG_H + +#ifdef __GNUC__ +# ifndef FOUG_HAVE_GCC_BUILTIN_BSWAP_FUNC +# define FOUG_HAVE_GCC_BUILTIN_BSWAP_FUNC +# endif + +# ifndef FOUG_HAVE_STDINT_H +# define FOUG_HAVE_STDINT_H +# endif +#endif /* __GNUC__ */ + +#ifdef _MSC_VER +# ifndef FOUG_HAVE_MSVC_BUILTIN_BSWAP_FUNC +# define FOUG_HAVE_MSVC_BUILTIN_BSWAP_FUNC +# endif + +# if !defined(FOUG_HAVE_STDINT_H) && _MSV_VER >= 1600 /* Visual C++ 2010 */ +# define FOUG_HAVE_STDINT_H +# endif +#endif /* _MSC_VER */ + +#endif /* FOUG_CONFIG_H */ diff --git a/qmake/fougdatax.pro b/qmake/fougdatax.pro index 714f22d..eae332b 100644 --- a/qmake/fougdatax.pro +++ b/qmake/fougdatax.pro @@ -21,6 +21,7 @@ dll:DEFINES += FOUG_LIB_DLL \ #*g++*:QMAKE_CXXFLAGS_RELEASE += -O3 HEADERS += \ + config.h \ ../src/endian.h \ ../src/error.h \ ../src/global.h \ @@ -47,7 +48,7 @@ SOURCES += \ *-msvc*:QMAKE_CFLAGS += -TC global_inc.path = $$PREFIX_DIR/include/datax -global_inc.files = ../src/*.h +global_inc.files = config.h ../src/*.h INSTALLS += global_inc # libSTL