fix link error

reuben1990 · Feb 21, 2015 · 896e809 · 896e809
1 parent 2b2c645
commit 896e809
Show file tree

Hide file tree

Showing 63 changed files with 995 additions and 247 deletions.
diff --git a/build/proj_mac/OpenGLView.h b/build/proj_mac/OpenGLView.h
@@ -9,7 +9,7 @@
 #ifndef proj_mac_TinyOpenGLView_h
 #define proj_mac_TinyOpenGLView_h
 
-#import <OpenGL/gl.h>
+#import <OpenGL/gl3.h>
 #import <Cocoa/Cocoa.h>
 #import <Foundation/Foundation.h>
 #include "TinyMouse.h"

diff --git a/build/proj_mac/OpenGLView.mm b/build/proj_mac/OpenGLView.mm
@@ -1,4 +1,4 @@
-//
+ //
 //  OpenGLView.m
 //  proj_mac
 //

diff --git a/build/proj_mac/TinyMacRenderWindow.h b/build/proj_mac/TinyMacRenderWindow.h
@@ -22,7 +22,7 @@ namespace Tiny
         TinyMacRenderWindow(OpenGLView* glView);
         ~TinyMacRenderWindow();
         virtual void preRender();
-        virtual void swapBuffers();
+        virtual void swapBuffer();
     protected:
         OpenGLView* mGLView;
     };

diff --git a/build/proj_mac/TinyMacRenderWindow.mm b/build/proj_mac/TinyMacRenderWindow.mm
@@ -21,8 +21,9 @@
 
     }
 
-    void TinyMacRenderWindow::swapBuffers()
+    void TinyMacRenderWindow::swapBuffer()
     {
+        TINYLOG("swap buffer");
         [[mGLView openGLContext] flushBuffer];
     }
 

diff --git a/build/proj_mac/TinyResourceManager_mac.mm b/build/proj_mac/TinyResourceManager_mac.mm
@@ -6,9 +6,9 @@
 //  Copyright (c) 2015 reuben chao. All rights reserved.
 //
 
-#include <stdio.h>
-#include "TinyResourceManager.h"
+#include <cstdio>
 #import <Foundation/Foundation.h>
+#include "TinyResourceManager.h"
 #include "TinyPlatform.h"
 
 namespace Tiny
@@ -32,7 +32,6 @@
             uint8* bytes = (uint8*)[fileData bytes];
             memcpy(*data, bytes, dataLength);
             *data[dataLength] = '\0';
-            free(fileData);
         }
     }
 }
diff --git a/build/proj_mac/proj_mac.xcodeproj/project.pbxproj b/build/proj_mac/proj_mac.xcodeproj/project.pbxproj
@@ -643,7 +643,7 @@
 					"$(PROJECT_DIR)/../../sample",
 					"$(PROJECT_DIR)",
 				);
-				INFOPLIST_FILE = proj_mac/Info.plist;
+				INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -663,7 +663,7 @@
 					"$(PROJECT_DIR)/../../sample",
 					"$(PROJECT_DIR)",
 				);
-				INFOPLIST_FILE = proj_mac/Info.plist;
+				INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};

diff --git a/...codeproj/project.xcworkspace/xcuserdata/reuben.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/reuben.xcuserdatad/UserInterfaceState.xcuserstate