actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compiles and links. Try at your own risk.

Browse Source
This commit is contained in:
Jason Felds
2013-02-10 20:38:14 -05:00
parent eaad585fa8
commit 591bbae070
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Xcode/stepmania_xcode4.3.xcodeproj/project.pbxproj
+24
View File
@@ -23,6 +23,14 @@
/* Begin PBXBuildFile section */
1215D7A208C6559A00B87D8B /* ScreenGameplayNormal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1215D7A008C6559A00B87D8B /* ScreenGameplayNormal.cpp */; };
2B01A79616C881E500D5CFD2 /* RageDisplay_OGL_Helpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B01A79216C881E500D5CFD2 /* RageDisplay_OGL_Helpers.cpp */; };
2B01A79716C881E500D5CFD2 /* RageDisplay_OGL_Helpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B01A79216C881E500D5CFD2 /* RageDisplay_OGL_Helpers.cpp */; };
2B01A79816C881E500D5CFD2 /* RageDisplay_OGL_Helpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B01A79316C881E500D5CFD2 /* RageDisplay_OGL_Helpers.h */; };
2B01A79916C881E500D5CFD2 /* RageDisplay_OGL_Helpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B01A79316C881E500D5CFD2 /* RageDisplay_OGL_Helpers.h */; };
2B01A79A16C881E500D5CFD2 /* RageDisplay_OGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B01A79416C881E500D5CFD2 /* RageDisplay_OGL.cpp */; };
2B01A79B16C881E500D5CFD2 /* RageDisplay_OGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B01A79416C881E500D5CFD2 /* RageDisplay_OGL.cpp */; };
2B01A79C16C881E500D5CFD2 /* RageDisplay_OGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B01A79516C881E500D5CFD2 /* RageDisplay_OGL.h */; };
2B01A79D16C881E500D5CFD2 /* RageDisplay_OGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B01A79516C881E500D5CFD2 /* RageDisplay_OGL.h */; };
2B17AB7713980FF6001AE57D /* png.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BC6130D13773C8E00CC8BBD /* png.c */; };
2B17AB7813980FF6001AE57D /* png.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BC6130E13773C8E00CC8BBD /* png.h */; };
2B17AB7913980FF6001AE57D /* pngconf.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BC6130F13773C8E00CC8BBD /* pngconf.h */; };
@@ -1907,6 +1915,10 @@
1215D7A108C6559A00B87D8B /* ScreenGameplayNormal.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; name = ScreenGameplayNormal.h; path = ../src/ScreenGameplayNormal.h; sourceTree = "<group>"; };
29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
2B01A79216C881E500D5CFD2 /* RageDisplay_OGL_Helpers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RageDisplay_OGL_Helpers.cpp; path = ../src/RageDisplay_OGL_Helpers.cpp; sourceTree = "<group>"; };
2B01A79316C881E500D5CFD2 /* RageDisplay_OGL_Helpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RageDisplay_OGL_Helpers.h; path = ../src/RageDisplay_OGL_Helpers.h; sourceTree = "<group>"; };
2B01A79416C881E500D5CFD2 /* RageDisplay_OGL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RageDisplay_OGL.cpp; path = ../src/RageDisplay_OGL.cpp; sourceTree = "<group>"; };
2B01A79516C881E500D5CFD2 /* RageDisplay_OGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RageDisplay_OGL.h; path = ../src/RageDisplay_OGL.h; sourceTree = "<group>"; };
2B17AB7213980FDF001AE57D /* libpng-1.5.1-sm5.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libpng-1.5.1-sm5.a"; sourceTree = BUILT_PRODUCTS_DIR; };
2B17ABC013981521001AE57D /* libglew-sm5.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libglew-sm5.a"; sourceTree = BUILT_PRODUCTS_DIR; };
2B17ABE013981756001AE57D /* libpcre-sm5.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libpcre-sm5.a"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -3962,6 +3974,10 @@
AA6EFD7004770A7C005F316C /* RageDisplay.h */,
AAF7458E061181F700B19AD1 /* RageDisplay_Null.cpp */,
AAF7458F061181F700B19AD1 /* RageDisplay_Null.h */,
2B01A79216C881E500D5CFD2 /* RageDisplay_OGL_Helpers.cpp */,
2B01A79316C881E500D5CFD2 /* RageDisplay_OGL_Helpers.h */,
2B01A79416C881E500D5CFD2 /* RageDisplay_OGL.cpp */,
2B01A79516C881E500D5CFD2 /* RageDisplay_OGL.h */,
AA6EFD7204770A7C005F316C /* RageException.cpp */,
AA6EFD7304770A7C005F316C /* RageException.h */,
AA272C3004CD757100D02EE9 /* RageFile.cpp */,
@@ -5441,6 +5457,8 @@
2B9C2E90137A138B004C92F3 /* NotesWriterJson.h in Headers */,
2B43509513949F37006FA051 /* TimingSegments.h in Headers */,
B773AE6E140AAB1800C68DDD /* SpecialDirs.h in Headers */,
2B01A79816C881E500D5CFD2 /* RageDisplay_OGL_Helpers.h in Headers */,
2B01A79C16C881E500D5CFD2 /* RageDisplay_OGL.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -5846,6 +5864,8 @@
AA6C6B110DC6B48C00E7A13E /* InputHandler_MacOSX_HID.h in Headers */,
AAC0BFE40E2951EC00F56EEB /* CryptHelpers.h in Headers */,
AAFF41A60F5BD4AD00FFDB67 /* ScreenOptionsExportPackage.h in Headers */,
2B01A79916C881E500D5CFD2 /* RageDisplay_OGL_Helpers.h in Headers */,
2B01A79D16C881E500D5CFD2 /* RageDisplay_OGL.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -6845,6 +6865,8 @@
B773AE6D140AAB1800C68DDD /* SpecialDirs.cpp in Sources */,
B7845BC3154051B6000DFDA8 /* ScreenEdit.cpp in Sources */,
B7845BC5154052CB000DFDA8 /* RageUtil.cpp in Sources */,
2B01A79616C881E500D5CFD2 /* RageDisplay_OGL_Helpers.cpp in Sources */,
2B01A79A16C881E500D5CFD2 /* RageDisplay_OGL.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -7233,6 +7255,8 @@
AA6C6B100DC6B48C00E7A13E /* InputHandler_MacOSX_HID.cpp in Sources */,
AAC0BFE30E2951EC00F56EEB /* CryptHelpers.cpp in Sources */,
AAFF41A50F5BD4AD00FFDB67 /* ScreenOptionsExportPackage.cpp in Sources */,
2B01A79716C881E500D5CFD2 /* RageDisplay_OGL_Helpers.cpp in Sources */,
2B01A79B16C881E500D5CFD2 /* RageDisplay_OGL.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
src/arch/LowLevelWindow/LowLevelWindow_MacOSX.mm
+2 -1
View File
@@ -3,6 +3,7 @@
#import "DisplayResolutions.h"
#import "RageUtil.h"
#import "RageThreads.h"
#import "RageDisplay_OGL_Helpers.h"
#import "arch/ArchHooks/ArchHooks.h"
#import <Cocoa/Cocoa.h>
@@ -256,7 +257,7 @@ void RenderTarget_MacOSX::Create( const RenderTargetParam &param, int &iTextureW
iTextureWidth, iTextureHeight, 0, param.bWithAlpha? GL_RGBA:GL_RGB,
GL_UNSIGNED_BYTE, NULL );
GLenum error = glGetError();
ASSERT_M( error == GL_NO_ERROR, RageDisplay_Legacy_Helpers::GLToString(error) );
ASSERT_M(error == GL_NO_ERROR, RageDisplay_Legacy_Helpers::GLToString(error));
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );