From 558abff4db68c92365e205266675e476315ccc81 Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Mon, 8 Feb 2010 08:51:08 +0000 Subject: [PATCH] added extra file search path for cmake-generated msvc projectfiles (needs 4 levels back) --- Demos/BspDemo/BspDemo.cpp | 7 +++++++ Demos/CharacterDemo/CharacterDemo.cpp | 6 ++++++ .../ConvexDecompositionDemo.cpp | 5 +++++ Demos/SerializeDemo/SerializeDemo.cpp | 8 ++++++-- testFileOriginal.bullet | Bin 0 -> 67844 bytes 5 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 testFileOriginal.bullet diff --git a/Demos/BspDemo/BspDemo.cpp b/Demos/BspDemo/BspDemo.cpp index 548d97e9e..a8fdb7494 100644 --- a/Demos/BspDemo/BspDemo.cpp +++ b/Demos/BspDemo/BspDemo.cpp @@ -181,6 +181,13 @@ void BspDemo::initPhysics(const char* bspfilename) file = fopen(bspfilename,"r"); } if (!file) + { + + //try again other path, cmake needs 4 levels deep back... + bspfilename = "../../../../BspDemo.bsp"; + file = fopen(bspfilename,"r"); + } + if (!file) { //try again other path, //sight... visual studio leaves the current working directory in the projectfiles folder diff --git a/Demos/CharacterDemo/CharacterDemo.cpp b/Demos/CharacterDemo/CharacterDemo.cpp index 97763f441..cddd22196 100644 --- a/Demos/CharacterDemo/CharacterDemo.cpp +++ b/Demos/CharacterDemo/CharacterDemo.cpp @@ -103,6 +103,12 @@ void CharacterDemo::initPhysics() FILE* file = fopen(bspfilename,"r"); if (!file) + { + //cmake generated visual studio projects need 4 levels back + bspfilename = "../../../../BspDemo.bsp"; + file = fopen(bspfilename,"r"); + } + if (!file) { //visual studio leaves the current working directory in the projectfiles folder bspfilename = "../../BspDemo.bsp"; diff --git a/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp b/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp index e6b66ea99..4faadd5d5 100644 --- a/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp +++ b/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp @@ -169,6 +169,11 @@ void ConvexDecompositionDemo::initPhysics(const char* filename) //when running this app from visual studio, the default starting folder is different, so make a second attempt... tcount = wo.loadObj("../../file.obj"); } + if (!tcount) + { + //cmake generated msvc files need 4 levels deep back... so make a 3rd attempt... + tcount = wo.loadObj("../../../../file.obj"); + } diff --git a/Demos/SerializeDemo/SerializeDemo.cpp b/Demos/SerializeDemo/SerializeDemo.cpp index f8a200148..f9e421718 100644 --- a/Demos/SerializeDemo/SerializeDemo.cpp +++ b/Demos/SerializeDemo/SerializeDemo.cpp @@ -260,9 +260,13 @@ void SerializeDemo::initPhysics() btBulletWorldImporter* fileLoader = new btBulletWorldImporter(m_dynamicsWorld); //fileLoader->setVerboseMode(true); - if (fileLoader->loadFile("testFile.bullet")) + if (!fileLoader->loadFile("testFile.bullet")) { - printf("loaded fine\n"); + //cmake generated msvc files need 4 levels deep back... so make a 3rd attempt... + if (fileLoader->loadFile("../../../../testFileOriginal.bullet")) + { + printf("loaded fine\n"); + } } diff --git a/testFileOriginal.bullet b/testFileOriginal.bullet new file mode 100644 index 0000000000000000000000000000000000000000..b946379739fca1bcdbd185eb00d3a423fe5e86e8 GIT binary patch literal 67844 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