Permalink
Browse files

switch to OpenTK (Tao compatibility mode)

  • Loading branch information...
1 parent 2100484 commit a3a6f22ee7ed8dfdff703b85cf38b8c0ff4bb986 @Mailaender committed Sep 12, 2012
View
@@ -29,7 +29,7 @@ game_TARGET = OpenRA.Game.exe
game_KIND = winexe
game_DEPS = $(fileformats_TARGET)
game_LIBS = $(COMMON_LIBS) System.Windows.Forms.dll $(game_DEPS) \
- thirdparty/Tao/Tao.OpenAl.dll thirdparty/Tao/Tao.FreeType.dll
+ thirdparty/OpenTK/OpenTK.dll thirdparty/OpenTK/OpenTK.Compatibility.dll thirdparty/Tao/Tao.FreeType.dll
game_FLAGS = -win32icon:OpenRA.Game/OpenRA.ico
PROGRAMS += game
game: $(game_TARGET)
@@ -42,23 +42,23 @@ rsdl_TARGET = OpenRA.Renderer.SdlCommon.dll
rsdl_KIND = library
rsdl_DEPS = $(fileformats_TARGET) $(game_TARGET)
rsdl_LIBS = $(COMMON_LIBS) System.Windows.Forms.dll \
- thirdparty/Tao/Tao.OpenGl.dll thirdparty/Tao/Tao.Sdl.dll \
+ thirdparty/OpenTK/OpenTK.dll thirdparty/OpenTK/OpenTK.Compatibility.dll thirdparty/Tao/Tao.Sdl.dll \
$(rsdl_DEPS)
rcg_SRCS := $(shell find OpenRA.Renderer.Cg/ -iname '*.cs')
rcg_TARGET = OpenRA.Renderer.Cg.dll
rcg_KIND = library
rcg_DEPS = $(fileformats_TARGET) $(game_TARGET) $(rsdl_TARGET)
rcg_LIBS = $(COMMON_LIBS) System.Windows.Forms.dll \
- thirdparty/Tao/Tao.Cg.dll thirdparty/Tao/Tao.OpenGl.dll thirdparty/Tao/Tao.Sdl.dll \
+ thirdparty/Tao/Tao.Cg.dll thirdparty/OpenTK/OpenTK.dll thirdparty/OpenTK/OpenTK.Compatibility.dll thirdparty/Tao/Tao.Sdl.dll \
$(rcg_DEPS)
rgl_SRCS := $(shell find OpenRA.Renderer.Gl/ -iname '*.cs')
rgl_TARGET = OpenRA.Renderer.Gl.dll
rgl_KIND = library
rgl_DEPS = $(fileformats_TARGET) $(game_TARGET) $(rsdl_TARGET)
rgl_LIBS = $(COMMON_LIBS) System.Windows.Forms.dll \
- thirdparty/Tao/Tao.Cg.dll thirdparty/Tao/Tao.OpenGl.dll thirdparty/Tao/Tao.Sdl.dll \
+ thirdparty/Tao/Tao.Cg.dll thirdparty/OpenTK/OpenTK.dll thirdparty/OpenTK/OpenTK.Compatibility.dll thirdparty/Tao/Tao.Sdl.dll \
$(rgl_DEPS)
rnull_SRCS := $(shell find OpenRA.Renderer.Null/ -iname '*.cs')
@@ -244,6 +244,7 @@ install: all
@cp -r cg $(INSTALL_DIR)
@cp *.ttf $(INSTALL_DIR)
@cp thirdparty/Tao/* $(INSTALL_DIR)
+ @cp thirdparty/OpenTK/* $(INSTALL_DIR)
@$(INSTALL_PROGRAM) thirdparty/ICSharpCode.SharpZipLib.dll $(INSTALL_DIR)
@echo "#!/bin/sh" > openra
@@ -14,6 +14,8 @@
using OpenRA.FileFormats;
using OpenRA.GameRules;
using OpenRA.Traits;
+using OpenTK;
+using OpenTK.Compatibility;
using Tao.OpenAl;
namespace OpenRA
@@ -12,6 +12,8 @@
using System.Drawing;
using OpenRA.FileFormats.Graphics;
using OpenRA.Renderer.SdlCommon;
+using OpenTK;
+using OpenTK.Compatibility;
using Tao.Cg;
using Tao.OpenGl;
using Tao.Sdl;
@@ -12,6 +12,8 @@
using System.Drawing;
using OpenRA.FileFormats.Graphics;
using OpenRA.Renderer.SdlCommon;
+using OpenTK;
+using OpenTK.Compatibility;
using Tao.OpenGl;
using Tao.Sdl;
@@ -15,6 +15,8 @@
using OpenRA.FileFormats;
using OpenRA.FileFormats.Graphics;
using OpenRA.Renderer.SdlCommon;
+using OpenTK;
+using OpenTK.Compatibility;
using Tao.OpenGl;
namespace OpenRA.Renderer.Glsl
@@ -11,6 +11,8 @@
using System;
using System.Diagnostics;
using Tao.OpenGl;
+using OpenTK;
+using OpenTK.Compatibility;
namespace OpenRA.Renderer.SdlCommon
{
@@ -13,6 +13,8 @@
using System.Linq;
using System.Runtime.InteropServices;
using OpenRA.FileFormats.Graphics;
+using OpenTK;
+using OpenTK.Compatibility;
using Tao.OpenGl;
using Tao.Sdl;
@@ -14,6 +14,8 @@
using System.IO;
using OpenRA.FileFormats;
using OpenRA.FileFormats.Graphics;
+using OpenTK;
+using OpenTK.Compatibility;
using Tao.OpenGl;
namespace OpenRA.Renderer.SdlCommon
@@ -11,6 +11,8 @@
using System;
using System.Runtime.InteropServices;
using OpenRA.FileFormats.Graphics;
+using OpenTK;
+using OpenTK.Compatibility;
using Tao.OpenGl;
namespace OpenRA.Renderer.SdlCommon
Binary file not shown.
@@ -0,0 +1,11 @@
+<configuration>
+ <dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
+ <dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>
+ <dllmap os="linux" dll="openal32.dll" target="libopenal.so.1"/>
+ <dllmap os="linux" dll="alut.dll" target="libalut.so.0"/>
+ <dllmap os="linux" dll="opencl.dll" target="libOpenCL.so"/>
+ <dllmap os="osx" dll="openal32.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
+ <dllmap os="osx" dll="alut.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
+ <dllmap os="osx" dll="libGLES.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
+ <dllmap os="osx" dll="libGLESv2.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
+</configuration>
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,12 @@
+<configuration>
+ <dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
+ <dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>
+ <dllmap os="linux" dll="OpenAL32.dll" target="libopenal.so.1"/>
+ <dllmap os="linux" dll="alut.dll" target="libalut.so.0"/>
+ <dllmap os="linux" dll="opencl.dll" target="libOpenCL.so"/>
+ <dllmap os="osx" dll="openal32.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
+ <dllmap os="osx" dll="alut.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
+ <dllmap os="osx" dll="libGLES.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
+ <dllmap os="osx" dll="libGLESv2.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
+ <dllmap os="osx" dll="opencl.dll" target="/System/Library/Frameworks/OpenCL.framework/OpenCL"/>
+</configuration>
Binary file not shown.
@@ -1,12 +0,0 @@
-<configuration>
- <dllmap dll="OpenAL32.dll">
- <dllentry os="linux" dll="libopenal.so.1" />
- <dllentry os="windows" dll="OpenAL32.dll" />
- <dllentry os="osx" dll="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
- </dllmap>
- <dllmap dll="alut.dll">
- <dllentry os="linux" dll="libalut.so.1" />
- <dllentry os="windows" dll="alut.dll" />
- <dllentry os="osx" dll="libalut.so.0" />
- </dllmap>
-</configuration>
Binary file not shown.
@@ -1,12 +0,0 @@
-<configuration>
- <dllmap dll="opengl32.dll">
- <dllentry os="linux" dll="libGL.so.1" />
- <dllentry os="windows" dll="opengl32.dll" />
- <dllentry os="osx" dll="/System/Library/Frameworks/OpenGL.framework/OpenGL" />
- </dllmap>
- <dllmap dll="glu32.dll">
- <dllentry os="linux" dll="libGLU.so.1" />
- <dllentry os="windows" dll="opengl32.dll" />
- <dllentry os="osx" dll="/System/Library/Frameworks/OpenGL.framework/Libraries/libGLU.dylib" />
- </dllmap>
-</configuration>

0 comments on commit a3a6f22

Please sign in to comment.