v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

correct some compile errors 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@710 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
rave3d 2010-04-27 16:51:22 +00:00
parent fcc9642ac7
commit b4f5d42094
8 changed files with 45 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
port/Assimp.NET/Assimp.NET.sln
View File

@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008 # Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Assimp.NET", "Assimp.NET\Assimp.NET.vcproj", "{A86A8AF2-3B4D-4381-BB01-9CA2AE88450E}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Assimp.NET", "Assimp.NET\Assimp.NET.vcproj", "{A86A8AF2-3B4D-4381-BB01-9CA2AE88450E}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assimp.NET_CS", "Assimp.NET_CS\Assimp.NET_CS.csproj", "{398AA9C3-5C12-4C51-84A3-32D563618F57}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assimp.NET_CS", "Assimp.NET_CS\Assimp.NET_CS.csproj", "{A0CE9ED2-A27E-40AE-95F5-FEF94BB7E131}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{A86A8AF2-3B4D-4381-BB01-9CA2AE88450E} = {A86A8AF2-3B4D-4381-BB01-9CA2AE88450E} {A86A8AF2-3B4D-4381-BB01-9CA2AE88450E} = {A86A8AF2-3B4D-4381-BB01-9CA2AE88450E}
EndProjectSection EndProjectSection
@ -28,16 +28,16 @@ Global
{A86A8AF2-3B4D-4381-BB01-9CA2AE88450E}.Release|Mixed Platforms.Build.0 = Release|Win32 {A86A8AF2-3B4D-4381-BB01-9CA2AE88450E}.Release|Mixed Platforms.Build.0 = Release|Win32
{A86A8AF2-3B4D-4381-BB01-9CA2AE88450E}.Release|Win32.ActiveCfg = Release|Win32 {A86A8AF2-3B4D-4381-BB01-9CA2AE88450E}.Release|Win32.ActiveCfg = Release|Win32
{A86A8AF2-3B4D-4381-BB01-9CA2AE88450E}.Release|Win32.Build.0 = Release|Win32 {A86A8AF2-3B4D-4381-BB01-9CA2AE88450E}.Release|Win32.Build.0 = Release|Win32
{398AA9C3-5C12-4C51-84A3-32D563618F57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A0CE9ED2-A27E-40AE-95F5-FEF94BB7E131}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{398AA9C3-5C12-4C51-84A3-32D563618F57}.Debug|Any CPU.Build.0 = Debug|Any CPU {A0CE9ED2-A27E-40AE-95F5-FEF94BB7E131}.Debug|Any CPU.Build.0 = Debug|Any CPU
{398AA9C3-5C12-4C51-84A3-32D563618F57}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {A0CE9ED2-A27E-40AE-95F5-FEF94BB7E131}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{398AA9C3-5C12-4C51-84A3-32D563618F57}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {A0CE9ED2-A27E-40AE-95F5-FEF94BB7E131}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{398AA9C3-5C12-4C51-84A3-32D563618F57}.Debug|Win32.ActiveCfg = Debug|Any CPU {A0CE9ED2-A27E-40AE-95F5-FEF94BB7E131}.Debug|Win32.ActiveCfg = Debug|Any CPU
{398AA9C3-5C12-4C51-84A3-32D563618F57}.Release|Any CPU.ActiveCfg = Release|Any CPU {A0CE9ED2-A27E-40AE-95F5-FEF94BB7E131}.Release|Any CPU.ActiveCfg = Release|Any CPU
{398AA9C3-5C12-4C51-84A3-32D563618F57}.Release|Any CPU.Build.0 = Release|Any CPU {A0CE9ED2-A27E-40AE-95F5-FEF94BB7E131}.Release|Any CPU.Build.0 = Release|Any CPU
{398AA9C3-5C12-4C51-84A3-32D563618F57}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {A0CE9ED2-A27E-40AE-95F5-FEF94BB7E131}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{398AA9C3-5C12-4C51-84A3-32D563618F57}.Release|Mixed Platforms.Build.0 = Release|Any CPU {A0CE9ED2-A27E-40AE-95F5-FEF94BB7E131}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{398AA9C3-5C12-4C51-84A3-32D563618F57}.Release|Win32.ActiveCfg = Release|Any CPU {A0CE9ED2-A27E-40AE-95F5-FEF94BB7E131}.Release|Win32.ActiveCfg = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

8
port/Assimp.NET/Assimp.NET/AssimpSwigPort.i
View File

@ -15,7 +15,7 @@
#include "..\..\..\include\aiLight.h" #include "..\..\..\include\aiLight.h"
#include "..\..\..\include\aiAnim.h" #include "..\..\..\include\aiAnim.h"
#include "..\..\..\include\aiMesh.h" #include "..\..\..\include\aiMesh.h"
//#include "..\..\..\include\aiFileIO.h" #include "..\..\..\include\aiFileIO.h"
#include "..\..\..\include\aiMaterial.h" #include "..\..\..\include\aiMaterial.h"
#include "..\..\..\include\aiQuaternion.h" #include "..\..\..\include\aiQuaternion.h"
#include "..\..\..\include\aiScene.h" #include "..\..\..\include\aiScene.h"
@ -25,7 +25,7 @@
#include "..\..\..\include\IOStream.h" #include "..\..\..\include\IOStream.h"
#include "..\..\..\include\Logger.h" #include "..\..\..\include\Logger.h"
#include "..\..\..\include\LogStream.h" #include "..\..\..\include\LogStream.h"
//#include "..\..\..\include\NullLogger.h" #include "..\..\..\include\NullLogger.h"
%} %}
#define C_STRUCT #define C_STRUCT
@ -66,7 +66,7 @@
%include "..\..\..\include\aiLight.h" %include "..\..\..\include\aiLight.h"
%include "..\..\..\include\aiAnim.h" %include "..\..\..\include\aiAnim.h"
%include "..\..\..\include\aiMesh.h" %include "..\..\..\include\aiMesh.h"
//%include "..\..\..\include\aiFileIO.h" %include "..\..\..\include\aiFileIO.h"
%include "..\..\..\include\aiMaterial.h" %include "..\..\..\include\aiMaterial.h"
%include "..\..\..\include\aiQuaternion.h" %include "..\..\..\include\aiQuaternion.h"
%include "..\..\..\include\aiScene.h" %include "..\..\..\include\aiScene.h"
@ -76,7 +76,7 @@
%include "..\..\..\include\IOStream.h" %include "..\..\..\include\IOStream.h"
%include "..\..\..\include\Logger.h" %include "..\..\..\include\Logger.h"
%include "..\..\..\include\LogStream.h" %include "..\..\..\include\LogStream.h"
//%include "..\..\..\include\NullLogger.h" %include "..\..\..\include\NullLogger.h"

2
port/Assimp.NET/Assimp.NET_CS/Assimp.NET_CS.csproj
View File

@ -17,7 +17,7 @@
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>..\port_bin\</OutputPath> <OutputPath>..\..\..\bin\%24%28ProjectName%29_%24%28ConfigurationName%29_%24%28PlatformName%29\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>

27
port/Assimp.NET/Assimp.NET_CS/SWIGTYPE_p_aiFileIO.cs 100644
View File

@ -0,0 +1,27 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
* Version 1.3.40
*
* Do not make changes to this file unless you know what you are doing--modify
* the SWIG interface file instead.
* ----------------------------------------------------------------------------- */
using System;
using System.Runtime.InteropServices;
public class SWIGTYPE_p_aiFileIO {
private HandleRef swigCPtr;
internal SWIGTYPE_p_aiFileIO(IntPtr cPtr, bool futureUse) {
swigCPtr = new HandleRef(this, cPtr);
}
protected SWIGTYPE_p_aiFileIO() {
swigCPtr = new HandleRef(null, IntPtr.Zero);
}
internal static HandleRef getCPtr(SWIGTYPE_p_aiFileIO obj) {
return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr;
}
}

2
port/Assimp.NET/Assimp.NET_CS/obj/Debug/Assimp.NET_CS.csproj.FileListAbsolute.txt
View File

@ -3,3 +3,5 @@ D:\Projekte\Assimp\trunk\port\Assimp.NET\port_bin\Assimp.NET_CS.pdb
D:\Projekte\Assimp\trunk\port\Assimp.NET\Assimp.NET_CS\obj\Debug\ResolveAssemblyReference.cache D:\Projekte\Assimp\trunk\port\Assimp.NET\Assimp.NET_CS\obj\Debug\ResolveAssemblyReference.cache
D:\Projekte\Assimp\trunk\port\Assimp.NET\Assimp.NET_CS\obj\Debug\Assimp.NET_CS.dll D:\Projekte\Assimp\trunk\port\Assimp.NET\Assimp.NET_CS\obj\Debug\Assimp.NET_CS.dll
D:\Projekte\Assimp\trunk\port\Assimp.NET\Assimp.NET_CS\obj\Debug\Assimp.NET_CS.pdb D:\Projekte\Assimp\trunk\port\Assimp.NET\Assimp.NET_CS\obj\Debug\Assimp.NET_CS.pdb
D:\Projekte\Assimp\trunk\bin\$(ProjectName)_$(ConfigurationName)_$(PlatformName)\Assimp.NET_CS.dll
D:\Projekte\Assimp\trunk\bin\$(ProjectName)_$(ConfigurationName)_$(PlatformName)\Assimp.NET_CS.pdb

BIN
port/Assimp.NET/Assimp.NET_CS/obj/Debug/Assimp.NET_CS.dll
View File

Binary file not shown.

BIN
port/Assimp.NET/Assimp.NET_CS/obj/Debug/Assimp.NET_CS.pdb
View File

Binary file not shown.

BIN
port/Assimp.NET/Assimp.NET_CS/obj/Debug/ResolveAssemblyReference.cache
View File

Binary file not shown.