Index: ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTest.cpp =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTest.cpp +++ ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTest.cpp @@ -7,6 +7,7 @@ */ #include "StdAfx.h" +#include "FUtils/FUTestBed.h" #ifdef WIN32 #include Index: ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestAnimation.cpp =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestAnimation.cpp +++ ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestAnimation.cpp @@ -17,6 +17,7 @@ #include "FCDocument/FCDLibrary.h" #include "FCDocument/FCDSceneNode.h" #include "FCDocument/FCDSceneNodeTools.h" +#include "FUtils/FUTestBed.h" TESTSUITE_START(FCDAnimation) Index: ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestArchiving.cpp =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestArchiving.cpp +++ ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestArchiving.cpp @@ -11,6 +11,7 @@ #include "FCDocument/FCDLibrary.h" #include "FCDocument/FCDLight.h" #include "FUtils/FUFile.h" +#include "FUtils/FUTestBed.h" TESTSUITE_START(FColladaArchiving) Index: ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestAssetManagement/FCTAMCrossCloning.cpp =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestAssetManagement/FCTAMCrossCloning.cpp +++ ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestAssetManagement/FCTAMCrossCloning.cpp @@ -11,6 +11,7 @@ #include "FCDocument/FCDExtra.h" #include "FCDocument/FCDImage.h" #include "FCDocument/FCDLibrary.h" +#include "FUtils/FUTestBed.h" TESTSUITE_START(FCTAMCrossCloning) Index: ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestAssetManagement/FCTAssetManagement.cpp =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestAssetManagement/FCTAssetManagement.cpp +++ ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestAssetManagement/FCTAssetManagement.cpp @@ -8,6 +8,7 @@ #include "StdAfx.h" #include "FCDocument/FCDocument.h" +#include "FUtils/FUTestBed.h" TESTSUITE_START(FCTAssetManagement) Index: ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestController.cpp =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestController.cpp +++ ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestController.cpp @@ -12,6 +12,7 @@ #include "FCDocument/FCDSkinController.h" #include "FCDocument/FCDController.h" #include "FCDocument/FCDLibrary.h" +#include "FUtils/FUTestBed.h" TESTSUITE_START(FCDControllers) Index: ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTEIAnimation.cpp =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTEIAnimation.cpp +++ ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTEIAnimation.cpp @@ -13,6 +13,7 @@ #include "FCDocument/FCDAnimationCurve.h" #include "FCDocument/FCDLight.h" #include "FCTestExportImport.h" +#include "FUtils/FUTestBed.h" static fm::string animId1 = "GrossAnimation"; static fm::string animId2 = "GrossAnimation"; Index: ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTEICamera.cpp =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTEICamera.cpp +++ ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTEICamera.cpp @@ -9,6 +9,7 @@ #include "StdAfx.h" #include "FCDocument/FCDCamera.h" #include "FCTestExportImport.h" +#include "FUtils/FUTestBed.h" namespace FCTestExportImport { Index: ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTEIEmitter.cpp =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTEIEmitter.cpp +++ ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTEIEmitter.cpp @@ -12,6 +12,7 @@ #include "FCDocument/FCDForceField.h" #include "FCDocument/FCDSceneNode.h" #include "FCTestExportImport.h" +#include "FUtils/FUTestBed.h" namespace FCTestExportImport { Index: ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTEIExtra.cpp =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTEIExtra.cpp +++ ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTEIExtra.cpp @@ -9,6 +9,7 @@ #include "StdAfx.h" #include "FCDocument/FCDExtra.h" #include "FCTestExportImport.h" +#include "FUtils/FUTestBed.h" namespace FCTestExportImport { Index: ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTEIGeometry.cpp =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTEIGeometry.cpp +++ ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTEIGeometry.cpp @@ -18,6 +18,7 @@ #include "FCDocument/FCDSceneNode.h" #include "FCDocument/FCDSkinController.h" #include "FCTestExportImport.h" +#include "FUtils/FUTestBed.h" static const float positionData[12] = { 0.0f, 0.0f, 3.0f, 5.0f, 0.0f, -2.0f, -3.0f, 4.0f, -2.0f, -3.0f, -4.0f, -2.0f }; static const float colorData[12] = { 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 1.0f }; Index: ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTEILight.cpp =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTEILight.cpp +++ ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTEILight.cpp @@ -9,6 +9,7 @@ #include "StdAfx.h" #include "FCDocument/FCDLight.h" #include "FCTestExportImport.h" +#include "FUtils/FUTestBed.h" namespace FCTestExportImport { Index: ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTEIMaterial.cpp =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTEIMaterial.cpp +++ ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTEIMaterial.cpp @@ -23,6 +23,7 @@ #include "FCDocument/FCDTexture.h" #include "FUtils/FUDaeSyntax.h" #include "FCTestExportImport.h" +#include "FUtils/FUTestBed.h" static const float sampleMatrix[16] = { 0.5f, 0.1f, 0.7f, 2.0f, 1.11f, 0.5e-2f, 111.0f, 0.5f, 0.0f, 0.0f, 0.557f, -10.02f, 0.001f, 12.0f, 1.02e-3f, 0.0f }; static fm::string wantedImageId = "test_image"; Index: ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTEIPhysics.cpp =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTEIPhysics.cpp +++ ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTEIPhysics.cpp @@ -17,6 +17,7 @@ #include "FCDocument/FCDPhysicsRigidConstraintInstance.h" #include "FUtils/FUDaeSyntax.h" #include "FCTestExportImport.h" +#include "FUtils/FUTestBed.h" static fm::string physicsMaterialId1 = "Pmat"; static fm::string physicsMaterialId2 = "PMat"; Index: ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTEIVisualScene.cpp =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTEIVisualScene.cpp +++ ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTEIVisualScene.cpp @@ -24,6 +24,7 @@ #include "FCDocument/FCDTransform.h" #include "FMath/FMRandom.h" #include "FCTestExportImport.h" +#include "FUtils/FUTestBed.h" static const float sampleMatrix[16] = { 0.0f, 2.0f, 0.4f, 2.0f, 7.0f, 0.2f, 991.0f, 2.5f, 11.0f, 25.0f, 1.55f, 0.02f, 0.001f, 12.0f, 1.02e-3f }; static fm::string transformChildId = "TMChild"; Index: ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTestExportImport.h =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTestExportImport.h +++ ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTestExportImport.h @@ -15,6 +15,7 @@ #ifndef _FCD_LIBRARY_ #include "FCDocument/FCDLibrary.h" #endif // _FCD_LIBRARY_ +#include "FUtils/FULogFile.h" class FCDAnimation; class FCDEffectProfileFX; Index: ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTestExportImport.cpp =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTestExportImport.cpp +++ ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestExportImport/FCTestExportImport.cpp @@ -24,6 +24,7 @@ #include "FCDocument/FCDEffectTools.h" #include "FCDocument/FCDEffectStandard.h" #include "FCDocument/FCDEffectParameter.h" +#include "FUtils/FUTestBed.h" #include "FCTestExportImport.h" using namespace FCTestExportImport; Index: ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestGeometryPolygonsTools.cpp =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestGeometryPolygonsTools.cpp +++ ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestGeometryPolygonsTools.cpp @@ -14,6 +14,7 @@ #include "FCDocument/FCDGeometryPolygons.h" #include "FCDocument/FCDGeometryPolygonsInput.h" #include "FCDocument/FCDGeometryPolygonsTools.h" +#include "FUtils/FUTestBed.h" TESTSUITE_START(FCDGeometryPolygonsTools) Index: ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestParameters.cpp =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestParameters.cpp +++ ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestParameters.cpp @@ -16,6 +16,7 @@ #include "FCDocument/FCDEntity.h" #include "FCDocument/FCDLibrary.h" #include "FCDocument/FCDParameterAnimatable.h" +#include "FUtils/FUTestBed.h" class FCTestOutsideParameter : public FCDObject { Index: ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestSceneGraph.cpp =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestSceneGraph.cpp +++ ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestSceneGraph.cpp @@ -10,6 +10,7 @@ #include "FCDocument/FCDocument.h" #include "FCDocument/FCDSceneNode.h" #include "FCDocument/FCDSceneNodeIterator.h" +#include "FUtils/FUTestBed.h" TESTSUITE_START(FCDSceneNode) Index: ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestXRef/FCTestXRef.cpp =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestXRef/FCTestXRef.cpp +++ ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestXRef/FCTestXRef.cpp @@ -14,6 +14,7 @@ #include "FCDocument/FCDEntityInstance.h" #include "FCDocument/FCDExternalReferenceManager.h" #include "FCDocument/FCDSceneNode.h" +#include "FUtils/FUTestBed.h" TESTSUITE_START(FCTestXRef) Index: ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestXRef/FCTestXRefAcyclic.cpp =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestXRef/FCTestXRefAcyclic.cpp +++ ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestXRef/FCTestXRefAcyclic.cpp @@ -14,6 +14,7 @@ #include "FCDocument/FCDEntityInstance.h" #include "FCDocument/FCDExternalReferenceManager.h" #include "FCDocument/FCDSceneNode.h" +#include "FUtils/FUTestBed.h" TESTSUITE_START(FCTestXRefAcyclic) Index: ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestXRef/FCTestXRefSimple.cpp =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestXRef/FCTestXRefSimple.cpp +++ ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestXRef/FCTestXRefSimple.cpp @@ -14,6 +14,7 @@ #include "FCDocument/FCDEntityInstance.h" #include "FCDocument/FCDExternalReferenceManager.h" #include "FCDocument/FCDSceneNode.h" +#include "FUtils/FUTestBed.h" TESTSUITE_START(FCTestXRefSimple) Index: ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestXRef/FCTestXRefTree.cpp =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestXRef/FCTestXRefTree.cpp +++ ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FCTestXRef/FCTestXRefTree.cpp @@ -14,6 +14,7 @@ #include "FCDocument/FCDEntityInstance.h" #include "FCDocument/FCDExternalReferenceManager.h" #include "FCDocument/FCDSceneNode.h" +#include "FUtils/FUTestBed.h" TESTSUITE_START(FCTestXRefTree) Index: ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FColladaTest.vcproj =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FColladaTest.vcproj +++ ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FColladaTest.vcproj @@ -1,814 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FColladaTest.vcxproj =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FColladaTest.vcxproj +++ ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/FColladaTest.vcxproj @@ -43,42 +43,42 @@ StaticLibrary v140_xp - Unicode + NotSet StaticLibrary v140_xp - Unicode + NotSet Application v140_xp - Unicode + NotSet Application v140_xp - Unicode + NotSet StaticLibrary v140_xp - Unicode + NotSet StaticLibrary v140_xp - Unicode + NotSet Application v140_xp - Unicode + NotSet Application v140_xp - Unicode + NotSet @@ -142,20 +142,20 @@ false - $(ProjectDir)../Output/$(Configuration)/$(ProjectName)\ - $(ProjectDir)../Output/$(Configuration)/$(ProjectName)/Intermediate\ + $(ProjectDir)Output/$(Configuration) $(Platform)/$(ProjectName)\ + $(ProjectDir)Output/$(Configuration) $(Platform)/$(ProjectName)/Intermediate\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ + $(ProjectDir)Output/$(Configuration) $(Platform)/$(ProjectName)\ + $(ProjectDir)Output/$(Configuration) $(Platform)/$(ProjectName)/Intermediate\ - $(ProjectDir)../Output/$(Configuration)/$(ProjectName)\ - $(ProjectDir)../Output/$(Configuration)/$(ProjectName)/Intermediate\ + $(ProjectDir)Output/$(Configuration) $(Platform)/$(ProjectName)\ + $(ProjectDir)Output/$(Configuration) $(Platform)/$(ProjectName)/Intermediate\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ + $(ProjectDir)Output/$(Configuration) $(Platform)/$(ProjectName)\ + $(ProjectDir)Output/$(Configuration) $(Platform)/$(ProjectName)/Intermediate\ @@ -169,21 +169,26 @@ MultiThreadedDebug Use Level4 - EditAndContinue true true 4458;4457;4456;%(DisableSpecificWarnings) - $(ProjectDir)../Output/$(Configuration) Unicode DLL $(Platform)/$(ProjectName).exe + $(ProjectDir)Output/$(Configuration) $(Platform)/$(ProjectName)\$(ProjectName).exe true $(OutDir)FColladaTest.pdb Console MachineX86 + FColladaD.lib;libiconv.lib;libxml2.lib;%(AdditionalDependencies) + $(ProjectDir)\..\..\..\..\..\win32\libxml2\lib;$(ProjectDir)\..\..\..\lib;$(ProjectDir)\..\..\..\..\..\win32\iconv\lib;%(AdditionalLibraryDirectories) if not exist "$(TargetDir)Samples" mkdir "$(TargetDir)Samples" xcopy /D /E /C /Q /Y "$(ProjectDir)Samples" "$(TargetDir)Samples" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\libxml2.dll" "$(TargetDir)" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\libiconv.dll" "$(TargetDir)" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\FColladaD.dll" "$(TargetDir)" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\FColladaD.pdb" "$(TargetDir)" @@ -196,26 +201,34 @@ Disabled - $(ProjectDir)../LibXML/include;$(ProjectDir)..;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\..\..\..\win32\iconv\include;$(ProjectDir)..\..\..\..\..\win32\libxml2\include;$(ProjectDir)..;%(AdditionalIncludeDirectories) WIN32;_DEBUG;MEMORY_DEBUG;FCOLLADA_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug Use Level4 - true ProgramDatabase + true + true + 4458;4457;4456;%(DisableSpecificWarnings) - $(ProjectDir)../Output/$(Configuration) Unicode DLL $(Platform)/$(ProjectName).exe + $(ProjectDir)Output/$(Configuration) $(Platform)/$(ProjectName)\$(ProjectName).exe true $(OutDir)FColladaTest.pdb Console MachineX64 + FColladaD.lib;libiconv.lib;libxml2.lib;%(AdditionalDependencies) + $(ProjectDir)\..\..\..\..\..\win32\libxml2\lib;$(ProjectDir)\..\..\..\lib;$(ProjectDir)\..\..\..\..\..\win32\iconv\lib;%(AdditionalLibraryDirectories) if not exist "$(TargetDir)Samples" mkdir "$(TargetDir)Samples" xcopy /D /E /C /Q /Y "$(ProjectDir)Samples" "$(TargetDir)Samples" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\libxml2.dll" "$(TargetDir)" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\libiconv.dll" "$(TargetDir)" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\FColladaD.dll" "$(TargetDir)" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\FColladaD.pdb" "$(TargetDir)" @@ -236,16 +249,22 @@ 4458;4457;4456;%(DisableSpecificWarnings) - $(ProjectDir)../Output/$(Configuration) Unicode DLL $(Platform)/$(ProjectName).exe + $(ProjectDir)Output/$(Configuration) $(Platform)/$(ProjectName)\$(ProjectName).exe true Console true + $(ProjectDir)\..\..\..\..\..\win32\libxml2\lib;$(ProjectDir)\..\..\..\lib;$(ProjectDir)\..\..\..\..\..\win32\iconv\lib;%(AdditionalLibraryDirectories) + FCollada.lib;libiconv.lib;libxml2.lib;%(AdditionalDependencies) true MachineX86 if not exist "$(TargetDir)Samples" mkdir "$(TargetDir)Samples" xcopy /D /E /C /Q /Y "$(ProjectDir)Samples" "$(TargetDir)Samples" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\libxml2.dll" "$(TargetDir)" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\libiconv.dll" "$(TargetDir)" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\FCollada.dll" "$(TargetDir)" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\FCollada.pdb" "$(TargetDir)" @@ -257,26 +276,33 @@ Full OnlyExplicitInline Speed - $(ProjectDir)../LibXML/include;$(ProjectDir)..;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\..\..\..\win32\iconv\include;$(ProjectDir)..\..\..\..\..\win32\libxml2\include;$(ProjectDir)..;%(AdditionalIncludeDirectories) WIN32;NDEBUG;FCOLLADA_DLL;%(PreprocessorDefinitions) MultiThreaded false Use Level4 - true ProgramDatabase + true + 4458;4457;4456;%(DisableSpecificWarnings) - $(ProjectDir)../Output/$(Configuration) Unicode DLL $(Platform)/$(ProjectName).exe + $(ProjectDir)Output/$(Configuration) $(Platform)/$(ProjectName)\$(ProjectName).exe true Console true true MachineX64 + $(ProjectDir)\..\..\..\..\..\win32\libxml2\lib;$(ProjectDir)\..\..\..\lib;$(ProjectDir)\..\..\..\..\..\win32\iconv\lib;%(AdditionalLibraryDirectories) + FCollada.lib;libiconv.lib;libxml2.lib;%(AdditionalDependencies) if not exist "$(TargetDir)Samples" mkdir "$(TargetDir)Samples" xcopy /D /E /C /Q /Y "$(ProjectDir)Samples" "$(TargetDir)Samples" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\libxml2.dll" "$(TargetDir)" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\libiconv.dll" "$(TargetDir)" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\FCollada.dll" "$(TargetDir)" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\FCollada.pdb" "$(TargetDir)" @@ -298,6 +324,10 @@ if not exist "$(TargetDir)Samples" mkdir "$(TargetDir)Samples" xcopy /D /E /C /Q /Y "$(ProjectDir)Samples" "$(TargetDir)Samples" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\libxml2.dll" "$(TargetDir)" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\libiconv.dll" "$(TargetDir)" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\FColladaD.dll" "$(TargetDir)" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\FColladaD.pdb" "$(TargetDir)" @@ -307,8 +337,8 @@ Disabled - $(ProjectDir)../LibXML/include;$(ProjectDir)..;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;MEMORY_DEBUG;FCOLLADA_DLL;%(PreprocessorDefinitions) + $(ProjectDir)..\..\..\..\..\win32\iconv\include;$(ProjectDir)..\..\..\..\..\win32\libxml2\include;$(ProjectDir)..;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;FCOLLADA_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -320,6 +350,10 @@ if not exist "$(TargetDir)Samples" mkdir "$(TargetDir)Samples" xcopy /D /E /C /Q /Y "$(ProjectDir)Samples" "$(TargetDir)Samples" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\libxml2.dll" "$(TargetDir)" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\libiconv.dll" "$(TargetDir)" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\FColladaD.dll" "$(TargetDir)" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\FColladaD.pdb" "$(TargetDir)" @@ -342,6 +376,10 @@ if not exist "$(TargetDir)Samples" mkdir "$(TargetDir)Samples" xcopy /D /E /C /Q /Y "$(ProjectDir)Samples" "$(TargetDir)Samples" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\libxml2.dll" "$(TargetDir)" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\libiconv.dll" "$(TargetDir)" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\FCollada.dll" "$(TargetDir)" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\FCollada.pdb" "$(TargetDir)" @@ -353,7 +391,7 @@ Full OnlyExplicitInline Speed - $(ProjectDir)../LibXML/include;$(ProjectDir)..;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\..\..\..\win32\iconv\include;$(ProjectDir)..\..\..\..\..\win32\libxml2\include;$(ProjectDir)..;%(AdditionalIncludeDirectories) WIN32;NDEBUG;FCOLLADA_DLL;%(PreprocessorDefinitions) MultiThreaded false @@ -365,6 +403,10 @@ if not exist "$(TargetDir)Samples" mkdir "$(TargetDir)Samples" xcopy /D /E /C /Q /Y "$(ProjectDir)Samples" "$(TargetDir)Samples" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\libxml2.dll" "$(TargetDir)" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\libiconv.dll" "$(TargetDir)" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\FCollada.dll" "$(TargetDir)" +xcopy /E /C /Q /Y "$(ProjectDir)\..\..\..\..\..\..\binaries\system\FCollada.pdb" "$(TargetDir)" @@ -404,10 +446,11 @@ + - + \ No newline at end of file Index: ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/RunFColladaTests/RunFColladaTests.cs =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/RunFColladaTests/RunFColladaTests.cs +++ ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/RunFColladaTests/RunFColladaTests.cs @@ -1,66 +0,0 @@ -using System; -using System.IO; - -using NUnit.Framework; - -namespace RunFColladaTests -{ - /// - /// Test class for FColladaTest - /// - /// - [TestFixture] - public class RunFColladaTests - { - public RunFColladaTests() - { - // constructor needed by NUnit - } - - [Test][STAThread] - public void DoTest() - { - String path = System.Configuration.ConfigurationSettings.AppSettings["path"]; - String exe = System.Configuration.ConfigurationSettings.AppSettings["exe"]; - String outputName = System.Configuration.ConfigurationSettings.AppSettings["output"]; - - path.TrimEnd( new char[]{'\\'} ); - path = path + @"\"; - - // test for file existence - String fullName = path + exe; - CFileInfo file = new CFileInfo( fullName ); - - Assert.IsTrue( file.Exists, "Unable to find executable : " + fullName ); - - System.Diagnostics.Process proc; // Declare New Process - System.Diagnostics.ProcessStartInfo procInfo = new System.Diagnostics.ProcessStartInfo(); // Declare New Process Starting Information - - procInfo.UseShellExecute = false; //If this is false, only .exe's can be run. - procInfo.WorkingDirectory = path; //execute notepad from the C: Drive - procInfo.FileName = fullName; // Program or Command to Execute. - procInfo.Arguments = "-v 0 " + outputName; // no verbose + name of the file to output - procInfo.CreateNoWindow = true; - procInfo.RedirectStandardError = true; - - proc = System.Diagnostics.Process.Start( procInfo ); - proc.WaitForExit(); // Waits for the process to end. - - // test for errors in the called procedure - String procErr = proc.StandardError.ReadToEnd(); - Assert.IsTrue( (procErr.Length == 0), procErr ); - - CFileInfo outFile = new CFileInfo( path + outputName ); - - // test for outFile existence - Assert.IsTrue( outFile.Exists, exe + " was unable to create output file." ); - - StreamReader sr = new StreamReader( outFile.OpenRead() ); - String strFile = sr.ReadToEnd(); - sr.Close(); - - // if file non-empty then print report - Assert.IsTrue( (outFile.Length == 0), strFile ); - } - } -} Index: ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/RunFColladaTests/RunFColladaTests.csproj =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/RunFColladaTests/RunFColladaTests.csproj +++ ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/RunFColladaTests/RunFColladaTests.csproj @@ -1,102 +0,0 @@ - - - Local - 8.0.50727 - 2.0 - {6F1DAB3D-3089-46F3-A872-5CA21421F8C4} - Debug - AnyCPU - - - - - RunFColladaTests - - - JScript - Grid - IE50 - false - Library - RunFColladaTests - OnBuildSuccess - - - - - - - - - bin\Debug\ - false - 285212672 - false - - - DEBUG;TRACE - - - true - 4096 - false - - - false - false - false - false - 4 - full - prompt - - - bin\Release\ - false - 285212672 - false - - - TRACE - - - false - 4096 - false - - - true - false - false - false - 4 - none - prompt - - - - nunit.framework - ..\..\..\..\..\..\..\Program Files\NUnit 2.2.8\bin\nunit.framework.dll - - - System - - - System.Data - - - System.XML - - - - - Code - - - - - - - copy $(TargetPath) $(SolutionDir) - - \ No newline at end of file Index: ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/RunFColladaTests/RunFColladaTests.dll.config =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/RunFColladaTests/RunFColladaTests.dll.config +++ ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/RunFColladaTests/RunFColladaTests.dll.config @@ -1,10 +0,0 @@ - - - - - - - - - - Index: ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/RunFColladaTests/RunFColladaTests.sln =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/RunFColladaTests/RunFColladaTests.sln +++ ps/trunk/libraries/source/fcollada/src/FCollada/FColladaTest/RunFColladaTests/RunFColladaTests.sln @@ -1,19 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RunFColladaTests", "RunFColladaTests.csproj", "{6F1DAB3D-3089-46F3-A872-5CA21421F8C4}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6F1DAB3D-3089-46F3-A872-5CA21421F8C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F1DAB3D-3089-46F3-A872-5CA21421F8C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6F1DAB3D-3089-46F3-A872-5CA21421F8C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F1DAB3D-3089-46F3-A872-5CA21421F8C4}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal