epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Please stop breaking my makefile people 0_o

Browse Source
This commit is contained in:
pchote
2010-02-20 21:35:30 +13:00
parent 1ed3a2c518
commit 7477f209aa
5 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@@ -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_SRCS = $(shell find OpenRa.FileFormats/ -iname '*.cs')
fileformats_TARGET = OpenRa.FileFormats.dll fileformats_TARGET = OpenRa.FileFormats.dll
fileformats_KIND = library 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_SRCS = $(shell find OpenRa.Gl/ -iname '*.cs')
gl_TARGET = OpenRa.Gl.dll gl_TARGET = OpenRa.Gl.dll
gl_KIND = library gl_KIND = library
gl_DEPS = $(fileformats_TARGET) $(game_TARGET) \ gl_DEPS = $(fileformats_TARGET) $(game_TARGET)
thirdparty/Tao/Tao.Glfw.dll
gl_LIBS = $(COMMON_LIBS) System.Windows.Forms.dll \ 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 \ thirdparty/Tao/Tao.Cg.dll thirdparty/Tao/Tao.OpenGl.dll thirdparty/Tao/Tao.Sdl.dll thirdparty/ISE.FreeType.dll \
$(gl_DEPS) $(game_TARGET) $(gl_DEPS) $(game_TARGET)

6
OpenRa.FileFormats/OpenRa.FileFormats.csproj
View File

@@ -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"> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -46,10 +46,6 @@
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Xml" /> <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" /> <Reference Include="Tao.Sdl, Version=1.2.13.0, Culture=neutral, PublicKeyToken=9c7a200e36c0094e, processorArchitecture=MSIL" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

3
OpenRa.FileFormats/Support/Stopwatch.cs
View File

@@ -18,10 +18,7 @@
*/ */
#endregion #endregion
using System.Runtime.InteropServices;
using Tao.Glfw;
using Tao.Sdl; using Tao.Sdl;
namespace OpenRa.Support namespace OpenRa.Support
{ {
public class Stopwatch public class Stopwatch

BIN
thirdparty/Tao/Tao.Glfw.dll vendored
View File

Binary file not shown.

7
thirdparty/Tao/Tao.Glfw.dll.config vendored
View File

@@ -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>