cleanup: remove precompiled headers
we don't need them and they even tend to increase build times due to unnecessary compound-includes at some core headers
This commit is contained in:
parent
121a1b038d
commit
89a9202c6c
42 changed files with 10 additions and 165 deletions
|
|
@ -333,13 +333,6 @@ def defineBuildTargets(env, artifacts):
|
|||
We use a custom function to declare a whole tree of srcfiles.
|
||||
"""
|
||||
|
||||
# use PCH to speed up building // disabled for now due to strange failures
|
||||
# env['GCH'] = ( env.PrecompiledHeader('src/pre.hpp')
|
||||
# + env.PrecompiledHeader('src/pre_a.hpp')
|
||||
# )
|
||||
|
||||
|
||||
|
||||
lLib = env.SharedLibrary('lumiera', srcSubtree(env,'src/lib'), install=True)
|
||||
lApp = env.SharedLibrary('lumieracommon', srcSubtree(env,'src/common'), install=True, LIBS=lLib)
|
||||
lBack = env.SharedLibrary('lumierabackend', srcSubtree(env,'src/backend'),install=True)
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
#define LUMIERA_FRAMEID_H
|
||||
|
||||
|
||||
#include <boost/operators.hpp>
|
||||
|
||||
namespace lumiera {
|
||||
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@
|
|||
#ifndef LIB_MAYBE_H
|
||||
#define LIB_MAYBE_H
|
||||
|
||||
//#include "pre.hpp"
|
||||
#include "lib/error.hpp"
|
||||
//#include "lib/wrapper.hpp"
|
||||
#include "lib/util.hpp"
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@
|
|||
#ifndef LIB_RESULT_H
|
||||
#define LIB_RESULT_H
|
||||
|
||||
//#include "pre.hpp"
|
||||
#include "lib/error.hpp"
|
||||
#include "lib/wrapper.hpp"
|
||||
#include "lib/util.hpp"
|
||||
|
|
|
|||
|
|
@ -46,7 +46,6 @@
|
|||
#ifndef LIB_SIMPLE_ALLOCATOR_H
|
||||
#define LIB_SIMPLE_ALLOCATOR_H
|
||||
|
||||
//#include "pre.hpp"
|
||||
#include "lib/error.hpp"
|
||||
#include "lib/meta/generator.hpp"
|
||||
#include "lib/meta/typelist-util.hpp"
|
||||
|
|
|
|||
|
|
@ -36,15 +36,12 @@
|
|||
#ifndef TESTHELPER_RUN_H
|
||||
#define TESTHELPER_RUN_H
|
||||
|
||||
#include "pre.hpp"
|
||||
|
||||
|
||||
#include "proc/common.hpp"
|
||||
#include "include/logging.h"
|
||||
|
||||
#include "lib/test/suite.hpp"
|
||||
#include "lib/util.hpp"
|
||||
|
||||
#include <vector>
|
||||
#include <string>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -66,7 +66,6 @@
|
|||
#ifndef LIB_TYPED_ALLOCATION_MANAGER_H
|
||||
#define LIB_TYPED_ALLOCATION_MANAGER_H
|
||||
|
||||
//#include "pre.hpp"
|
||||
#include "lib/error.hpp"
|
||||
#include "lib/format.hpp"
|
||||
#include "lib/typed-counter.hpp"
|
||||
|
|
|
|||
|
|
@ -56,7 +56,6 @@
|
|||
#ifndef LIB_TYPED_COUNTER_H
|
||||
#define LIB_TYPED_COUNTER_H
|
||||
|
||||
//#include "pre.hpp"
|
||||
#include "lib/error.hpp"
|
||||
#include "lib/sync-classlock.hpp"
|
||||
|
||||
|
|
|
|||
51
src/pre.hpp
51
src/pre.hpp
|
|
@ -1,51 +0,0 @@
|
|||
/*
|
||||
PRE.hpp - precompiled header collection
|
||||
|
||||
|
||||
Copyright (C) Lumiera.org
|
||||
2008, Christian Thaeter <ct@pipapo.org>
|
||||
Hermann Vosseler <Ichthyostega@web.de>
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License as
|
||||
published by the Free Software Foundation; either version 2 of
|
||||
the License, or (at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
|
||||
*/
|
||||
|
||||
/** @file pre.hpp
|
||||
** Precompiled Header Collection.
|
||||
** Assortment of standard util, error handling and basic lib-boost components,
|
||||
** frequently used in conjunction. Precompiling these can speedup building
|
||||
** significantly. When used, this header should be included prior to any other
|
||||
** headers (and it needs to be compiled by gcc into a "pre.gch" file prior to
|
||||
** building the object files including this header).
|
||||
**
|
||||
** @see mobject.hpp usage example
|
||||
** @see pre_a.hpp precompiled header including Asset subsystem
|
||||
*/
|
||||
|
||||
#ifndef LUMIERA_PRE_HPP
|
||||
#define LUMIERA_PRE_HPP
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <map>
|
||||
#include <tr1/memory>
|
||||
#include <tr1/functional>
|
||||
#include <boost/format.hpp>
|
||||
|
||||
#include "proc/common.hpp"
|
||||
|
||||
|
||||
|
||||
#endif /*LUMIERA_PRE_HPP*/
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
/*
|
||||
PRE_A.hpp - precompiled header (including assets)
|
||||
|
||||
|
||||
Copyright (C) Lumiera.org
|
||||
2008, Christian Thaeter <ct@pipapo.org>
|
||||
Hermann Vosseler <Ichthyostega@web.de>
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License as
|
||||
published by the Free Software Foundation; either version 2 of
|
||||
the License, or (at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
|
||||
*/
|
||||
|
||||
/** @file pre.hpp
|
||||
** Precompiled Header including Asset subsystem.
|
||||
** Assortment of standard util, error handling and basic lib-boost components,
|
||||
** together with the basic asset.hpp.
|
||||
**
|
||||
** @see pre.hpp
|
||||
*/
|
||||
|
||||
#ifndef LUMIERA_PRE_A_HPP
|
||||
#define LUMIERA_PRE_A_HPP
|
||||
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <map>
|
||||
#include <tr1/memory>
|
||||
#include <tr1/functional>
|
||||
#include <boost/format.hpp>
|
||||
|
||||
#include "proc/common.hpp"
|
||||
#include "proc/asset.hpp"
|
||||
|
||||
|
||||
#endif /*LUMIERA_PRE_A_HPP*/
|
||||
|
|
@ -55,9 +55,9 @@
|
|||
#define PROC_INTERFACE_ASSET_H
|
||||
|
||||
|
||||
#include "proc/asset/category.hpp"
|
||||
#include "include/logging.h"
|
||||
#include "lib/error.hpp"
|
||||
#include "include/logging.h"
|
||||
#include "proc/asset/category.hpp"
|
||||
#include "lib/p.hpp"
|
||||
|
||||
#include <boost/type_traits/is_base_of.hpp>
|
||||
|
|
|
|||
|
|
@ -25,11 +25,9 @@
|
|||
#define ASSET_DB_H
|
||||
|
||||
|
||||
#include "pre_a.hpp"
|
||||
|
||||
#include "lib/sync.hpp"
|
||||
#include "proc/asset.hpp"
|
||||
#include "lib/error.hpp"
|
||||
#include "proc/asset.hpp"
|
||||
|
||||
#include <tr1/memory>
|
||||
#include <tr1/unordered_map>
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@
|
|||
* *****************************************************/
|
||||
|
||||
|
||||
#include "pre.hpp"
|
||||
#include "lib/error.hpp"
|
||||
#include "proc/common.hpp"
|
||||
#include "proc/assetmanager.hpp"
|
||||
#include "proc/asset/media.hpp"
|
||||
#include "proc/asset/clip.hpp"
|
||||
|
|
|
|||
|
|
@ -35,8 +35,6 @@
|
|||
#ifndef ASSET_MEDIA_H
|
||||
#define ASSET_MEDIA_H
|
||||
|
||||
#include "pre_a.hpp"
|
||||
|
||||
#include "proc/asset.hpp"
|
||||
#include "lib/factory.hpp"
|
||||
#include "lib/time/timevalue.hpp"
|
||||
|
|
|
|||
|
|
@ -58,8 +58,6 @@
|
|||
#ifndef ASSET_META_H
|
||||
#define ASSET_META_H
|
||||
|
||||
#include "pre_a.hpp"
|
||||
|
||||
#include "proc/asset.hpp"
|
||||
#include "proc/asset/entry-id.hpp"
|
||||
#include "lib/factory.hpp"
|
||||
|
|
|
|||
|
|
@ -35,8 +35,6 @@
|
|||
#ifndef ASSET_PROC_H
|
||||
#define ASSET_PROC_H
|
||||
|
||||
#include "pre_a.hpp"
|
||||
|
||||
#include "proc/asset.hpp"
|
||||
#include "lib/factory.hpp"
|
||||
#include "lib/streamtype.hpp"
|
||||
|
|
|
|||
|
|
@ -57,8 +57,6 @@
|
|||
#ifndef ASSET_STRUCT_H
|
||||
#define ASSET_STRUCT_H
|
||||
|
||||
#include "pre_a.hpp"
|
||||
|
||||
#include "proc/asset.hpp"
|
||||
#include "lib/query.hpp"
|
||||
#include "lib/factory.hpp"
|
||||
|
|
|
|||
|
|
@ -38,8 +38,6 @@
|
|||
#define PROC_INTERFACE_ASSETMANAGER_H
|
||||
|
||||
|
||||
#include "pre_a.hpp"
|
||||
|
||||
#include "proc/asset.hpp"
|
||||
#include "lib/error.hpp"
|
||||
#include "lib/singleton.hpp"
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
** the primary Proc-Layer namespaces
|
||||
**
|
||||
** @see main.cpp
|
||||
** @see pre.hpp
|
||||
**
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -67,7 +67,6 @@
|
|||
#ifndef CONTROL_COMMAND_CLOSURE_H
|
||||
#define CONTROL_COMMAND_CLOSURE_H
|
||||
|
||||
//#include "pre.hpp"
|
||||
#include "lib/bool-checkable.hpp"
|
||||
#include "lib/meta/typelist.hpp"
|
||||
#include "lib/meta/function.hpp"
|
||||
|
|
|
|||
|
|
@ -53,7 +53,6 @@
|
|||
#ifndef CONTROL_COMMAND_DEF_H
|
||||
#define CONTROL_COMMAND_DEF_H
|
||||
|
||||
//#include "pre.hpp"
|
||||
#include "lib/error.hpp"
|
||||
#include "include/logging.h"
|
||||
#include "lib/symbol.hpp"
|
||||
|
|
|
|||
|
|
@ -46,7 +46,6 @@
|
|||
#ifndef CONTROL_COMMAND_INVOCACTION_H
|
||||
#define CONTROL_COMMAND_INVOCACTION_H
|
||||
|
||||
//#include "pre.hpp"
|
||||
#include "proc/control/command.hpp"
|
||||
#include "proc/control/handling-pattern.hpp"
|
||||
#include "proc/control/argument-tuple-accept.hpp"
|
||||
|
|
|
|||
|
|
@ -45,7 +45,6 @@
|
|||
#ifndef CONTROL_COMMAND_MUTATION_H
|
||||
#define CONTROL_COMMAND_MUTATION_H
|
||||
|
||||
//#include "pre.hpp"
|
||||
#include "lib/error.hpp"
|
||||
#include "lib/bool-checkable.hpp"
|
||||
#include "proc/control/command-closure.hpp"
|
||||
|
|
|
|||
|
|
@ -57,7 +57,6 @@
|
|||
#ifndef CONTROL_COMMAND_REGISTRY_H
|
||||
#define CONTROL_COMMAND_REGISTRY_H
|
||||
|
||||
//#include "pre.hpp"
|
||||
#include "lib/error.hpp"
|
||||
#include "lib/singleton.hpp"
|
||||
#include "lib/sync.hpp"
|
||||
|
|
|
|||
|
|
@ -46,7 +46,6 @@
|
|||
#ifndef CONTROL_COMMAND_SIGNATURE_H
|
||||
#define CONTROL_COMMAND_SIGNATURE_H
|
||||
|
||||
//#include "pre.hpp"
|
||||
#include "lib/meta/function.hpp"
|
||||
#include "lib/meta/typelist.hpp"
|
||||
#include "lib/meta/typelist-manip.hpp"
|
||||
|
|
|
|||
|
|
@ -52,9 +52,9 @@
|
|||
#ifndef CONTROL_COMMAND_H
|
||||
#define CONTROL_COMMAND_H
|
||||
|
||||
#include "pre.hpp"
|
||||
#include "lib/error.hpp"
|
||||
#include "lib/symbol.hpp"
|
||||
#include "proc/common.hpp"
|
||||
#include "proc/control/argument-erasure.hpp"
|
||||
#include "proc/control/argument-tuple-accept.hpp"
|
||||
#include "proc/control/handling-pattern.hpp"
|
||||
|
|
|
|||
|
|
@ -44,7 +44,6 @@
|
|||
#ifndef CONTROL_HANDLING_PATTERN_H
|
||||
#define CONTROL_HANDLING_PATTERN_H
|
||||
|
||||
//#include "pre.hpp"
|
||||
#include "lib/error.hpp"
|
||||
#include "lib/symbol.hpp"
|
||||
#include "lib/bool-checkable.hpp"
|
||||
|
|
|
|||
|
|
@ -42,7 +42,6 @@
|
|||
#ifndef CONTROL_HANDLING_PATTERNS_DEF_H
|
||||
#define CONTROL_HANDLING_PATTERNS_DEF_H
|
||||
|
||||
//#include "pre.hpp"
|
||||
#include "lib/error.hpp"
|
||||
#include "lib/multifact.hpp"
|
||||
#include "proc/control/handling-pattern.hpp"
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@
|
|||
#ifndef CONTROL_PROC_DISPATCHER_H
|
||||
#define CONTROL_PROC_DISPATCHER_H
|
||||
|
||||
//#include "pre.hpp"
|
||||
//#include "lib/symbol.hpp"
|
||||
#include "proc/control/command.hpp"
|
||||
#include "lib/singleton.hpp"
|
||||
|
|
|
|||
|
|
@ -40,8 +40,7 @@
|
|||
#ifndef ENGINE_PROCNODE_H
|
||||
#define ENGINE_PROCNODE_H
|
||||
|
||||
#include "pre.hpp"
|
||||
|
||||
#include "lib/error.hpp"
|
||||
#include "proc/common.hpp"
|
||||
#include "proc/state.hpp"
|
||||
#include "proc/asset/proc.hpp"
|
||||
|
|
|
|||
|
|
@ -59,7 +59,6 @@
|
|||
#ifndef MOBJECT_MOBJECT_REF_H
|
||||
#define MOBJECT_MOBJECT_REF_H
|
||||
|
||||
//#include "pre.hpp"
|
||||
#include "lib/handle.hpp"
|
||||
#include "proc/mobject/placement.hpp"
|
||||
#include "proc/mobject/placement-ref.hpp"
|
||||
|
|
|
|||
|
|
@ -24,9 +24,6 @@
|
|||
#ifndef MOBJECT_MOBJECT_H
|
||||
#define MOBJECT_MOBJECT_H
|
||||
|
||||
#include "pre.hpp"
|
||||
|
||||
|
||||
#include "proc/common.hpp"
|
||||
#include "proc/mobject/builder/buildertool.hpp"
|
||||
#include "proc/mobject/placement.hpp"
|
||||
|
|
|
|||
|
|
@ -65,7 +65,6 @@
|
|||
#ifndef MOBJECT_PLACEMENT_REF_H
|
||||
#define MOBJECT_PLACEMENT_REF_H
|
||||
|
||||
//#include "pre.hpp"
|
||||
#include "lib/error.hpp"
|
||||
#include "lib/bool-checkable.hpp"
|
||||
#include "proc/mobject/placement.hpp"
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@
|
|||
#ifndef MOBJECT_PLACEMENT_H
|
||||
#define MOBJECT_PLACEMENT_H
|
||||
|
||||
#include "pre.hpp"
|
||||
#include "lib/error.hpp"
|
||||
#include "lib/hash-indexed.hpp"
|
||||
#include "lib/time/timevalue.hpp"
|
||||
#include "proc/mobject/session/locatingpin.hpp"
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
* *****************************************************/
|
||||
|
||||
|
||||
//#include "pre.hpp"
|
||||
#include "proc/mobject/session/placement-index-query-resolver.hpp"
|
||||
#include "proc/mobject/session/scope-query.hpp"
|
||||
#include "proc/mobject/placement.hpp"
|
||||
|
|
|
|||
|
|
@ -56,7 +56,6 @@
|
|||
#ifndef MOBJECT_SESSION_PLACEMENT_INDEX_QUERY_RESOLVER_H
|
||||
#define MOBJECT_SESSION_PLACEMENT_INDEX_QUERY_RESOLVER_H
|
||||
|
||||
//#include "pre.hpp"
|
||||
#include "proc/mobject/session/placement-index.hpp"
|
||||
#include "proc/mobject/session/query-resolver.hpp"
|
||||
#include "proc/mobject/session/scope-query.hpp"
|
||||
|
|
|
|||
|
|
@ -105,7 +105,6 @@
|
|||
#ifndef MOBJECT_PLACEMENT_INDEX_H
|
||||
#define MOBJECT_PLACEMENT_INDEX_H
|
||||
|
||||
//#include "pre.hpp"
|
||||
#include "lib/util.hpp"
|
||||
#include "lib/error.hpp"
|
||||
#include "lib/itertools.hpp"
|
||||
|
|
|
|||
|
|
@ -25,9 +25,7 @@
|
|||
#define PROC_INTERFACE_STATE_H
|
||||
|
||||
|
||||
#include "pre.hpp"
|
||||
|
||||
#include "proc/common.hpp"
|
||||
#include "lib/error.hpp"
|
||||
#include "lib/frameid.hpp"
|
||||
#include "proc/engine/buffhandle.hpp"
|
||||
|
||||
|
|
|
|||
|
|
@ -25,11 +25,7 @@
|
|||
#define ASSET_TESTASSET_H
|
||||
|
||||
|
||||
#include "pre_a.hpp"
|
||||
|
||||
#include "proc/asset.hpp"
|
||||
//#include "lib/util.hpp"
|
||||
|
||||
|
||||
#include <boost/format.hpp>
|
||||
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@
|
|||
#ifndef COMMAND_TEST_DUMMY_COMMANDS_H
|
||||
#define COMMAND_TEST_DUMMY_COMMANDS_H
|
||||
|
||||
//#include "pre.hpp"
|
||||
#include "lib/error.hpp"
|
||||
#include "lib/test/test-helper.hpp"
|
||||
|
||||
|
|
|
|||
|
|
@ -21,8 +21,6 @@
|
|||
* *****************************************************/
|
||||
|
||||
|
||||
#include "pre_a.hpp"
|
||||
|
||||
#include "lib/test/run.hpp"
|
||||
#include "lib/util.hpp"
|
||||
|
||||
|
|
|
|||
|
|
@ -21,8 +21,6 @@
|
|||
* *****************************************************/
|
||||
|
||||
|
||||
#include "pre_a.hpp"
|
||||
|
||||
#include "lib/test/run.hpp"
|
||||
#include "lib/symbol.hpp"
|
||||
#include "lib/query.hpp"
|
||||
|
|
|
|||
Loading…
Reference in a new issue