Please stop breaking my makefile people 0_o
This commit is contained in:
5
Makefile
5
Makefile
@@ -8,13 +8,12 @@ COMMON_LIBS = System.dll System.Core.dll System.Drawing.dll System.Xml.dll
|
||||
fileformats_SRCS = $(shell find OpenRa.FileFormats/ -iname '*.cs')
|
||||
fileformats_TARGET = OpenRa.FileFormats.dll
|
||||
fileformats_KIND = library
|
||||
fileformats_LIBS = $(COMMON_LIBS) thirdparty/Tao/Tao.Glfw.dll
|
||||
fileformats_LIBS = $(COMMON_LIBS) thirdparty/Tao/Tao.Sdl.dll
|
||||
|
||||
gl_SRCS = $(shell find OpenRa.Gl/ -iname '*.cs')
|
||||
gl_TARGET = OpenRa.Gl.dll
|
||||
gl_KIND = library
|
||||
gl_DEPS = $(fileformats_TARGET) $(game_TARGET) \
|
||||
thirdparty/Tao/Tao.Glfw.dll
|
||||
gl_DEPS = $(fileformats_TARGET) $(game_TARGET)
|
||||
gl_LIBS = $(COMMON_LIBS) System.Windows.Forms.dll \
|
||||
thirdparty/Tao/Tao.Cg.dll thirdparty/Tao/Tao.OpenGl.dll thirdparty/Tao/Tao.Sdl.dll thirdparty/ISE.FreeType.dll \
|
||||
$(gl_DEPS) $(game_TARGET)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
@@ -46,10 +46,6 @@
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Drawing" />
|
||||
<Reference Include="System.Xml" />
|
||||
<Reference Include="Tao.Glfw, Version=2.6.0.0, Culture=neutral, PublicKeyToken=2bb092b6587e4402">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\thirdparty\Tao\Tao.Glfw.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Tao.Sdl, Version=1.2.13.0, Culture=neutral, PublicKeyToken=9c7a200e36c0094e, processorArchitecture=MSIL" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
||||
@@ -18,10 +18,7 @@
|
||||
*/
|
||||
#endregion
|
||||
|
||||
using System.Runtime.InteropServices;
|
||||
using Tao.Glfw;
|
||||
using Tao.Sdl;
|
||||
|
||||
namespace OpenRa.Support
|
||||
{
|
||||
public class Stopwatch
|
||||
|
||||
BIN
thirdparty/Tao/Tao.Glfw.dll
vendored
BIN
thirdparty/Tao/Tao.Glfw.dll
vendored
Binary file not shown.
7
thirdparty/Tao/Tao.Glfw.dll.config
vendored
7
thirdparty/Tao/Tao.Glfw.dll.config
vendored
@@ -1,7 +0,0 @@
|
||||
<configuration>
|
||||
<dllmap dll="glfw.dll">
|
||||
<dllentry os="linux" dll="libglfw.so.2" />
|
||||
<dllentry os="windows" dll="glfw.dll" />
|
||||
<dllentry os="osx" dll="libglfw.dylib" />
|
||||
</dllmap>
|
||||
</configuration>
|
||||
Reference in New Issue
Block a user