Merge developments from the python_wrapper branch into master

This commit is contained in:
Thomas Krijnen
2015-01-05 14:11:42 +00:00
parent 8872affe54
commit 4d5d749255
61 changed files with 29458 additions and 13467 deletions
+72 -8
View File
@@ -149,6 +149,18 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\src\ifcparse\Ifc2x3-latebound.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/bigobj"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\ifcparse\Ifc2x3.cpp"
>
@@ -161,7 +173,19 @@
/>
</FileConfiguration>
</File>
<File
<File
RelativePath="..\src\ifcparse\Ifc4-latebound.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/bigobj"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\ifcparse\Ifc4.cpp"
>
<FileConfiguration
@@ -185,7 +209,7 @@
RelativePath="..\src\ifcparse\IfcUtil.cpp"
>
</File>
<File
<File
RelativePath="..\src\ifcparse\IfcWrite.cpp"
>
</File>
@@ -193,16 +217,24 @@
RelativePath="..\src\ifcparse\IfcGuidHelper.cpp"
>
</File>
<File
<File
RelativePath="..\src\ifcparse\IfcHierarchyHelper.cpp"
>
</File>
</File>
<File
RelativePath="..\src\ifcparse\IfcLateBoundEntity.cpp"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath="..\src\ifcparse\Ifc2x3-latebound.h"
>
</File>
<File
RelativePath="..\src\ifcparse\Ifc2x3.h"
>
@@ -211,16 +243,48 @@
RelativePath="..\src\ifcparse\Ifc2x3enum.h"
>
</File>
<File
<File
RelativePath="..\src\ifcparse\Ifc4-latebound.h"
>
</File>
<File
RelativePath="..\src\ifcparse\Ifc4.h"
>
</File>
<File
RelativePath="..\src\ifcparse\Ifc4enum.h"
>
</File>
<File
RelativePath="..\src\ifcparse\IfcCharacterDecoder.h"
>
</File>
<File
RelativePath="..\src\ifcparse\IfcEntityDescriptor.h"
>
</File>
<File
RelativePath="..\src\ifcparse\IfcException.h"
>
</File>
<File
RelativePath="..\src\ifcparse\IfcFile.h"
>
</File>
<File
RelativePath="..\src\ifcparse\IfcHierarchyHelper.h"
>
</File>
<File
RelativePath="..\src\ifcparse\IfcLateBoundEntity.h"
>
</File>
<File
RelativePath="..\src\ifcparse\IfcParse.h"
>
</File>
<File
RelativePath="..\src\ifcparse\IfcSchema.h"
RelativePath="..\src\ifcparse\IfcSpfStream.h"
>
</File>
<File
@@ -228,7 +292,7 @@
>
</File>
<File
RelativePath="..\src\ifcparse\SharedPointer.h"
RelativePath="..\src\ifcparse\IfcWritableEntity.h"
>
</File>
<File
@@ -236,7 +300,7 @@
>
</File>
<File
RelativePath="..\src\ifcparse\IfcWritableEntity.h"
RelativePath="..\src\ifcparse\SharedPointer.h"
>
</File>
</Filter>
+10 -6
View File
@@ -62,7 +62,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKerneld.lib TKMathd.lib TKBRepd.lib TKGeomBased.lib TKGeomAlgod.lib TKG3dd.lib TKG2dd.lib TKShHealingd.lib TKTopAlgod.lib TKMeshd.lib TKPrimd.lib TKBoold.lib TKBOd.lib TKFilletd.lib TKOffsetd.lib"
OutputFile="$(OutDir)\_ifcopenshell.pyd"
OutputFile="$(OutDir)\_ifcopenshell_wrapper.pyd"
GenerateDebugInformation="true"
TargetMachine="1"
/>
@@ -133,7 +133,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKernel.lib TKMath.lib TKBRep.lib TKGeomBase.lib TKGeomAlgo.lib TKG3d.lib TKG2d.lib TKShHealing.lib TKTopAlgo.lib TKMesh.lib TKPrim.lib TKBool.lib TKBO.lib TKFillet.lib TKOffset.lib"
OutputFile="$(OutDir)\_ifcopenshell.pyd"
OutputFile="$(OutDir)\_ifcopenshell_wrapper.pyd"
GenerateDebugInformation="true"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -180,10 +180,6 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath="..\src\ifcwrap\Interface.h"
>
</File>
</Filter>
<File
RelativePath="..\src\ifcwrap\IfcPython.i"
@@ -207,6 +203,14 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\ifcwrap\IfcGeomWrapper.i"
>
</File>
<File
RelativePath="..\src\ifcwrap\IfcParseWrapper.i"
>
</File>
</Files>
<Globals>
</Globals>