feat: add luarocks lfs.dll to the build.

techannihilation · Dec 22, 2023 · db141ca · db141ca
1 parent 2ca6037
commit db141ca
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -156,7 +156,13 @@
       "type": "cppdbg",
       "request": "launch",
       "program": "${workspaceFolder}/out/build/msys2-mingw64-debug/src/Upspring",
-      "args": [],
+      "args": [
+        "--run",
+        "runscripts\\convert_with_atlas.lua",
+        "--", 
+        "..\\TA\\unittextures\\arm.yaml",
+        "..\\TA-3do\\objects3d\\arm_broadside.3do",
+      ],
       "stopAtEntry": false,
       "cwd": "${workspaceFolder}",
       "environment": [],
@@ -173,7 +179,6 @@
           "ignoreFailures": true
         }
       ],
-      "preLaunchTask": "msys2-mingw64-debug"
     }
   ]
 }
diff --git a/lfs.dll b/lfs.dll
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -25,6 +25,7 @@ find_package(Lua REQUIRED)
 
 add_subdirectory(swig)
 
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/../lfs.dll DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/../data DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/../scripts DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/../runscripts DESTINATION ${CMAKE_CURRENT_BINARY_DIR})

diff --git a/src/FileIO/S3O.cpp b/src/FileIO/S3O.cpp
@@ -340,6 +340,7 @@ bool Model::SaveS3O(const char* filename, IProgressCtl& /*progctl*/) {
 
   FILE* f = fopen(filename, "wb");
   if (f == nullptr) {
+    spdlog::error("Failed to open '{}' for writing.", filename);
     return false;
   }