Commit f344835a authored by Jonathan Marten's avatar Jonathan Marten
Browse files

Eliminate "config.h", only two options in it were actually used

And even those are probably obsolete by now.
parent 0e021842
......@@ -79,6 +79,7 @@ find_package(Canberra)
# ALSA is an optional dependency
find_package(ALSA)
# TODO: this test is probably obsolete by now
include(CheckCXXSourceCompiles)
check_cxx_source_compiles("
#include <memory>
......@@ -89,8 +90,6 @@ check_cxx_source_compiles("
int main() { std::tr1::shared_ptr<int> p; return 0; }
" HAVE_STD_TR1_SHARED_PTR)
configure_file (config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
####################################################################################################
########### compile definitions ####################################################################
####################################################################################################
......@@ -108,6 +107,14 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kmix\")
add_definitions(-DKMIX_VERSION=\"${KMIX_VERSION}\")
add_definitions(-DKMIX_CONFIG_VERSION=${KMIX_CONFIG_VERSION})
if (HAVE_STD_SHARED_PTR)
add_definitions(-DHAVE_STD_SHARED_PTR)
else (HAVE_STD_SHARED_PTR)
if (HAVE_STD_TR1_SHARED_PTR)
add_definitions(-DHAVE_STD_TR1_SHARED_PTR)
endif (HAVE_STD_TR1_SHARED_PTR)
endif (HAVE_STD_SHARED_PTR)
if (ALSA_FOUND)
set(HAVE_LIBASOUND2 TRUE)
add_definitions(-DHAVE_LIBASOUND2)
......
......@@ -22,8 +22,6 @@
#define KMIXD_H
#include <config.h>
// Qt
#include <QDBusContext>
#include <QString>
......
......@@ -21,8 +21,6 @@
#ifndef KMIXWINDOW_H
#define KMIXWINDOW_H
#include <config.h>
// Qt
#include <qboxlayout.h>
#include <qtimer.h>
......
......@@ -22,8 +22,6 @@
/* This code is being #include'd from mixer.cpp */
#include <config.h>
#include "mixer_backend.h"
#include "core/mixer.h"
......
/* config.h. Generated by cmake from config.h.cmake */
/* Don't add anything new here!!! Use per-directory generated files. */
/* Define if you ogg/vorbis installed */
#cmakedefine HAVE_VORBIS ${OGGVORBIS_VERSION}
/* Define to 1 if you have the <machine/endian.h> header file. */
#cmakedefine HAVE_MACHINE_ENDIAN_H 1
/* Define to 1 if you have the <endian.h> header file. */
#cmakedefine HAVE_SYS_ENDIAN_H 1
/* Define to 1 if you have the <sys/endian.h> header file. */
#cmakedefine HAVE_ENDIAN_H 1
/* Define to 1 if you have the <unistd.h> header file. */
#cmakedefine HAVE_UNISTD_H 1
/* Define to 1 if <tr1/memory> exists and defines std::tr1::shared_ptr. */
#cmakedefine HAVE_STD_TR1_SHARED_PTR 1
/* Define to 1 if <memory> exists and defines std::shared_ptr. */
#cmakedefine HAVE_STD_SHARED_PTR 1
......@@ -22,8 +22,6 @@
#ifndef CONTROL_POOL_H
#define CONTROL_POOL_H
#include <config.h>
#if defined(HAVE_STD_SHARED_PTR)
#include <memory>
using std::shared_ptr;
......
......@@ -21,7 +21,6 @@
#ifndef MASTERCONTROL_H_
#define MASTERCONTROL_H_
#include <config.h>
#include "kmixcore_export.h"
#if defined(HAVE_STD_SHARED_PTR)
......
......@@ -21,8 +21,6 @@
#ifndef MixDevice_h
#define MixDevice_h
#include <config.h>
#if defined(HAVE_STD_SHARED_PTR)
#include <memory>
using std::shared_ptr;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment