liblsdj usage tweaks and win32-specific linking

InspectorConstructor · Aug 28, 2019 · 3d6791e · 3d6791e
1 parent 9213228
commit 3d6791e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -127,7 +127,7 @@ bool lsdj_check_err(lsdj_error_t *err)
     if (err)
     {
         QString msg = "Error: ";
-        msg.append(err->message);
+        msg.append(lsdj_error_get_c_str(err));
         qCritical() << msg;
         QMessageBox::critical(nullptr, "Merge failed", msg);
         lsdj_error_free(err);
@@ -298,7 +298,7 @@ void MainWindow::on_splitSavLine_textChanged(const QString &arg1)
         }
         else
         {
-            for (int i = 0 ; i < LSDJ_SAV_PROJECT_COUNT ; ++i)
+            for (int i = 0 ; i < 32 ; ++i)
             {
                 char name[LSDJ_PROJECT_NAME_LENGTH+1];
                 memset(name, 0, LSDJ_PROJECT_NAME_LENGTH+1);

diff --git a/spreadMechanism.pro b/spreadMechanism.pro
@@ -28,12 +28,16 @@ CONFIG(release, debug|release) {
     CONFIG += optimize_full
 }
 
-# liblsdj!
-# don't install liblsdj to the same place as brew: there are serious image library conflicts
-#LIBS += -L/opt/nick/lib -llsdj
+win32 {
+    INCLUDEPATH += "C:/Users/Nicholas St.Pierre/Code/BUILT/include"
+    #LIBS += "/NODEFAULTLIB:C:/Users/Nicholas St.Pierre/Code/BUILT/lib/lsdj.lib"
+    LIBS += "C:/Users/Nicholas St.Pierre/Code/BUILT/lib/lsdj.lib"
+}
 
-#STATIC LSDJ
-LIBS += /opt/nick/lib/liblsdj.a
+unix {
+    # note: don't install liblsdj to the same place as brew: there are serious image library conflicts
+    LIBS += /opt/nick/lib/liblsdj.a
+}
 
 INCLUDEPATH += /opt/nick/include