revert Fix includes, remove/change Windows-specific code so TestApp can compile on other platforms
This commit is contained in:
Rose 2023-10-23 16:41:48 +13:00
parent ca6ec5212e
commit 19fa0ab849
5 changed files with 9 additions and 11 deletions

View file

@ -1,4 +1,4 @@
#include "infoPanel.h"
#include "InfoPanel.h"
#include "gameData.h"
#include <QtWidgets>

View file

@ -1,7 +1,7 @@
#include <QtWidgets>
#include "mainWindow.h"
#include "infoPanel.h"
#include "InfoPanel.h"
MainWindow::MainWindow(GameData& gameDataIn)
: textEdit(new QTextEdit), gameData(gameDataIn)

View file

@ -1,8 +1,8 @@
#pragma once
#include <SDL.h>
#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<string> 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);
}
}

View file

@ -1,5 +1,3 @@
#include <cstring>
#include "LmpFile.h"
#include "DataAccess.h"
#include "Helpers.h"
@ -70,4 +68,4 @@ std::vector<std::string> LmpFile::findFilenamesByExtension(const char* extension
}
}
return foundFilenames;
}
}

View file

@ -1,5 +1,3 @@
#include <cstring>
#include "VifDecoder.h"
#include "DataUtil.h"
#include "GIFTag.h"