Skip to content

64bit compatibility on osx #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

64bit compatibility on osx #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b2636d
update pugixml to version 1.6, remove glut - using glfw, make it comp…
i-n-g-o May 31, 2015
9a5af8a
use standard way to create the window
i-n-g-o Jun 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 15 additions & 37 deletions projectGenerator.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
archiveVersion = 1;
classes = {
};
objectVersion = 42;
objectVersion = 44;
objects = {

/* Begin PBXBuildFile section */
1120712114AE3D360035CB7E /* libpugixml_d.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1120712014AE3D360035CB7E /* libpugixml_d.a */; };
1120713014AE3D4F0035CB7E /* xcodeProject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1120712B14AE3D4F0035CB7E /* xcodeProject.cpp */; };
1120713614AE3D840035CB7E /* ofAddon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1120713414AE3D840035CB7E /* ofAddon.cpp */; };
113CAA5C14F88EDD00D3906E /* Utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 113CAA5914F88EDD00D3906E /* Utils.cpp */; };
Expand All @@ -27,8 +26,6 @@
27C4A1BF179491920031C6E4 /* ofxSlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27C4A1B4179491920031C6E4 /* ofxSlider.cpp */; };
27C4A1C0179491920031C6E4 /* ofxSliderGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27C4A1B6179491920031C6E4 /* ofxSliderGroup.cpp */; };
27C4A1C1179491920031C6E4 /* ofxToggle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27C4A1B8179491920031C6E4 /* ofxToggle.cpp */; };
667FEFA41982A58D0061271D /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 667FEFA31982A58D0061271D /* CoreVideo.framework */; };
BBAB23CB13894F3D00AA2426 /* GLUT.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = BBAB23BE13894E4700AA2426 /* GLUT.framework */; };
E4328149138ABC9F0047C5CB /* openFrameworksDebug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E4328148138ABC890047C5CB /* openFrameworksDebug.a */; };
E45BE97B0E8CC7DD009D7055 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9710E8CC7DD009D7055 /* AGL.framework */; };
E45BE97C0E8CC7DD009D7055 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9720E8CC7DD009D7055 /* ApplicationServices.framework */; };
Expand All @@ -38,13 +35,13 @@
E45BE9800E8CC7DD009D7055 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9760E8CC7DD009D7055 /* CoreFoundation.framework */; };
E45BE9810E8CC7DD009D7055 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9770E8CC7DD009D7055 /* CoreServices.framework */; };
E45BE9830E8CC7DD009D7055 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9790E8CC7DD009D7055 /* OpenGL.framework */; };
E45BE9840E8CC7DD009D7055 /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE97A0E8CC7DD009D7055 /* QuickTime.framework */; };
E4B69E200A3A1BDC003C02F2 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */; };
E4B69E210A3A1BDC003C02F2 /* testApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */; };
E4C2424710CC5A17004149E2 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424410CC5A17004149E2 /* AppKit.framework */; };
E4C2424810CC5A17004149E2 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424510CC5A17004149E2 /* Cocoa.framework */; };
E4C2424910CC5A17004149E2 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424610CC5A17004149E2 /* IOKit.framework */; };
E4EB6799138ADC1D00A09F29 /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBAB23BE13894E4700AA2426 /* GLUT.framework */; };
F59021A91B1B161F0073F41E /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F59021A81B1B161F0073F41E /* CoreVideo.framework */; };
F59021B01B1B1DC30073F41E /* pugixml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F59021AF1B1B1DC30073F41E /* pugixml.cpp */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -71,14 +68,12 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
BBAB23CB13894F3D00AA2426 /* GLUT.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
1120712014AE3D360035CB7E /* libpugixml_d.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpugixml_d.a; path = lib/libpugixml_d.a; sourceTree = "<group>"; };
1120712214AE3D410035CB7E /* foreach.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = foreach.hpp; path = src/pugixmlLib/contrib/foreach.hpp; sourceTree = SOURCE_ROOT; };
1120712414AE3D4F0035CB7E /* baseProject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = baseProject.h; sourceTree = "<group>"; };
1120712B14AE3D4F0035CB7E /* xcodeProject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xcodeProject.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -120,8 +115,6 @@
27C4A1B7179491920031C6E4 /* ofxSliderGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxSliderGroup.h; sourceTree = "<group>"; };
27C4A1B8179491920031C6E4 /* ofxToggle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxToggle.cpp; sourceTree = "<group>"; };
27C4A1B9179491920031C6E4 /* ofxToggle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxToggle.h; sourceTree = "<group>"; };
667FEFA31982A58D0061271D /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
BBAB23BE13894E4700AA2426 /* GLUT.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLUT.framework; path = ../../../libs/glut/lib/osx/GLUT.framework; sourceTree = "<group>"; };
E4328143138ABC890047C5CB /* openFrameworksLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = openFrameworksLib.xcodeproj; path = ../../../libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj; sourceTree = SOURCE_ROOT; };
E45BE9710E8CC7DD009D7055 /* AGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGL.framework; path = /System/Library/Frameworks/AGL.framework; sourceTree = "<absolute>"; };
E45BE9720E8CC7DD009D7055 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; };
Expand All @@ -142,15 +135,16 @@
E4C2424610CC5A17004149E2 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
E4EB691F138AFCF100A09F29 /* CoreOF.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = CoreOF.xcconfig; path = ../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig; sourceTree = SOURCE_ROOT; };
E4EB6923138AFD0F00A09F29 /* Project.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Project.xcconfig; sourceTree = "<group>"; };
F59021A81B1B161F0073F41E /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
F59021AF1B1B1DC30073F41E /* pugixml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pugixml.cpp; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
E4B69B590A3A1756003C02F2 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
667FEFA41982A58D0061271D /* CoreVideo.framework in Frameworks */,
E4EB6799138ADC1D00A09F29 /* GLUT.framework in Frameworks */,
F59021A91B1B161F0073F41E /* CoreVideo.framework in Frameworks */,
E4328149138ABC9F0047C5CB /* openFrameworksDebug.a in Frameworks */,
E45BE97B0E8CC7DD009D7055 /* AGL.framework in Frameworks */,
E45BE97C0E8CC7DD009D7055 /* ApplicationServices.framework in Frameworks */,
Expand All @@ -160,11 +154,9 @@
E45BE9800E8CC7DD009D7055 /* CoreFoundation.framework in Frameworks */,
E45BE9810E8CC7DD009D7055 /* CoreServices.framework in Frameworks */,
E45BE9830E8CC7DD009D7055 /* OpenGL.framework in Frameworks */,
E45BE9840E8CC7DD009D7055 /* QuickTime.framework in Frameworks */,
E4C2424710CC5A17004149E2 /* AppKit.framework in Frameworks */,
E4C2424810CC5A17004149E2 /* Cocoa.framework in Frameworks */,
E4C2424910CC5A17004149E2 /* IOKit.framework in Frameworks */,
1120712114AE3D360035CB7E /* libpugixml_d.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -230,7 +222,6 @@
119B95D214A65CA0001E1E20 /* pugixmlLib */ = {
isa = PBXGroup;
children = (
1120712014AE3D360035CB7E /* libpugixml_d.a */,
119B95D514A65CA0001E1E20 /* src */,
);
path = pugixmlLib;
Expand All @@ -239,6 +230,7 @@
119B95D514A65CA0001E1E20 /* src */ = {
isa = PBXGroup;
children = (
F59021AF1B1B1DC30073F41E /* pugixml.cpp */,
1120712214AE3D410035CB7E /* foreach.hpp */,
119B95D714A65CA0001E1E20 /* pugiconfig.hpp */,
119B95D814A65CA0001E1E20 /* pugixml.hpp */,
Expand Down Expand Up @@ -300,6 +292,7 @@
BBAB23C913894ECA00AA2426 /* system frameworks */ = {
isa = PBXGroup;
children = (
F59021A81B1B161F0073F41E /* CoreVideo.framework */,
E4C2424410CC5A17004149E2 /* AppKit.framework */,
E4C2424510CC5A17004149E2 /* Cocoa.framework */,
E4C2424610CC5A17004149E2 /* IOKit.framework */,
Expand All @@ -316,14 +309,6 @@
name = "system frameworks";
sourceTree = "<group>";
};
BBAB23CA13894EDB00AA2426 /* 3rd party frameworks */ = {
isa = PBXGroup;
children = (
BBAB23BE13894E4700AA2426 /* GLUT.framework */,
);
name = "3rd party frameworks";
sourceTree = "<group>";
};
E4328144138ABC890047C5CB /* Products */ = {
isa = PBXGroup;
children = (
Expand All @@ -335,7 +320,6 @@
E45BE5980E8CC70C009D7055 /* frameworks */ = {
isa = PBXGroup;
children = (
BBAB23CA13894EDB00AA2426 /* 3rd party frameworks */,
BBAB23C913894ECA00AA2426 /* system frameworks */,
);
name = frameworks;
Expand All @@ -344,7 +328,6 @@
E4B69B4A0A3A1720003C02F2 = {
isa = PBXGroup;
children = (
667FEFA31982A58D0061271D /* CoreVideo.framework */,
E4B6FCAD0C3E899E008CF71C /* openFrameworks-Info.plist */,
E4EB6923138AFD0F00A09F29 /* Project.xcconfig */,
E4B69E1C0A3A1BDC003C02F2 /* src */,
Expand Down Expand Up @@ -485,6 +468,7 @@
27C4A1BE179491920031C6E4 /* ofxPanel.cpp in Sources */,
27C4A1BF179491920031C6E4 /* ofxSlider.cpp in Sources */,
27C4A1C0179491920031C6E4 /* ofxSliderGroup.cpp in Sources */,
F59021B01B1B1DC30073F41E /* pugixml.cpp in Sources */,
27C4A1C1179491920031C6E4 /* ofxToggle.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -504,7 +488,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = E4EB6923138AFD0F00A09F29 /* Project.xcconfig */;
buildSettings = {
ARCHS = "$(NATIVE_ARCH)";
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CONFIGURATION_BUILD_DIR = "$(SRCROOT)/bin/";
COPY_PHASE_STRIP = NO;
DEAD_CODE_STRIPPING = YES;
Expand All @@ -531,7 +515,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = E4EB6923138AFD0F00A09F29 /* Project.xcconfig */;
buildSettings = {
ARCHS = "$(NATIVE_ARCH)";
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CONFIGURATION_BUILD_DIR = "$(SRCROOT)/bin/";
COPY_PHASE_STRIP = YES;
DEAD_CODE_STRIPPING = YES;
Expand Down Expand Up @@ -563,6 +547,7 @@
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
/Users/inx/Documents/_src/openFrameworks_orig/libs/glut/lib/osx,
);
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../libs/glut/lib/osx\"";
GCC_DYNAMIC_NO_PIC = NO;
Expand Down Expand Up @@ -638,14 +623,10 @@
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_52)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
"$(PROJECT_DIR)/src/pugixmlLib/lib",
);
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/src/pugixmlLib\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/src/pugixmlLib/lib\"";
OTHER_CPLUSPLUSFLAGS = (
"-D__MACOSX_CORE__",
"-lpthread",
"-DMAKE_IOS",
);
PREBINDING = NO;
PRODUCT_NAME = "$(TARGET_NAME)Debug";
WRAPPER_EXTENSION = app;
Expand All @@ -659,6 +640,7 @@
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
/Users/inx/Documents/_src/openFrameworks_orig/libs/glut/lib/osx,
);
FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../libs/glut/lib/osx\"";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
Expand Down Expand Up @@ -733,14 +715,10 @@
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_51)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
"$(PROJECT_DIR)/src/pugixmlLib/lib",
);
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/src/pugixmlLib\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/src/pugixmlLib/lib\"";
OTHER_CPLUSPLUSFLAGS = (
"-D__MACOSX_CORE__",
"-lpthread",
"-DMAKE_IOS",
);
PREBINDING = NO;
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
Expand Down
13 changes: 3 additions & 10 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
#include "ofMain.h"
#include "testApp.h"
#include "ofAppGlutWindow.h"
#include "ofAppNoWindow.h"


//========================================================================
int main( int argc, char *argv[] ){


ofAppGlutWindow window;
ofSetupOpenGL(&window, 1024, 610, OF_WINDOW);
testApp * app = new testApp;
//app->buildAllExamples = false;
ofRunApp( app );

ofSetupOpenGL(1024,610,OF_WINDOW);
ofRunApp(new testApp());
}
Loading