From 1888d4c9c76be44b9aea68d9e636af6fdf8d6d83 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Tue, 3 Mar 2015 10:46:42 +0100 Subject: [PATCH] Remove qmake/ --- qmake/compiler_config.pri | 24 -------- qmake/config.h | 24 -------- qmake/config.pri | 7 --- qmake/gmio.pro | 121 -------------------------------------- 4 files changed, 176 deletions(-) delete mode 100644 qmake/compiler_config.pri delete mode 100644 qmake/config.h delete mode 100644 qmake/config.pri delete mode 100644 qmake/gmio.pro diff --git a/qmake/compiler_config.pri b/qmake/compiler_config.pri deleted file mode 100644 index 937f3be..0000000 --- a/qmake/compiler_config.pri +++ /dev/null @@ -1,24 +0,0 @@ -CONFIG += debug_and_release -CONFIG += warn_on stl rtti exceptions - -QT -= core gui - -CONFIG(debug, debug|release) { - DEFINES += _DEBUG_CONFIG_ - CONFIG += console -} -else { - CONFIG -= console -} - -CONFIG(warn_on) { - *-g++*:QMAKE_CXXFLAGS *= -Wextra - GCC_CFLAGS = -Wextra -Wstrict-aliasing -Wcast-align -Wlogical-op -Wfloat-equal - *-g++*:QMAKE_CFLAGS_DEBUG *= $$GCC_CFLAGS - *-g++*:QMAKE_CFLAGS_RELEASE *= $$GCC_CFLAGS -} - -win32-msvc20*:QMAKE_CXXFLAGS *= -wd4996 -wd4290 -wd4503 -win32-msvc*:DEFINES *= NOMINMAX -# This explicitely defines INTXX_C() and UINTXX_C() macros in -DEFINES *= __STDC_CONSTANT_MACROS diff --git a/qmake/config.h b/qmake/config.h deleted file mode 100644 index de3620f..0000000 --- a/qmake/config.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef GMIO_CONFIG_H -#define GMIO_CONFIG_H - -#ifdef __GNUC__ -# ifndef GMIO_HAVE_GCC_BUILTIN_BSWAP_FUNC -# define GMIO_HAVE_GCC_BUILTIN_BSWAP_FUNC -# endif - -# ifndef GMIO_HAVE_STDINT_H -# define GMIO_HAVE_STDINT_H -# endif -#endif /* __GNUC__ */ - -#ifdef _MSC_VER -# ifndef GMIO_HAVE_MSVC_BUILTIN_BSWAP_FUNC -# define GMIO_HAVE_MSVC_BUILTIN_BSWAP_FUNC -# endif - -# if !defined(GMIO_HAVE_STDINT_H) && _MSV_VER >= 1600 /* Visual C++ 2010 */ -# define GMIO_HAVE_STDINT_H -# endif -#endif /* _MSC_VER */ - -#endif /* GMIO_CONFIG_H */ diff --git a/qmake/config.pri b/qmake/config.pri deleted file mode 100644 index 3c614b1..0000000 --- a/qmake/config.pri +++ /dev/null @@ -1,7 +0,0 @@ -include(compiler_config.pri) -CONFIG(debug, debug|release) { - TARGET_SUFFIX = _d -} else { - TARGET_SUFFIX = -} -CONFIG += build_all debug_and_release diff --git a/qmake/gmio.pro b/qmake/gmio.pro deleted file mode 100644 index 56f0ce0..0000000 --- a/qmake/gmio.pro +++ /dev/null @@ -1,121 +0,0 @@ -isEmpty(PREFIX_DIR) { - PREFIX_DIR = .. -} - -include(config.pri) - -message($$PREFIX_DIR) - -TEMPLATE = lib -TARGET = gmio$$TARGET_SUFFIX -DESTDIR = $$PREFIX_DIR/lib - -QT = - -GMIO += stl - -dll:DEFINES += GMIO_LIB_DLL \ - GMIO_LIB_MAKE_DLL - -INCLUDEPATH += $$PWD/../src - -#*g++*:QMAKE_CXXFLAGS_RELEASE -= -O2 -#*g++*:QMAKE_CXXFLAGS_RELEASE += -O3 - -HEADERS += \ - config.h \ - ../src/gmio_core/endian.h \ - ../src/gmio_core/error.h \ - ../src/gmio_core/global.h \ - ../src/gmio_core/memory.h \ - ../src/gmio_core/stream.h \ - ../src/gmio_core/task_control.h \ - ../src/gmio_core/transfer.h \ - \ - ../src/gmio_core/internal/convert.h \ - ../src/gmio_core/internal/ascii_parse.h \ - ../src/gmio_core/internal/byte_swap.h \ - ../src/gmio_core/internal/byte_codec.h \ - ../src/gmio_stl/stl_mesh.h \ - ../src/gmio_stl/stl_mesh_creator.h - -SOURCES += \ - ../src/gmio_core/endian.c \ - ../src/gmio_core/error.c \ - ../src/gmio_core/stream.c \ - ../src/gmio_core/task_control.c \ - \ - ../src/gmio_core/internal/convert.c \ - ../src/gmio_core/internal/ascii_parse.c - -*-g++*:QMAKE_CFLAGS += -ansi -pedantic-errors -*-msvc*:QMAKE_CFLAGS += -TC - -global_inc.path = $$PREFIX_DIR/include/gmio_core -global_inc.files = config.h ../src/*.h -INSTALLS += global_inc - -# libSTL -contains(GMIO, stl) { - dll:DEFINES += GMIO_LIBSTL_DLL \ - GMIO_LIBSTL_MAKE_DLL - - HEADERS += \ - ../src/gmio_stl/stl_error.h \ - ../src/gmio_stl/stl_format.h \ - ../src/gmio_stl/stl_global.h \ - ../src/gmio_stl/stl_io.h \ - ../src/gmio_stl/stl_triangle.h \ - \ - ../src/gmio_stl/internal/stlb_byte_swap.h \ - ../src/gmio_stl/internal/stl_rw_common.h - - SOURCES += \ - ../src/gmio_stl/stl_format.c \ - ../src/gmio_stl/stla_read.c \ - ../src/gmio_stl/stla_write.c \ - ../src/gmio_stl/stlb_read.c \ - ../src/gmio_stl/stlb_write.c \ - \ - ../src/gmio_stl/internal/stlb_byte_swap.c \ - ../src/gmio_stl/internal/stl_rw_common.c - - libstl_inc.path = $$PREFIX_DIR/include/gmio_stl - libstl_inc.files = ../src/gmio_stl/*.h - INSTALLS += libstl_inc -} # contains(GMIO, stl) - -# libSupport -HAS_SUPPORT = $$find(GMIO, support) -!isEmpty(HAS_SUPPORT) { - HEADERS += ../src/gmio_support/support_global.h - dll:DEFINES += GMIO_LIBSUPPORT_DLL \ - GMIO_LIBSUPPORT_MAKE_DLL - support_inc.path = $$PREFIX_DIR/include/gmio_support - support_inc.files = ../src/gmio_support/support_global.h - INSTALLS += support_inc -} # !isEmpty(HAS_SUPPORT) - -# qt_support -contains(GMIO, qt_support) { - qt_support_inc.path = $$PREFIX_DIR/include/gmio_support - qt_support_inc.files = ../src/gmio_support/qt_stream.h - INSTALLS += qt_support_inc -} # contains(GMIO, qt_support) - -# occ_support -contains(GMIO, occ_support) { - occ_support_inc.path = $$PREFIX_DIR/include/gmio_support - occ_support_inc.files = ../src/gmio_support/occ_libstl.h - INSTALLS += occ_support_inc -} # contains(GMIO, occ_support) - -#VER_MAJ = 0 -#VER_MIN = 1 -#VER_PAT = 0 - -OTHER_FILES += \ - ../doc/main_page.cpp \ - ../doc/Doxyfile \ - \ - ../src/gmio_core/config.h.cmake