Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: pizthewiz/Cinder
...
head fork: pizthewiz/Cinder
Checking mergeability… Don't worry, you can still create the pull request.
  • 8 commits
  • 8 files changed
  • 0 commit comments
  • 3 contributors
Commits on Mar 02, 2013
@pizthewiz upgrade compatibility to 3.2 to avoid warning
the entire appRewrite branch requires 4.4 as it is, so there really isn't a backward compatibility issue to contend with. additionally new tinderbox-created projects opened in 4.6 (possibly earlier too) will display a warning to upgrade, might as well save the trouble directly from the source.
cf4c64d
@safetydank safetydank Added headers required to build Matrix44 in VC11 6c68b85
@pizthewiz normalize and modernize template settings
standardize language code, bundle identifier reverse-DNS format, bundle versions, copyright year and application icon.
9e74214
Commits on Mar 03, 2013
@andrewfb andrewfb Merge pull request #305 from safetydank/appRewrite
Added headers required to build Matrix44 in VC11
cba339a
@andrewfb andrewfb Merge pull request #306 from pizthewiz/xcode-templates
normalize and update Xcode templates
c401763
@andrewfb andrewfb Adding DEBUG=1 to XCode foundation project preprocessor macros 4eaac2e
@andrewfb andrewfb Merging 263a269
@andrewfb andrewfb Registering thread with garbage collector in ci::ThreadSetup on Mac a3b0b6a
View
12 blocks/__AppTemplates/BasicApp/OpenGL/xcode/Info.plist
@@ -3,23 +3,29 @@
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
- <string>English</string>
+ <string>en</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIconFile</key>
<string>CinderApp.icns</string>
<key>CFBundleIdentifier</key>
- <string>org.libcinder._TBOX_PREFIX_</string>
+ <string>org.libcinder.${PRODUCT_NAME:rfc1034identifier}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>1.0</string>
+ <string>1</string>
+ <key>LSMinimumSystemVersion</key>
+ <string>${MACOSX_DEPLOYMENT_TARGET}</string>
+ <key>NSHumanReadableCopyright</key>
+ <string>Copyright © 2013 __MyCompanyName__. All rights reserved.</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
View
4 blocks/__AppTemplates/BasicApp/OpenGL/xcode_ios/Info.plist
@@ -24,7 +24,7 @@
</dict>
</dict>
<key>CFBundleIdentifier</key>
- <string>dongle.${PRODUCT_NAME:rfc1034identifier}</string>
+ <string>org.libcinder.${PRODUCT_NAME:rfc1034identifier}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
@@ -36,7 +36,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>1.0</string>
+ <string>1</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSMainNibFile</key>
View
6 blocks/__AppTemplates/CocoaView/OpenGL/xcode/Info.plist
@@ -7,9 +7,9 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIconFile</key>
- <string></string>
+ <string>CinderApp.icns</string>
<key>CFBundleIdentifier</key>
- <string>libcinder.org.${PRODUCT_NAME:rfc1034identifier}</string>
+ <string>org.libcinder.${PRODUCT_NAME:rfc1034identifier}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
@@ -25,7 +25,7 @@
<key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
<key>NSHumanReadableCopyright</key>
- <string>Copyright © 2012 __MyCompanyName__. All rights reserved.</string>
+ <string>Copyright © 2013 __MyCompanyName__. All rights reserved.</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
View
6 blocks/__AppTemplates/ScreenSaver/OpenGL/xcode/Info.plist
@@ -5,13 +5,13 @@
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundleDevelopmentRegion</key>
- <string>English</string>
+ <string>en</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
- <string>com.yourcompany.${PRODUCT_NAME:identifier}</string>
+ <string>org.libcinder.${PRODUCT_NAME:rfc1034identifier}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
@@ -19,7 +19,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>1.0</string>
+ <string>1</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>NSPrincipalClass</key>
View
6 blocks/__AppTemplates/__Foundation/xcode/project.pbxproj
@@ -159,7 +159,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "_TBOX_PREFIX_" */;
- compatibilityVersion = "Xcode 3.1";
+ compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
@@ -207,6 +207,10 @@
GCC_DYNAMIC_NO_PIC = NO;
GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ "DEBUG=1",
+ "$(inherited)",
+ );
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = _TBOX_PREFIX__Prefix.pch;
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
View
2  blocks/__AppTemplates/__Foundation/xcode_ios/project.pbxproj
@@ -157,7 +157,7 @@
00692BC614FF149000D0A05E /* Project object */ = {
isa = PBXProject;
buildConfigurationList = 00692BC914FF149000D0A05E /* Build configuration list for PBXProject "_TBOX_PREFIX_" */;
- compatibilityVersion = "Xcode 3.1";
+ compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
View
4 include/cinder/Matrix44.h
@@ -27,6 +27,10 @@
#include "cinder/CinderMath.h"
#include "cinder/Vector.h"
+#include "cinder/Matrix22.h"
+#include "cinder/Matrix33.h"
+#include "cinder/MatrixAffine2.h"
+
#include <iomanip>
namespace cinder {
View
6 include/cinder/Thread.h
@@ -26,6 +26,9 @@
#if defined( CINDER_COCOA )
#include "cinder/cocoa/CinderCocoa.h"
#endif
+#if defined( CINDER_MAC )
+ #include <objc/objc-auto.h>
+#endif
#if (defined( _MSC_VER ) && ( _MSC_VER >= 1700 )) || defined( _LIBCPP_VERSION )
#include <thread>
@@ -63,6 +66,9 @@ namespace cinder {
class ThreadSetup {
public:
ThreadSetup() {
+#if defined( CINDER_MAC )
+ objc_registerThreadWithCollector();
+#endif
}
~ThreadSetup() {

No commit comments for this range

Something went wrong with that request. Please try again.