From eda2b5b1d51c7ef05053c5052482c7fd80cc6ea1 Mon Sep 17 00:00:00 2001 From: Rose Date: Mon, 23 Oct 2023 17:55:23 +1300 Subject: [PATCH] (Used Razzy's credentials by accident the first time) Fix includes remove/change Windows-specific code so TestApp can compile on other platforms --- CuttownTest/infoPanel.cpp | 2 +- CuttownTest/mainWindow.cpp | 2 +- TestApp/Main.cpp | 10 ++++------ snowlib/LmpFile.cpp | 4 +++- snowlib/VifDecoder.cpp | 2 ++ 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/CuttownTest/infoPanel.cpp b/CuttownTest/infoPanel.cpp index c9a0cff..5a16b13 100644 --- a/CuttownTest/infoPanel.cpp +++ b/CuttownTest/infoPanel.cpp @@ -1,4 +1,4 @@ -#include "InfoPanel.h" +#include "infoPanel.h" #include "gameData.h" #include diff --git a/CuttownTest/mainWindow.cpp b/CuttownTest/mainWindow.cpp index 3c8a228..4ea6015 100644 --- a/CuttownTest/mainWindow.cpp +++ b/CuttownTest/mainWindow.cpp @@ -1,7 +1,7 @@ #include #include "mainWindow.h" -#include "InfoPanel.h" +#include "infoPanel.h" MainWindow::MainWindow(GameData& gameDataIn) : textEdit(new QTextEdit), gameData(gameDataIn) diff --git a/TestApp/Main.cpp b/TestApp/Main.cpp index 8ff7d3a..5d866dd 100644 --- a/TestApp/Main.cpp +++ b/TestApp/Main.cpp @@ -1,8 +1,8 @@ #pragma once -#include "SDL.h" + +#include #include "ModelWindow.h" -#include "windows.h" #include "LmpRepository.h" #include "GobFile.h" #include "VifDecoder.h" @@ -54,7 +54,7 @@ Model* readModel(string dataPath, const char* lmpName, vector meshNames, } int main(int argc, char **argv) { - string dataPath = "D:\\emu\\bgda\\BG\\DATA\\"; + string dataPath = ""; if (argc == 2){ dataPath = argv[1]; } @@ -102,9 +102,7 @@ int main(int argc, char **argv) { if ( deltaclock != 0 ){ unsigned int currentFPS = 1000 / deltaclock; - char fpsString[64]; - sprintf(fpsString, "FPS: %d\n", currentFPS); - OutputDebugStringA(fpsString); + fprintf(stderr, "FPS: %d\n", currentFPS); } } diff --git a/snowlib/LmpFile.cpp b/snowlib/LmpFile.cpp index 8134d9f..3ccdb52 100644 --- a/snowlib/LmpFile.cpp +++ b/snowlib/LmpFile.cpp @@ -1,3 +1,5 @@ +#include + #include "LmpFile.h" #include "DataAccess.h" #include "Helpers.h" @@ -68,4 +70,4 @@ std::vector LmpFile::findFilenamesByExtension(const char* extension } } return foundFilenames; -} \ No newline at end of file +} diff --git a/snowlib/VifDecoder.cpp b/snowlib/VifDecoder.cpp index 096c1ef..97e0013 100644 --- a/snowlib/VifDecoder.cpp +++ b/snowlib/VifDecoder.cpp @@ -1,3 +1,5 @@ +#include + #include "VifDecoder.h" #include "DataUtil.h" #include "GIFTag.h"