From 13a0597ab629b07aaba2c21875611b115b124084 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 8 Feb 2013 12:17:35 -0800 Subject: [PATCH] dynamic header for GLUT include --- interface/CMakeLists.txt | 14 ++++++++++---- interface/InterfaceConfig.h.in | 14 ++++++++++++++ interface/src/Cube.h | 2 +- interface/src/Field.h | 6 +----- interface/src/Finger.h | 2 +- interface/src/Hand.h | 2 +- interface/src/Head.h | 2 +- interface/src/Lattice.h | 2 +- interface/src/Oscilloscope.h | 2 +- interface/src/Particle.h | 2 +- interface/src/SerialInterface.h | 2 +- interface/src/Texture.cpp | 6 +----- interface/src/Texture.h | 6 +----- interface/src/Util.cpp | 6 +----- interface/src/main.cpp | 8 +------- 15 files changed, 37 insertions(+), 39 deletions(-) create mode 100644 interface/InterfaceConfig.h.in diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 26d4247b5e..118c10ba82 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -2,14 +2,20 @@ cmake_minimum_required(VERSION 2.8) project(interface) -file(GLOB INTERFACE_SRCS src/*.cpp src/*.h) - -add_executable(interface ${INTERFACE_SRCS}) - if (APPLE) set(CMAKE_EXE_LINKER_FLAGS "-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework CoreServices -framework Carbon") + set(GLUT_HEADER_INCLUDE "") +else (APPLE) + set(GLUT_HEADER_INCLUDE "") endif (APPLE) +configure_file(InterfaceConfig.h.in ${PROJECT_BINARY_DIR}/includes/InterfaceConfig.h) + +file(GLOB INTERFACE_SRCS src/*.cpp src/*.h) +include_directories(${PROJECT_BINARY_DIR}/includes) + +add_executable(interface ${INTERFACE_SRCS}) + find_package(OpenGL REQUIRED) find_package(GLUT REQUIRED) find_package(GLM REQUIRED) diff --git a/interface/InterfaceConfig.h.in b/interface/InterfaceConfig.h.in new file mode 100644 index 0000000000..435c3eef7a --- /dev/null +++ b/interface/InterfaceConfig.h.in @@ -0,0 +1,14 @@ +// +// InterfaceConfig.h +// interface +// +// Created by Stephen Birarda on 2/8/13. +// Copyright (c) 2013 High Fidelity, Inc.. All rights reserved. +// + +#ifndef interface__InterfaceConfig__ +#define interface__InterfaceConfig__ + +#include @GLUT_HEADER_INCLUDE@ + +#endif diff --git a/interface/src/Cube.h b/interface/src/Cube.h index 405c7c0f6f..3b3c0481ce 100644 --- a/interface/src/Cube.h +++ b/interface/src/Cube.h @@ -12,7 +12,7 @@ #include #include "Util.h" #include "world.h" -#include +#include "InterfaceConfig.h" #include class VoxelSystem { diff --git a/interface/src/Field.h b/interface/src/Field.h index 76aaab5420..13a73b27c7 100644 --- a/interface/src/Field.h +++ b/interface/src/Field.h @@ -9,11 +9,7 @@ #ifndef __interface__Field__ #define __interface__Field__ -#ifdef __APPLE__ -#include -#else -#include -#endif +#include "InterfaceConfig.h" #include #include "world.h" #include "Util.h" diff --git a/interface/src/Finger.h b/interface/src/Finger.h index 7e1d15742a..694eec9e33 100644 --- a/interface/src/Finger.h +++ b/interface/src/Finger.h @@ -12,7 +12,7 @@ #include #include "Util.h" #include "world.h" -#include +#include "InterfaceConfig.h" #include diff --git a/interface/src/Hand.h b/interface/src/Hand.h index 448bf7823a..694fb5eb03 100644 --- a/interface/src/Hand.h +++ b/interface/src/Hand.h @@ -14,7 +14,7 @@ #include "Util.h" #include "Field.h" #include "world.h" -#include +#include "InterfaceConfig.h" const float RADIUS_RANGE = 10.0; diff --git a/interface/src/Head.h b/interface/src/Head.h index ec4a78e4f4..762c471ca8 100644 --- a/interface/src/Head.h +++ b/interface/src/Head.h @@ -12,7 +12,7 @@ #include #include "Field.h" #include "world.h" -#include +#include "InterfaceConfig.h" #include "SerialInterface.h" enum eyeContactTargets {LEFT_EYE, RIGHT_EYE, MOUTH}; diff --git a/interface/src/Lattice.h b/interface/src/Lattice.h index 4099f1488c..82d56cc7ae 100644 --- a/interface/src/Lattice.h +++ b/interface/src/Lattice.h @@ -12,7 +12,7 @@ #include #include "Util.h" #include "world.h" -#include +#include "InterfaceConfig.h" #include class Lattice { diff --git a/interface/src/Oscilloscope.h b/interface/src/Oscilloscope.h index d4ce9f04c5..51b918f095 100644 --- a/interface/src/Oscilloscope.h +++ b/interface/src/Oscilloscope.h @@ -12,7 +12,7 @@ #include #include "Util.h" #include "World.h" -#include +#include "InterfaceConfig.h" #include class Oscilloscope { diff --git a/interface/src/Particle.h b/interface/src/Particle.h index b3b1895013..36c6099f93 100644 --- a/interface/src/Particle.h +++ b/interface/src/Particle.h @@ -12,7 +12,7 @@ #include #include "Util.h" #include "world.h" -#include +#include "InterfaceConfig.h" class ParticleSystem { public: diff --git a/interface/src/SerialInterface.h b/interface/src/SerialInterface.h index e8d3ec9412..879ef63494 100644 --- a/interface/src/SerialInterface.h +++ b/interface/src/SerialInterface.h @@ -9,7 +9,7 @@ #include #include "util.h" #include "world.h" -#include +#include "InterfaceConfig.h" #include // These includes are for serial port reading/writing diff --git a/interface/src/Texture.cpp b/interface/src/Texture.cpp index 2e6bd782f3..d7fc2c9a26 100644 --- a/interface/src/Texture.cpp +++ b/interface/src/Texture.cpp @@ -8,11 +8,7 @@ #include "Texture.h" -#ifdef __APPLE__ -#include -#else -#include -#endif +#include "InterfaceConfig.h" #include #include #include diff --git a/interface/src/Texture.h b/interface/src/Texture.h index d9cfabf497..34bd88ffc4 100644 --- a/interface/src/Texture.h +++ b/interface/src/Texture.h @@ -10,11 +10,7 @@ #define __interface__Texture__ #include -#ifdef __APPLE__ -#include -#else -#include -#endif +#include "InterfaceConfig.h" int load_png_as_texture(char* filename); diff --git a/interface/src/Util.cpp b/interface/src/Util.cpp index 80d299b577..58512fa10a 100644 --- a/interface/src/Util.cpp +++ b/interface/src/Util.cpp @@ -6,11 +6,7 @@ // Copyright (c) 2012 High Fidelity, Inc. All rights reserved. // -#ifdef __APPLE__ -#include -#else -#include -#endif +#include "InterfaceConfig.h" #include #include "world.h" #include diff --git a/interface/src/main.cpp b/interface/src/main.cpp index 51c26242d9..b451f16c5c 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -16,13 +16,9 @@ //#define MARKER_CAPTURE // yep. -#ifdef __APPLE__ -#include +#include "InterfaceConfig.h" #include #include -#else -#include -#endif #include #include #include @@ -38,8 +34,6 @@ #include #include -// Bring in OpenCV - #include "SerialInterface.h" #include "Field.h" #include "world.h"