Home Explore Help
Sign In
cpp
/
oxygine-framework
mirror of https://github.com/oxygine/oxygine-framework
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

fixed latest sdl build

Denis Muratshin 11 years ago
parent
eaa5cd2ecf
commit
a7f1a500ac
10 changed files with 80 additions and 3 deletions
Split View Show Diff Stats
  1. 2 2
      .hg_archival.txt
  2. BIN
      doc/doc.zip
  3. 16 0
      doc/index.html
  4. 3 0
      examples/DemoBox2D/box2d/box2d_vs2010.vcxproj.user
  5. 11 0
      examples/DemoBox2D/proj.win32/DemoBox2D_vs2010.vcxproj.user
  6. 16 0
      examples/TutorialResources/proj.ios/TutorialResources/TutorialResources_ios-Prefix.pch
  7. 9 0
      examples/TutorialResources/proj.macosx/TutorialResources/TutorialResources_macosx-Prefix.pch
  8. 11 0
      examples/TutorialResources/proj.win32/TutorialResources_vs2010.vcxproj.user
  9. 11 0
      examples/TutorialResources/proj.win32/TutorialResources_vs2013.vcxproj.user
  10. 1 1
      oxygine/src/core/gl/oxgl.cpp

+ 2 - 2
.hg_archival.txt
View File 

@@ -1,5 +1,5 @@
 
 repo: b6d71054df5712e643a0685bc3ba54b123db5729
 
-node: 799b326e2e8a1d7ddad82d1cad19a88af98c06de
 
+node: 81dbbfb32b4389cc6e447e0356fc46e4d82e83e9
 
 branch: default
 
 latesttag: oldrender
 
-latesttagdistance: 280
 
+latesttagdistance: 281

BIN
doc/doc.zip
View File


+ 16 - 0
doc/index.html
View File 

@@ -0,0 +1,16 @@
 
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 
+<html>
 
+<head>
 
+<script type="text/javascript">
 
+<!--
 
+location.replace("html/index.html");
 
+//-->
 
+</script>
 
+<noscript>
 
+<meta http-equiv="refresh" content="0; url=html/index.html"> <!-- äëÿ òåõ íåñêîëüêèõ ïðîöåíòîâ «ñ¸ðôåðîâ», êîòîðûå îòêëþ÷èëè JavaScript -->
 
+</noscript>
 
+</head>
 
+<body>
 
+
 
+</body>
 
+</html>

+ 3 - 0
examples/DemoBox2D/box2d/box2d_vs2010.vcxproj.user
View File 

@@ -0,0 +1,3 @@
 
+<?xml version="1.0" encoding="utf-8"?>
 
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+</Project>

+ 11 - 0
examples/DemoBox2D/proj.win32/DemoBox2D_vs2010.vcxproj.user
View File 

@@ -0,0 +1,11 @@
 
+<?xml version="1.0" encoding="utf-8"?>
 
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 
+    <LocalDebuggerWorkingDirectory>../data</LocalDebuggerWorkingDirectory>
 
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
 
+  </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 
+    <LocalDebuggerWorkingDirectory>../data</LocalDebuggerWorkingDirectory>
 
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
 
+   </PropertyGroup>
 
+</Project>

+ 16 - 0
examples/TutorialResources/proj.ios/TutorialResources/TutorialResources_ios-Prefix.pch
View File 

@@ -0,0 +1,16 @@
 
+//
 
+//  Prefix header
 
+//
 
+//  The contents of this file are implicitly included at the beginning of every source file.
 
+//
 
+
 
+#import <Availability.h>
 
+
 
+#ifndef __IPHONE_5_0
 
+#warning "This project uses features only available in iOS SDK 5.0 and later."
 
+#endif
 
+
 
+#ifdef __OBJC__
 
+    #import <UIKit/UIKit.h>
 
+    #import <Foundation/Foundation.h>
 
+#endif

+ 9 - 0
examples/TutorialResources/proj.macosx/TutorialResources/TutorialResources_macosx-Prefix.pch
View File 

@@ -0,0 +1,9 @@
 
+//
 
+//  Prefix header
 
+//
 
+//  The contents of this file are implicitly included at the beginning of every source file.
 
+//
 
+
 
+#ifdef __OBJC__
 
+    #import <Cocoa/Cocoa.h>
 
+#endif

+ 11 - 0
examples/TutorialResources/proj.win32/TutorialResources_vs2010.vcxproj.user
View File 

@@ -0,0 +1,11 @@
 
+<?xml version="1.0" encoding="utf-8"?>
 
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 
+    <LocalDebuggerWorkingDirectory>../data</LocalDebuggerWorkingDirectory>
 
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
 
+  </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 
+    <LocalDebuggerWorkingDirectory>../data</LocalDebuggerWorkingDirectory>
 
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
 
+   </PropertyGroup>
 
+</Project>

+ 11 - 0
examples/TutorialResources/proj.win32/TutorialResources_vs2013.vcxproj.user
View File 

@@ -0,0 +1,11 @@
 
+<?xml version="1.0" encoding="utf-8"?>
 
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 
+    <LocalDebuggerWorkingDirectory>../data</LocalDebuggerWorkingDirectory>
 
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
 
+  </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 
+    <LocalDebuggerWorkingDirectory>../data</LocalDebuggerWorkingDirectory>
 
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
 
+   </PropertyGroup>
 
+</Project>

+ 1 - 1
oxygine/src/core/gl/oxgl.cpp
View File 

@@ -61,7 +61,7 @@ extern "C"
 
 		_glAttachShader(program, shader);
 
 	}
 
 	PFNGLSHADERSOURCEPROC _glShaderSource = 0;
 
-	GLAPI void APIENTRY glShaderSource(GLuint shader, GLsizei count, const GLchar* *string, const GLint *length)
 
+	GLAPI void APIENTRY glShaderSource(GLuint shader, GLsizei count, const GLchar * const* string, const GLint *length)
 
 	{
 
 		_glShaderSource(shader, count, string, length);
 
 	}