From c0ac5c4023fee9b14da5221acc3ced5a740d7f3c Mon Sep 17 00:00:00 2001 From: Joshua Moerman Date: Tue, 27 Dec 2011 12:18:59 +0100 Subject: [PATCH] Using c++11 --- AwesomeAttract0r.xcodeproj/project.pbxproj | 51 ++++++++++++++-------- array.hpp | 24 ---------- batch.sh | 2 +- 3 files changed, 35 insertions(+), 42 deletions(-) delete mode 100644 array.hpp diff --git a/AwesomeAttract0r.xcodeproj/project.pbxproj b/AwesomeAttract0r.xcodeproj/project.pbxproj index 031ed98..c3e8278 100644 --- a/AwesomeAttract0r.xcodeproj/project.pbxproj +++ b/AwesomeAttract0r.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 45; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -14,7 +14,7 @@ 01C5704313B63BBE009D151B /* Projection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C5704013B63BBE009D151B /* Projection.cpp */; }; 01C5704413B63BBE009D151B /* Normalizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 01C5704213B63BBE009D151B /* Normalizer.cpp */; }; 01C5707E13B63CF9009D151B /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 01C5707D13B63CF9009D151B /* libpng.a */; }; - 427057AE147571FC00CBE978 /* libboost_program_options.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 427057AD147571FC00CBE978 /* libboost_program_options.a */; }; + 4214149414A9D9B6004016D6 /* libboost_program_options.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4214149314A9D9B6004016D6 /* libboost_program_options.dylib */; }; 8DD76F650486A84900D96B5E /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08FB7796FE84155DC02AAC07 /* main.cpp */; settings = {ATTRIBUTES = (); }; }; /* End PBXBuildFile section */ @@ -57,13 +57,12 @@ 01C5704213B63BBE009D151B /* Normalizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Normalizer.cpp; path = projectors/Normalizer.cpp; sourceTree = ""; }; 01C5707D13B63CF9009D151B /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = /usr/local/lib/libpng.a; sourceTree = ""; }; 08FB7796FE84155DC02AAC07 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = ""; }; + 4214149314A9D9B6004016D6 /* libboost_program_options.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libboost_program_options.dylib; path = /usr/local/lib/libboost_program_options.dylib; sourceTree = ""; }; 427057A61475637B00CBE978 /* Canvas.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Canvas.hpp; sourceTree = ""; }; 427057A71475637B00CBE978 /* Image.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Image.hpp; sourceTree = ""; }; 427057A81475637B00CBE978 /* ImageFormatBMP.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ImageFormatBMP.hpp; sourceTree = ""; }; 427057A91475637B00CBE978 /* ImageFormatPNG.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ImageFormatPNG.hpp; sourceTree = ""; }; 427057AB1475637B00CBE978 /* Tonemapper.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Tonemapper.hpp; sourceTree = ""; }; - 427057AC1475654E00CBE978 /* array.hpp */ = {isa = PBXFileReference; fileEncoding = 4; path = array.hpp; sourceTree = ""; }; - 427057AD147571FC00CBE978 /* libboost_program_options.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libboost_program_options.a; path = ../../../../../usr/local/lib/libboost_program_options.a; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -71,8 +70,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 4214149414A9D9B6004016D6 /* libboost_program_options.dylib in Frameworks */, 01C5707E13B63CF9009D151B /* libpng.a in Frameworks */, - 427057AE147571FC00CBE978 /* libboost_program_options.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -109,8 +108,7 @@ 08FB7795FE84155DC02AAC07 /* Source */, C6859E8C029090F304C91782 /* Documentation */, 1AB674ADFE9D54B511CA2CBB /* Products */, - 01C5707D13B63CF9009D151B /* libpng.a */, - 427057AD147571FC00CBE978 /* libboost_program_options.a */, + 4214149214A9D983004016D6 /* Libs */, ); name = AwesomeAttract0r; sourceTree = ""; @@ -118,7 +116,6 @@ 08FB7795FE84155DC02AAC07 /* Source */ = { isa = PBXGroup; children = ( - 427057AC1475654E00CBE978 /* array.hpp */, 427057A61475637B00CBE978 /* Canvas.hpp */, 427057A71475637B00CBE978 /* Image.hpp */, 427057A81475637B00CBE978 /* ImageFormatBMP.hpp */, @@ -147,6 +144,15 @@ name = Products; sourceTree = ""; }; + 4214149214A9D983004016D6 /* Libs */ = { + isa = PBXGroup; + children = ( + 4214149314A9D9B6004016D6 /* libboost_program_options.dylib */, + 01C5707D13B63CF9009D151B /* libpng.a */, + ); + name = Libs; + sourceTree = ""; + }; 427057A5147562DB00CBE978 /* Projectors */ = { isa = PBXGroup; children = ( @@ -193,8 +199,11 @@ /* Begin PBXProject section */ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; + attributes = { + LastUpgradeCheck = 0420; + }; buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "AwesomeAttract0r" */; - compatibilityVersion = "Xcode 3.1"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -234,15 +243,16 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_CXX_LIBRARY = "libc++"; GCC_AUTO_VECTORIZATION = YES; GCC_DEBUGGING_SYMBOLS = full; GCC_FAST_MATH = YES; GCC_OPTIMIZATION_LEVEL = 3; HEADER_SEARCH_PATHS = /usr/local/include; - LIBRARY_SEARCH_PATHS = "/usr/local/lib//**"; + LIBRARY_SEARCH_PATHS = /usr/local/lib; ONLY_ACTIVE_ARCH = YES; - PREBINDING = NO; - SDKROOT = macosx10.6; + SDKROOT = macosx; WARNING_CFLAGS = ( "-Wall", "-Wextra", @@ -256,10 +266,13 @@ ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; INSTALL_PATH = /usr/local/bin; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/../../../Downloads/boost_1_47_0/stage/lib\"", + ); PRODUCT_NAME = AwesomeAttract0r; }; name = "Release with Symbols"; @@ -270,10 +283,13 @@ ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; INSTALL_PATH = /usr/local/bin; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/../../../Downloads/boost_1_47_0/stage/lib\"", + ); PRODUCT_NAME = AwesomeAttract0r; }; name = Debug; @@ -282,12 +298,13 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_CXX_LIBRARY = "libc++"; GCC_OPTIMIZATION_LEVEL = 0; HEADER_SEARCH_PATHS = /usr/local/include; - LIBRARY_SEARCH_PATHS = "/usr/local/lib//**"; + LIBRARY_SEARCH_PATHS = /usr/local/lib; ONLY_ACTIVE_ARCH = YES; - PREBINDING = NO; - SDKROOT = macosx10.6; + SDKROOT = macosx; WARNING_CFLAGS = ( "-Wall", "-Wextra", diff --git a/array.hpp b/array.hpp deleted file mode 100644 index 10a89c4..0000000 --- a/array.hpp +++ /dev/null @@ -1,24 +0,0 @@ -// -// array.hpp -// AwesomeAttractorND -// -// Created by Joshua Moerman on 11/2/11. -// Copyright 2011 Vadovas. All rights reserved. -// - -#ifndef AwesomeAttractorND_array_hpp -#define AwesomeAttractorND_array_hpp - -// workaround to easily work in xcode :D - -#ifndef __APPLE__ -#include -#include -#else -#include -namespace std { - using tr1::array; -} -#endif - -#endif diff --git a/batch.sh b/batch.sh index 46d9a67..c597739 100755 --- a/batch.sh +++ b/batch.sh @@ -1,2 +1,2 @@ #!/bin/bash -while true; do ./build/Debug/AwesomeAttract0r -P ./render/ -I 50 -W 1280 -H 800 -f attractors/emptyUnravel3D.stf; done +while true; do ./build/Debug/AwesomeAttract0r -P ./render/ -I 20 -W 1280 -H 800 -f attractors/emptyUnravel3D.stf; done