Commit: dc1bbeae912c2fcf618b0f12dfe418f115e52d60 - MMDAI (git)

github 上にある MMDAI と MMDAI2 (VPVM) のミラーです

Commit MetaInfo

• Révision: dc1bbeae912c2fcf618b0f12dfe418f115e52d60 (tree)
• l'heure: 2014-04-05 17:59:18
• Auteur: hkrn <hikarin.jp@gmai...>
• Commiter: hkrn

Message de Log

brings crashreporter code to VPMM

Change Summary

• modified: VPMM/VPMM.qbs
• modified: VPMM/src/main.cc
• modified: VPVM/VPVM.qbs

Modification

--- a/VPMM/VPMM.qbs
+++ b/VPMM/VPMM.qbs
@@ -50,6 +50,7 @@ CppApplication {
     readonly property string assimpLibrarySuffix: qbs.toolchain.contains("msvc") ? "" : debugLibrarySuffix.toUpperCase()
     readonly property string nvFXLibrarySuffix: (cpp.architecture === "x86_64" ? "64" : "") + debugLibrarySuffix.toUpperCase()
     readonly property string sparkleFrameworkBasePath: sourceDirectory + "/../Sparkle-src/build/Release"
+    readonly property string plcrashreporterBasePath: sourceDirectory + "/../plcrashreporter-src"
     readonly property var commonLibraries: [
         "assimp" + assimpLibrarySuffix,
         "FxParser" + nvFXLibrarySuffix,
@@ -60,6 +61,15 @@ CppApplication {
         "BulletCollision",
         "LinearMath"
     ]
+    readonly property var commonLibraryPaths: [ FileInfo.joinPaths(sourceDirectory, "../tbb-src/lib") ].concat([
+        "../bullet-src",
+        "../assimp-src",
+        "../nvFX-src",
+        "../alure-src",
+        "../openal-soft-src",
+        "../icu4c-src",
+        "../zlib-src"
+    ].map(function(x){ return FileInfo.joinPaths(sourceDirectory, x, libraryInstallDirectory, "lib") }))
     readonly property var commonIncludePaths: [ buildDirectory ].concat([
         "include",
         "../VPAPI/include",
@@ -101,16 +111,7 @@ CppApplication {
     files: commonFiles
     cpp.defines: commonDefiles
     cpp.includePaths: commonIncludePaths
-    cpp.libraryPaths: [
-        "../tbb-src/lib",
-        "../bullet-src/" + libraryInstallDirectory + "/lib",
-        "../assimp-src/" + libraryInstallDirectory + "/lib",
-        "../nvFX-src/" + libraryInstallDirectory + "/lib",
-        "../alure-src/" + libraryInstallDirectory + "/lib",
-        "../openal-soft-src/" + libraryInstallDirectory + "/lib",
-        "../icu4c-src/" + libraryInstallDirectory + "/lib",
-        "../zlib-src/" + libraryInstallDirectory + "/lib"
-    ].map(function(path){ return FileInfo.joinPaths(sourceDirectory, path) })
+    cpp.libraryPaths: commonLibraryPaths
     Qt.quick.qmlDebugging: qbs.enableDebugCode
     Group {
         name: "Application"
@@ -161,13 +162,12 @@ CppApplication {
             }
             return frameworks
         }
-        cpp.dynamicLibraries: commonLibraries.concat([ "alure-static", "openal", "tbb", "z" ])
+        cpp.dynamicLibraries: commonLibraries.concat([ "CrashReporter-MacOSX-Static", "tbb", "z" ])
         cpp.minimumOsxVersion: "10.6"
         cpp.infoPlistFile: "qt/osx/Info.plist"
-        cpp.infoPlist: ({
-                            "CFBundleVersion": version,
-                            "CFBundleShortVersionString": version
-                        })
+        cpp.infoPlist: ({ "CFBundleVersion": version, "CFBundleShortVersionString": version })
+        cpp.includePaths: commonIncludePaths.concat([ plcrashreporterBasePath + "/Source" ])
+        cpp.libraryPaths: commonLibraryPaths.concat([ plcrashreporterBasePath + "/build/Release-MacOSX" ])
     }
     Properties {
         condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("osx")

--- a/VPMM/src/main.cc
+++ b/VPMM/src/main.cc
@@ -139,6 +139,10 @@ static void registerQmlTypes()
 
 }
 
+#ifdef Q_OS_MAC
+extern void installCrashReporter(const Preference &preference);
+#endif
+
 int main(int argc, char *argv[])
 {
     QCommandLineParser parser;
@@ -156,6 +160,7 @@ int main(int argc, char *argv[])
     if (applicationPreference.isFontFamilyToGUIShared()) {
         application.setFont(applicationPreference.fontFamily());
     }
+    installCrashReporter(applicationPreference);
     prepareRegal();
     registerQmlTypes();
 

--- a/VPVM/VPVM.qbs
+++ b/VPVM/VPVM.qbs
@@ -171,7 +171,7 @@ CppApplication {
             }
             return frameworks
         }
-        cpp.dynamicLibraries: commonLibraries.concat([ "alure-static", "openal", "tbb", "z", "CrashReporter-MacOSX-Static" ])
+        cpp.dynamicLibraries: commonLibraries.concat([ "CrashReporter-MacOSX-Static", "alure-static", "openal", "tbb", "z" ])
         cpp.minimumOsxVersion: "10.6"
         cpp.infoPlistFile: FileInfo.joinPaths(sourceDirectory, "/qt/osx/Info.plist")
         cpp.infoPlist: ({ "CFBundleVersion": version, "CFBundleShortVersionString": version })