Skip to content

L
libSDL
Commit 3be3a8db authored by Sam Lantinga's avatar Sam Lantinga
Browse files
Options

Fixed building on iPhone 

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%404295
parent 98880125
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 12381 deletions
Xcode-iPhoneOS/Template/SDL Application/___PROJECTNAME___.xcodeproj/hfutrell.pbxuser deleted 100644 → 0
View file @ 98880125
// !$*UTF8*$!
{
1D6058900D05DD3D006BFB54 /* ___PROJECTNAME___ */ = {
activeExec = 0;
executables = (
FD92E3970E15A188001244C8 /* ___PROJECTNAME___ */,
);
};
29B97313FDCFA39411CA2CEA /* Project object */ = {
activeBuildConfigurationName = Debug;
activeExecutable = FD92E3970E15A188001244C8 /* ___PROJECTNAME___ */;
activeTarget = 1D6058900D05DD3D006BFB54 /* ___PROJECTNAME___ */;
addToTargets = (
1D6058900D05DD3D006BFB54 /* ___PROJECTNAME___ */,
);
codeSenseManager = FD92E3A60E15A18E001244C8 /* Code sense */;
executables = (
FD92E3970E15A188001244C8 /* ___PROJECTNAME___ */,
);
perUserDictionary = {
PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = {
PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
PBXFileTableDataSourceColumnWidthsKey = (
20,
455,
20,
48,
43,
43,
20,
);
PBXFileTableDataSourceColumnsKey = (
PBXFileDataSource_FiletypeID,
PBXFileDataSource_Filename_ColumnID,
PBXFileDataSource_Built_ColumnID,
PBXFileDataSource_ObjectSize_ColumnID,
PBXFileDataSource_Errors_ColumnID,
PBXFileDataSource_Warnings_ColumnID,
PBXFileDataSource_Target_ColumnID,
);
};
PBXConfiguration.PBXTargetDataSource.PBXTargetDataSource = {
PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
PBXFileTableDataSourceColumnWidthsKey = (
20,
415,
60,
20,
48,
43,
43,
);
PBXFileTableDataSourceColumnsKey = (
PBXFileDataSource_FiletypeID,
PBXFileDataSource_Filename_ColumnID,
PBXTargetDataSource_PrimaryAttribute,
PBXFileDataSource_Built_ColumnID,
PBXFileDataSource_ObjectSize_ColumnID,
PBXFileDataSource_Errors_ColumnID,
PBXFileDataSource_Warnings_ColumnID,
);
};
PBXPerProjectTemplateStateSaveDate = 240783190;
PBXWorkspaceStateSaveDate = 240783190;
};
perUserProjectItems = {
FD779EEC0E26BA5E00F39101 /* PlistBookmark */ = FD779EEC0E26BA5E00F39101 /* PlistBookmark */;
FD779EEE0E26BA5E00F39101 /* PlistBookmark */ = FD779EEE0E26BA5E00F39101 /* PlistBookmark */;
FD77A0870E26BDCE00F39101 /* PBXBookmark */ = FD77A0870E26BDCE00F39101 /* PBXBookmark */;
FD77A0880E26BDCE00F39101 /* PBXBookmark */ = FD77A0880E26BDCE00F39101 /* PBXBookmark */;
FD77A08B0E26BDCE00F39101 /* PBXBookmark */ = FD77A08B0E26BDCE00F39101 /* PBXBookmark */;
FD77A08C0E26BDCE00F39101 /* PBXBookmark */ = FD77A08C0E26BDCE00F39101 /* PBXBookmark */;
FD77A0A00E26BE0800F39101 /* PBXTextBookmark */ = FD77A0A00E26BE0800F39101 /* PBXTextBookmark */;
FDB8BFF00E5A0F6F00980157 /* PBXTextBookmark */ = FDB8BFF00E5A0F6F00980157 /* PBXTextBookmark */;
};
sourceControlManager = FD92E3A50E15A18E001244C8 /* Source Control */;
userBuildSettings = {
};
};
FD779EEC0E26BA5E00F39101 /* PlistBookmark */ = {
isa = PlistBookmark;
fRef = 8D1107310486CEB800E47090 /* Info.plist */;
fallbackIsa = PBXBookmark;
isK = 0;
kPath = (
CFBundleSignature,
);
name = /Users/hfutrell/iPhoneSource/gsoc2008_iphone/XCodeiPhoneOS/SDLiPhoneOS/template/SDLApplicationTemplate/Info.plist;
rLen = 0;
rLoc = 2147483647;
};
FD779EEE0E26BA5E00F39101 /* PlistBookmark */ = {
isa = PlistBookmark;
fRef = 8D1107310486CEB800E47090 /* Info.plist */;
fallbackIsa = PBXBookmark;
isK = 0;
kPath = (
CFBundleSignature,
);
name = /Users/hfutrell/iPhoneSource/gsoc2008_iphone/XCodeiPhoneOS/SDLiPhoneOS/template/SDLApplicationTemplate/Info.plist;
rLen = 0;
rLoc = 2147483647;
};
FD77A0870E26BDCE00F39101 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = FD77A07C0E26BD8C00F39101 /* Icon.png */;
};
FD77A0880E26BDCE00F39101 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = FD77A07E0E26BDA900F39101 /* Default.png */;
};
FD77A08B0E26BDCE00F39101 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = FD77A07C0E26BD8C00F39101 /* Icon.png */;
};
FD77A08C0E26BDCE00F39101 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = FD77A07E0E26BDA900F39101 /* Default.png */;
};
FD77A09C0E26BDE500F39101 /* main.c */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {633, 1148}}";
sepNavSelRange = "{240, 0}";
sepNavVisRange = "{0, 587}";
};
};
FD77A0A00E26BE0800F39101 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = FD77A09C0E26BDE500F39101 /* main.c */;
name = "main.c: 15";
rLen = 0;
rLoc = 240;
rType = 0;
vrLen = 587;
vrLoc = 0;
};
FD92E3970E15A188001244C8 /* ___PROJECTNAME___ */ = {
isa = PBXExecutable;
activeArgIndices = (
);
argumentStrings = (
);
autoAttachOnCrash = 1;
breakpointsEnabled = 0;
configStateDict = {
};
customDataFormattersEnabled = 1;
debuggerPlugin = GDBDebugging;
disassemblyDisplayState = 0;
dylibVariantSuffix = "";
enableDebugStr = 1;
environmentEntries = (
);
executableSystemSymbolLevel = 0;
executableUserSymbolLevel = 0;
libgmallocEnabled = 0;
name = "___PROJECTNAME___";
savedGlobals = {
};
sourceDirectories = (
);
};
FD92E3A50E15A18E001244C8 /* Source Control */ = {
isa = PBXSourceControlManager;
fallbackIsa = XCSourceControlManager;
isSCMEnabled = 0;
scmConfiguration = {
};
};
FD92E3A60E15A18E001244C8 /* Code sense */ = {
isa = PBXCodeSenseManager;
indexTemplatePath = "";
};
FDB8BFF00E5A0F6F00980157 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = FD77A09C0E26BDE500F39101 /* main.c */;
name = "main.c: 15";
rLen = 0;
rLoc = 240;
rType = 0;
vrLen = 587;
vrLoc = 0;
};
}
src/video/SDL_renderer_gles.c
View file @ 3be3a8db
...@@ -646,6 +646,8 @@ static int ...@@ -646,6 +646,8 @@ static int
GLES_RenderPoints(SDL_Renderer * renderer, const SDL_Point * points, int count) GLES_RenderPoints(SDL_Renderer * renderer, const SDL_Point * points, int count)
{ {
GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata; GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
int i;
GLshort *vertices;
GLES_SetBlendMode(data, renderer->blendMode, 1); GLES_SetBlendMode(data, renderer->blendMode, 1);
...@@ -654,10 +656,16 @@ GLES_RenderPoints(SDL_Renderer * renderer, const SDL_Point * points, int count) ...@@ -654,10 +656,16 @@ GLES_RenderPoints(SDL_Renderer * renderer, const SDL_Point * points, int count)
(GLfloat) renderer->b * inv255f, (GLfloat) renderer->b * inv255f,
(GLfloat) renderer->a * inv255f); (GLfloat) renderer->a * inv255f);
data->glVertexPointer(2, GL_INT, 0, points); vertices = SDL_stack_alloc(GLshort, count*2);
for (i = 0; i < count; ++i) {
vertices[2*i+0] = (GLshort)points[i].x;
vertices[2*i+1] = (GLshort)points[i].y;
}
data->glVertexPointer(2, GL_SHORT, 0, vertices);
data->glEnableClientState(GL_VERTEX_ARRAY); data->glEnableClientState(GL_VERTEX_ARRAY);
data->glDrawArrays(GL_POINTS, 0, count); data->glDrawArrays(GL_POINTS, 0, count);
data->glDisableClientState(GL_VERTEX_ARRAY); data->glDisableClientState(GL_VERTEX_ARRAY);
SDL_stack_free(vertices);
return 0; return 0;
} }
...@@ -666,6 +674,8 @@ static int ...@@ -666,6 +674,8 @@ static int
GLES_RenderLines(SDL_Renderer * renderer, const SDL_Point * points, int count) GLES_RenderLines(SDL_Renderer * renderer, const SDL_Point * points, int count)
{ {
GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata; GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
int i;
GLshort *vertices;
GLES_SetBlendMode(data, renderer->blendMode, 1); GLES_SetBlendMode(data, renderer->blendMode, 1);
...@@ -674,7 +684,12 @@ GLES_RenderLines(SDL_Renderer * renderer, const SDL_Point * points, int count) ...@@ -674,7 +684,12 @@ GLES_RenderLines(SDL_Renderer * renderer, const SDL_Point * points, int count)
(GLfloat) renderer->b * inv255f, (GLfloat) renderer->b * inv255f,
(GLfloat) renderer->a * inv255f); (GLfloat) renderer->a * inv255f);
data->glVertexPointer(2, GL_INT, 0, points); vertices = SDL_stack_alloc(GLshort, count*2);
for (i = 0; i < count; ++i) {
vertices[2*i+0] = (GLshort)points[i].x;
vertices[2*i+1] = (GLshort)points[i].y;
}
data->glVertexPointer(2, GL_SHORT, 0, vertices);
data->glEnableClientState(GL_VERTEX_ARRAY); data->glEnableClientState(GL_VERTEX_ARRAY);
if (count > 2 && if (count > 2 &&
points[0].x == points[count-1].x && points[0].y == points[count-1].y) { points[0].x == points[count-1].x && points[0].y == points[count-1].y) {
...@@ -685,6 +700,7 @@ GLES_RenderLines(SDL_Renderer * renderer, const SDL_Point * points, int count) ...@@ -685,6 +700,7 @@ GLES_RenderLines(SDL_Renderer * renderer, const SDL_Point * points, int count)
data->glDrawArrays(GL_LINE_STRIP, 0, count); data->glDrawArrays(GL_LINE_STRIP, 0, count);
} }
data->glDisableClientState(GL_VERTEX_ARRAY); data->glDisableClientState(GL_VERTEX_ARRAY);
SDL_stack_free(vertices);
return 0; return 0;
} }
......
src/video/uikit/SDL_uikitvideo.m
View file @ 3be3a8db
...@@ -123,7 +123,6 @@ UIKit_VideoInit(_THIS) ...@@ -123,7 +123,6 @@ UIKit_VideoInit(_THIS)
display.display_modes[0] = mode; display.display_modes[0] = mode;
display.desktop_mode = mode; display.desktop_mode = mode;
display.fullscreen_mode = mode;
display.current_mode = mode; display.current_mode = mode;
SDL_AddVideoDisplay(&display); SDL_AddVideoDisplay(&display);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment