FIX compiling Qt build with MSVC++

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@603 a31d4220-a93d-0410-bf67-fe4944624d44
This commit is contained in:
spacy51 2008-08-13 23:20:45 +00:00
parent fa34b2c3b5
commit 3253f62ad0
3 changed files with 6 additions and 2 deletions

View File

@ -26,6 +26,7 @@ OpenAL SDK: http://connect.creativelabs.com/openal/default.aspx
OpenGL files: http://www.opengl.org/registry/
zlib: http://zlib.net/
libpng: http://libpng.org/pub/png/libpng.html
UPX: http://upx.sourceforge.net/
You can find pre-built versions of zlib & libpng at:
http://vba-m.ngemu.com/vbam/vbasources/libs/
@ -56,6 +57,7 @@ It uses the qmake file in trunk/project/qmake, so you always have to add files t
IMPORTANT: The Qt-sources have to be compiled with the Microsoft compiler first, in order to use it,
because the default binary distribution was compiled with mingw and will not work with the MS Compiler.
Continue by reading "How to compile Qt from source with Visual C++ 2008".
The release build will automatically be compressed with UPX, make sure to download it and point MSVC++ to it.

View File

@ -11,6 +11,7 @@ M_DIR_SHARED = ../../src/
M_DIR_GBAPU = ../../src/dmg/gb_apu/
M_DIR_AGB = ../../src/agb/
M_DIR_DMG = ../../src/dmg/
M_DIR_DEP = ../../../dependencies/msvc/
# OSs
@ -20,9 +21,10 @@ M_DIR_DMG = ../../src/dmg/
# Tweaks
win32-msvc2005 {
win32-msvc2008 {
DEFINES += _CRT_SECURE_NO_WARNINGS
DEFINES += NO_PNG
INCLUDEPATH += $${M_DIR_DEP}
}

View File

@ -1,6 +1,6 @@
#include "version.h"
IDI_ICON1 ICON DISCARDABLE "../../src/win32/VBA-M.ico"
IDI_ICON1 ICON DISCARDABLE "../../src/win32/res/VBA.ico"
#include <WinVer.h>