Last round of tweaks

mkeeter · Jan 18, 2017 · a2ac019 · a2ac019
1 parent e019a53
commit a2ac019
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/app/app/app.cpp b/app/app/app.cpp
@@ -59,6 +59,9 @@ QStringList App::nodePaths() const
     // If we're running Antimony from the build folder, use sb/nodes
     paths << applicationDirPath() + "/sb/nodes";
     paths << applicationDirPath() + "/../share/antimony/nodes";
+#elif defined Q_OS_WIN32
+    // Windows only supports running from the build directory
+    paths << applicationDirPath() + "/sb/nodes";
 #else
 #error "Unknown OS!"
 #endif

diff --git a/app/app/main.cpp b/app/app/main.cpp
@@ -58,6 +58,9 @@ int main(int argc, char *argv[])
             fab_paths.push_back(p.toStdString());
         }
         fab::postInit(fab_paths);
+#elif defined Q_OS_WIN32
+        auto dir = QCoreApplication::applicationDirPath();
+        fab::postInit({(dir + "/sb").toStdString()});
 #else
 #error "Unknown OS!"
 #endif

diff --git a/lib/graph/CMakeLists.txt b/lib/graph/CMakeLists.txt
@@ -19,8 +19,8 @@ target_include_directories(SbGraph SYSTEM PRIVATE
     ${Boost_INCLUDE_DIRS}
 )
 target_link_libraries(SbGraph
-    ${PYTHON_LIBRARY}
     ${Boost_LIBRARIES}
+    ${PYTHON_LIBRARY}
 )
 target_include_directories(SbGraph PUBLIC inc)