فهرست منبع

Fix crash if no data, dont install redists, update lua to one that actually installs lua

Paul 11 سال پیش
والد
کامیت
66a84ed64b
3فایلهای تغییر یافته به همراه7 افزوده شده و 2 حذف شده
  1. 2 1
      CMakeLists.txt
  2. 4 0
      QGearsMain/src/Main.cpp
  3. 1 1
      dependencies/luajit

+ 2 - 1
CMakeLists.txt

@@ -200,7 +200,8 @@ endif()
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/output)
 
 # Set generic CPack properties
-INCLUDE(InstallRequiredSystemLibraries)
+# DO NOT include on win32 - causes CRT dlls to be included
+#INCLUDE(InstallRequiredSystemLibraries)
 
 set(CPACK_PACKAGE_NAME "q-gears")
 SET(CPACK_PACKAGE_VERSION ${QGears_VERSION_MAJOR}.${QGears_VERSION_MINOR}.${QGears_VERSION_PATCH})

+ 4 - 0
QGearsMain/src/Main.cpp

@@ -141,6 +141,10 @@ main(int argc, char *argv[])
     {
         std::cout << "std::runtime_error thrown: " << ex.what() << std::endl;
     }
+    catch (const Ogre::Exception& ex)
+    {
+        std::cout << "Ogre::Exception thrown: " << ex.what() << std::endl;
+    }
 
     return 0;
 }

+ 1 - 1
dependencies/luajit

@@ -1 +1 @@
-Subproject commit 817db98b129164bca5e22faefd5051ae49c9e8d6
+Subproject commit b03c306a4a1dfd1f96e2594315b68a2c8bccc5d2