Fix Qt for Windows (should compile now)

Stride needs to be allocated dynamically. Maybe g++ ignores this, msvc doesn't.
Home dir should use QDir::homePath() to be cross-platform.
Windows has its own DrawText(), compile with NODRAWTEXT.
Allow compiling on release and debug for windows.
Ignore some warnings.
This commit is contained in:
Sacha committed 2013-02-20 00:08:00 +10:00
1 parent a33530232c
commit 73842db159
5 files changed
+14 -6

No files matched your search

+8 -1
View File
@@ -10,7 +10,14 @@ include(Settings.pri)
# Libs
symbian: LIBS += -lCore.lib -lCommon.lib -lNative.lib -lcone -leikcore -lavkon -lezlib
blackberry: LIBS += -L. -lCore -lCommon -lNative -lscreen -lsocket -lstdc++
win32: LIBS += -L$$OUT_PWD/release -lCore -lCommon -lNative -lwinmm -lws2_32 -lkernel32 -luser32 -lgdi32 -lshell32 -lcomctl32 -ldsound -lxinput
win32 {
CONFIG(release, debug|release) {
LIBS += -L$$OUT_PWD/release
} else {
LIBS += -L$$OUT_PWD/debug
}
LIBS += -lCore -lCommon -lNative -lwinmm -lws2_32 -lkernel32 -luser32 -lgdi32 -lshell32 -lcomctl32 -ldsound -lxinput
}
linux: LIBS += -L. -lCore -lCommon -lNative
linux:!mobile_platform {
+1 -1
View File
@@ -8,7 +8,7 @@ INCLUDEPATH += ../ext/zlib ../native/ext/glew ../Common
win32-msvc* {
QMAKE_CXXFLAGS_RELEASE += /O2 /arch:SSE2 /fp:fast
DEFINES += _MBCS GLEW_STATIC NOMINMAX
DEFINES += _MBCS GLEW_STATIC NOMINMAX NODRAWTEXT _CRT_SECURE_NO_WARNINGS
PRECOMPILED_HEADER = ../Windows/stdafx.h
PRECOMPILED_SOURCE = ../Windows/stdafx.cpp
} else {
+2 -1
View File
@@ -1686,9 +1686,10 @@ void Debugger_DisplayList::UpdateVertexInfo()
VertexDecoder vtcDec;
vtcDec.SetVertexType(state.vertType);
u8 tmp[20*vtcDec.GetDecVtxFmt().stride];
u8* tmp = u8(20*vtcDec.GetDecVtxFmt().stride);
vtcDec.DecodeVerts(tmp,Memory::GetPointer(vaddr),0,0,0,0,19);
VertexReader vtxRead(tmp,vtcDec.GetDecVtxFmt(),state.vertType);
delete tmp;
for(int i = 0; i < maxVtxDisplay; i++)
{
+2 -2
View File
@@ -154,10 +154,10 @@ void NativeInit(int argc, const char *argv[], const char *savegame_directory, co
if (g_Config.currentDirectory == "")
{
g_Config.currentDirectory = getenv("HOME");
g_Config.currentDirectory = QDir::homePath().toStdString();
}
g_Config.memCardDirectory = std::string(getenv("HOME"))+"/.ppsspp/";
g_Config.memCardDirectory = QDir::homePath().toStdString()+"/.ppsspp/";
g_Config.flashDirectory = g_Config.memCardDirectory+"/flash/";
LogManager::Init();
+1 -1
Submodule native updated: f5e7bd5a9c...14386f87b0.