(Used Razzy's credentials by accident the first time) Fix includes
remove/change Windows-specific code so TestApp can compile on other platforms
This commit is contained in:
parent
19fa0ab849
commit
eda2b5b1d5
|
@ -1,4 +1,4 @@
|
|||
#include "InfoPanel.h"
|
||||
#include "infoPanel.h"
|
||||
#include "gameData.h"
|
||||
|
||||
#include <QtWidgets>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
#include <QtWidgets>
|
||||
#include "mainWindow.h"
|
||||
#include "InfoPanel.h"
|
||||
#include "infoPanel.h"
|
||||
|
||||
MainWindow::MainWindow(GameData& gameDataIn)
|
||||
: textEdit(new QTextEdit), gameData(gameDataIn)
|
||||
|
|
|
@ -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 = "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);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
#include <cstring>
|
||||
|
||||
#include "LmpFile.h"
|
||||
#include "DataAccess.h"
|
||||
#include "Helpers.h"
|
||||
|
@ -68,4 +70,4 @@ std::vector<std::string> LmpFile::findFilenamesByExtension(const char* extension
|
|||
}
|
||||
}
|
||||
return foundFilenames;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
#include <cstring>
|
||||
|
||||
#include "VifDecoder.h"
|
||||
#include "DataUtil.h"
|
||||
#include "GIFTag.h"
|
||||
|
|
Reference in a new issue