From 19fa0ab8495487d0e5249a0f8baa7386f0e09fd7 Mon Sep 17 00:00:00 2001 From: Rose Date: Mon, 23 Oct 2023 16:41:48 +1300 Subject: [PATCH] revert ca6ec5212ea4a19546132b2cb45479e11197c302 revert 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, 9 insertions(+), 11 deletions(-) diff --git a/CuttownTest/infoPanel.cpp b/CuttownTest/infoPanel.cpp index 5a16b13..c9a0cff 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 4ea6015..3c8a228 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 5d866dd..8ff7d3a 100644 --- a/TestApp/Main.cpp +++ b/TestApp/Main.cpp @@ -1,8 +1,8 @@ #pragma once - -#include +#include "SDL.h" #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 = ""; + string dataPath = "D:\\emu\\bgda\\BG\\DATA\\"; if (argc == 2){ dataPath = argv[1]; } @@ -102,7 +102,9 @@ int main(int argc, char **argv) { if ( deltaclock != 0 ){ unsigned int currentFPS = 1000 / deltaclock; - fprintf(stderr, "FPS: %d\n", currentFPS); + char fpsString[64]; + sprintf(fpsString, "FPS: %d\n", currentFPS); + OutputDebugStringA(fpsString); } } diff --git a/snowlib/LmpFile.cpp b/snowlib/LmpFile.cpp index 3ccdb52..8134d9f 100644 --- a/snowlib/LmpFile.cpp +++ b/snowlib/LmpFile.cpp @@ -1,5 +1,3 @@ -#include - #include "LmpFile.h" #include "DataAccess.h" #include "Helpers.h" @@ -70,4 +68,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 97e0013..096c1ef 100644 --- a/snowlib/VifDecoder.cpp +++ b/snowlib/VifDecoder.cpp @@ -1,5 +1,3 @@ -#include - #include "VifDecoder.h" #include "DataUtil.h" #include "GIFTag.h"