Skip to content

GitLab

Commit f007c2ce authored by pcy's avatar pcy
Browse files

add csprojs which hopefully work on windows

parent cd0ccc5f
Hide whitespace changes
Inline Side-by-side
Showing with 127 additions and 9 deletions
Makefile
View file @ f007c2ce
......@@ -3,6 +3,7 @@ default: all
CSC ?= mcs # use csc here if you're on windows
MONO ?= mono # leave this empty on windows
MSBUILD ?= xbuild # use msbuild here on windows
CSFLAGS := -checked- -unsafe+
CSFLAGS += -lib:lib/ -r:FNA.dll
......@@ -28,6 +29,10 @@ debug: all
release: CSFLAGS += -optimize+
release: all
xb:
$(MSBUILD) PoroCYon.FNAGLSL.csproj
$(MSBUILD) fnaglsl-test.csproj
t: debug
TERM=xterm MONO_PATH="$$PWD/lib/:$$MONO_PATH" \
LD_LIBRARY_PATH="$$PWD/lib:$$LD_LIBRARY_PATH" \
......@@ -35,11 +40,18 @@ t: debug
FNA_OPENGL_FORCE_CORE_PROFILE=1 \
$(MONO) --debug=mdb-optimizations "$(TARGET)"
tx: xb
TERM=xterm MONO_PATH="$$PWD/lib/:$$MONO_PATH" \
LD_LIBRARY_PATH="$$PWD/lib:$$LD_LIBRARY_PATH" \
FNA_KEYBOARD_USE_SCANCODES=1 FNA_OPENGL_DISABLE_LATESWAPTEAR=1 \
FNA_OPENGL_FORCE_CORE_PROFILE=1 \
$(MONO) --debug=mdb-optimizations "bin/Debug/fnaglsl.exe"
clean:
@$(RM) -v bin/*
@$(RM) -rv bin/* obj/*
%/:
@mkdir -vp "$@"
.PHONY: default all debug release t clean
.PHONY: default all debug release t clean tx xb
PoroCYon.FNAGLSL.csproj 0 → 100644
View file @ f007c2ce
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>0.0.0.1</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{834c670b-f6b1-4589-b901-a038222d2692}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>PoroCYon.FNAGLSL</RootNamespace>
<AssemblyName>PoroCYon.FNAGLSL</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>False</Optimize>
<OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>True</Optimize>
<OutputPath>bin\Release</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="FNA">
<HintPath>lib/FNA.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="src\GLSLEffect.cs" />
<Compile Include="src\GLSLEffect_TypTbl.cs" />
<Compile Include="src\GLTypes.cs" />
<Compile Include="src\GLUtil.cs" />
<Compile Include="src\GLUtil_Const.cs" />
<Compile Include="src\GLUtil_GL.cs" />
<Compile Include="src\ILUtil.cs" />
<Compile Include="src\ReflUtil.cs" />
</ItemGroup>
</Project>
fnaglsl-test.csproj 0 → 100644
View file @ f007c2ce
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>0.0.0.1</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{834c670b-f6b1-4589-b901-a038222d2692}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>PoroCYon.FNAGLSL</RootNamespace>
<AssemblyName>fnaglsl</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>False</Optimize>
<OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>True</Optimize>
<OutputPath>bin\Release</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="FNA">
<HintPath>lib/FNA.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="src\GLSLEffect.cs" />
<Compile Include="src\GLSLEffect_TypTbl.cs" />
<Compile Include="src\GLTypes.cs" />
<Compile Include="src\GLUtil.cs" />
<Compile Include="src\GLUtil_Const.cs" />
<Compile Include="src\GLUtil_GL.cs" />
<Compile Include="src\ILUtil.cs" />
<Compile Include="src\ReflUtil.cs" />
<Compile Include="src\test.cs" />
</ItemGroup>
</Project>
src/GLUtil_GL.cs
View file @ f007c2ce
......@@ -7,7 +7,7 @@ using System.Text;
using GLenum = System.UInt32;
using GLboolean = System.Byte ;
using GLbitfield = System.UInt32;
using GLvoid = System.Void ;
//using GLvoid = System.Void ;
using GLbyte = System.SByte ;
using GLshort = System.Int16 ;
using GLint = System.Int32 ;
......
src/ReflUtil.cs
View file @ f007c2ce
......@@ -120,7 +120,7 @@ namespace PoroCYon.FNAGLSL {
BindingFlags.SetProperty|BindingFlags.NonPublic|BindingFlags.Instance);
}
return (IntPtr)ef_GLEffectData_pi.GetValue(gleff);
return (IntPtr)ef_GLEffectData_pi.GetValue(gleff, null);
}
public static void SetGLEffectData(this Effect eff, IntPtr value) {
var gleff = eff.glEffect();
......@@ -131,7 +131,7 @@ namespace PoroCYon.FNAGLSL {
BindingFlags.SetProperty|BindingFlags.NonPublic|BindingFlags.Instance);
}
ef_GLEffectData_pi.SetValue(gleff, value);
ef_GLEffectData_pi.SetValue(gleff, value, null);
}
public static IntPtr GetEffectData(this Effect eff) {
......@@ -143,7 +143,7 @@ namespace PoroCYon.FNAGLSL {
BindingFlags.SetProperty|BindingFlags.NonPublic|BindingFlags.Instance);
}
return (IntPtr)ef_EffectData_pi.GetValue(gleff);
return (IntPtr)ef_EffectData_pi.GetValue(gleff, null);
}
public static void SetEffectData(this Effect eff, IntPtr value) {
var gleff = eff.glEffect();
......@@ -154,14 +154,14 @@ namespace PoroCYon.FNAGLSL {
BindingFlags.SetProperty|BindingFlags.NonPublic|BindingFlags.Instance);
}
ef_EffectData_pi.SetValue(gleff, value);
ef_EffectData_pi.SetValue(gleff, value, null);
}
public static void SetTechniques(this Effect eff, EffectTechniqueCollection value) {
ef_Techniques_pi.SetValue(eff, value);
ef_Techniques_pi.SetValue(eff, value, null);
}
public static void SetParameters(this Effect eff, EffectParameterCollection value) {
ef_Parameters_pi.SetValue(eff, value);
ef_Parameters_pi.SetValue(eff, value, null);
}
public static EffectTechniqueCollection CreateTechColl(List<EffectTechnique> techniques)
......
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