ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

REMOVED outdated VC2005 project files 

REMOVED libpng source code
REMOVED zlib source code
RENAMED vc2008 to vc2008_qt
MOVED Win32/MFC project files to 'project/vc2008_mfc' folder
CHANGED XAudio2 to default sound output
This commit is contained in:
spacy51 2008-08-13 10:01:39 +00:00
parent 4fd9f109e5
commit 09893c94c6
11 changed files with 1550 additions and 3572 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
VBA.sln
View File

@ -1,63 +0,0 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VisualBoyAdvance", "VBA.vcproj", "{6D4C5EC8-933F-4C05-A1BF-498E658576DF}"
ProjectSection(ProjectDependencies) = postProject
{B938FBD9-C7F9-4BF7-8C27-68865D1FA092} = {B938FBD9-C7F9-4BF7-8C27-68865D1FA092}
{7AEC599C-7C82-4F00-AA60-411E0A359CB0} = {7AEC599C-7C82-4F00-AA60-411E0A359CB0}
{B1BB4620-E672-4D6B-AF90-08161EB18D4F} = {B1BB4620-E672-4D6B-AF90-08161EB18D4F}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\dependencies\zlib\zlib.vcproj", "{B938FBD9-C7F9-4BF7-8C27-68865D1FA092}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\dependencies\libpng\libpng.vcproj", "{B1BB4620-E672-4D6B-AF90-08161EB18D4F}"
ProjectSection(ProjectDependencies) = postProject
{B938FBD9-C7F9-4BF7-8C27-68865D1FA092} = {B938FBD9-C7F9-4BF7-8C27-68865D1FA092}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "File_Extractor", "..\dependencies\File_Extractor-0.4.3\File_Extractor.vcproj", "{7AEC599C-7C82-4F00-AA60-411E0A359CB0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Debug|Win32.ActiveCfg = Debug|Win32
{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Debug|Win32.Build.0 = Debug|Win32
{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Debug|x64.ActiveCfg = Debug|x64
{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Debug|x64.Build.0 = Debug|x64
{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Release|Win32.ActiveCfg = Release|Win32
{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Release|Win32.Build.0 = Release|Win32
{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Release|x64.ActiveCfg = Release|x64
{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Release|x64.Build.0 = Release|x64
{B938FBD9-C7F9-4BF7-8C27-68865D1FA092}.Debug|Win32.ActiveCfg = Debug|Win32
{B938FBD9-C7F9-4BF7-8C27-68865D1FA092}.Debug|Win32.Build.0 = Debug|Win32
{B938FBD9-C7F9-4BF7-8C27-68865D1FA092}.Debug|x64.ActiveCfg = Debug|x64
{B938FBD9-C7F9-4BF7-8C27-68865D1FA092}.Debug|x64.Build.0 = Debug|x64
{B938FBD9-C7F9-4BF7-8C27-68865D1FA092}.Release|Win32.ActiveCfg = Release|Win32
{B938FBD9-C7F9-4BF7-8C27-68865D1FA092}.Release|Win32.Build.0 = Release|Win32
{B938FBD9-C7F9-4BF7-8C27-68865D1FA092}.Release|x64.ActiveCfg = Release|x64
{B938FBD9-C7F9-4BF7-8C27-68865D1FA092}.Release|x64.Build.0 = Release|x64
{B1BB4620-E672-4D6B-AF90-08161EB18D4F}.Debug|Win32.ActiveCfg = Debug|Win32
{B1BB4620-E672-4D6B-AF90-08161EB18D4F}.Debug|Win32.Build.0 = Debug|Win32
{B1BB4620-E672-4D6B-AF90-08161EB18D4F}.Debug|x64.ActiveCfg = Debug|x64
{B1BB4620-E672-4D6B-AF90-08161EB18D4F}.Debug|x64.Build.0 = Debug|x64
{B1BB4620-E672-4D6B-AF90-08161EB18D4F}.Release|Win32.ActiveCfg = Release|Win32
{B1BB4620-E672-4D6B-AF90-08161EB18D4F}.Release|Win32.Build.0 = Release|Win32
{B1BB4620-E672-4D6B-AF90-08161EB18D4F}.Release|x64.ActiveCfg = Release|x64
{B1BB4620-E672-4D6B-AF90-08161EB18D4F}.Release|x64.Build.0 = Release|x64
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|Win32.ActiveCfg = Debug|Win32
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|Win32.Build.0 = Debug|Win32
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|x64.ActiveCfg = Debug|x64
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|x64.Build.0 = Debug|x64
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|Win32.ActiveCfg = Release|Win32
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|Win32.Build.0 = Release|Win32
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|x64.ActiveCfg = Release|x64
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

1967
VBA.vcproj
View File

File diff suppressed because it is too large Load Diff

20
doc/DevInfo.txt
View File

@ -15,14 +15,14 @@ Known preprocessor switches:
- NO_OGL: Exclude OpenGL code
- NO_D3D: Exclude Direct3D code
- NO_OAL: Exclude OpenAL code
- NO_XAUDIO2: Exclude XAudio2 code (supersedes DirectSound)
- NO_XAUDIO2: Exclude XAudio2 code (the XAudio2 interface is DirectSound's successor)
Download locations:
NASM: http://nasm.sourceforge.net
NASM: http://nasm.sourceforge.net/
DirectX SDK: http://msdn2.microsoft.com/en-us/xna/aa937788.aspx
OpenAL SDK: http://openal.org/downloads.html
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
@ -41,14 +41,18 @@ They are built with the static C runtime (this is what the releases use).
There are two solution files for Visual C++ 2008:
===Win32/MFC===
The Windows MFC GUI version project files are located in the root of the VBA-M sources (VBA2008.sln).
In order to compile it, you have to compile zlib and libpng first and set your compiler's INCLUDE and LIB path accordingly.
The Windows MFC GUI version project files are located in trunk/project/vc2008_mfc (VBA2008.sln).
In order to compile it, you have to compile or download a precompiled version of zlib and libpng first
and set your compiler's INCLUDE and LIB path accordingly.
You also need Microsoft's DirectX SDK (At least for DirectInput).
If you want to enable OpenAL sound output, install the OpenAL SDK. If you do not want it, #define NO_OAL.
Some pixel filters come with assembler code compatible with NASM syntax. Extract NASM somewhere and add it to your PATH environment variable. All .asm files should be handled with the "nasm.rules" build rules file, also in the source root.
Some pixel filters come with assembler code compatible with NASM syntax.
Extract NASM somewhere and add it to your compiler's PATH environment variable.
All .asm files should be handled with the "nasm.rules" build rules file.
===Win32/Qt===
The MS Visual C++ 2008 Express-compatible project file can be found in /project/vc2008.
The MS Visual C++ 2008 Express-compatible project file can be found in /project/vc2008_qt.
It uses the qmake file in /project/qmake.
IMPORTANT: The Qt-sources have to be compiled with the Microsoft compiler first, in order to use it. The default distribution was compiled with mingw and will not work with the MS Compiler.
IMPORTANT: The Qt-sources have to be compiled with the Microsoft compiler first, in order to use it.
The default distribution was compiled with mingw and will not work with the MS Compiler.
The dependencies folder is not (yet) necessary.

2
lang/how-to.txt
View File

@ -1,4 +1,4 @@
How to create a new translation:
How to create a new translation for the Qt build:
For Windows:

56
VBA2008.sln → project/vc2008_mfc/VBA2008.sln
View File

@ -1,28 +1,28 @@
Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VisualBoyAdvance", "VBA2008.vcproj", "{6D4C5EC8-933F-4C05-A1BF-498E658576DF}"
ProjectSection(ProjectDependencies) = postProject
{7AEC599C-7C82-4F00-AA60-411E0A359CB0} = {7AEC599C-7C82-4F00-AA60-411E0A359CB0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "File_Extractor", "..\dependencies\File_Extractor-0.4.3\File_Extractor2008.vcproj", "{7AEC599C-7C82-4F00-AA60-411E0A359CB0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Debug|Win32.ActiveCfg = Debug|Win32
{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Debug|Win32.Build.0 = Debug|Win32
{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Release|Win32.ActiveCfg = Release|Win32
{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Release|Win32.Build.0 = Release|Win32
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|Win32.ActiveCfg = Debug|Win32
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|Win32.Build.0 = Debug|Win32
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|Win32.ActiveCfg = Release|Win32
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VisualBoyAdvance", "VBA2008.vcproj", "{6D4C5EC8-933F-4C05-A1BF-498E658576DF}"
ProjectSection(ProjectDependencies) = postProject
{7AEC599C-7C82-4F00-AA60-411E0A359CB0} = {7AEC599C-7C82-4F00-AA60-411E0A359CB0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "File_Extractor", "..\..\..\dependencies\File_Extractor-0.4.3\File_Extractor2008.vcproj", "{7AEC599C-7C82-4F00-AA60-411E0A359CB0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Debug|Win32.ActiveCfg = Debug|Win32
{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Debug|Win32.Build.0 = Debug|Win32
{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Release|Win32.ActiveCfg = Release|Win32
{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Release|Win32.Build.0 = Release|Win32
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|Win32.ActiveCfg = Debug|Win32
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|Win32.Build.0 = Debug|Win32
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|Win32.ActiveCfg = Release|Win32
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

2998
VBA2008.vcproj → project/vc2008_mfc/VBA2008.vcproj
View File

File diff suppressed because it is too large Load Diff

0
nasm.rules → project/vc2008_mfc/nasm.rules
View File

0
project/vc2008/vba-m.sln → project/vc2008_qt/vba-m.sln
View File

0
project/vc2008/vba-m.vcproj → project/vc2008_qt/vba-m.vcproj
View File

9
src/win32/VBA.cpp
View File

@ -295,6 +295,7 @@ VBA::VBA()
oalBufferCount = 5;
#endif
#ifndef NO_XAUDIO2
audioAPI = XAUDIO2;
xa2Device = 0;
xa2BufferCount = 4;
xa2Upmixing = false;
@ -1546,7 +1547,7 @@ void VBA::loadSettings()
}
#endif
audioAPI = (AUDIO_API)regQueryDwordValue( "audioAPI", DIRECTSOUND );
audioAPI = (AUDIO_API)regQueryDwordValue( "audioAPI", XAUDIO2 );
if( ( audioAPI != DIRECTSOUND )
#ifndef NO_OAL
&& ( audioAPI != OPENAL_SOUND )
@ -1555,7 +1556,11 @@ void VBA::loadSettings()
&& ( audioAPI != XAUDIO2 )
#endif
) {
audioAPI = DIRECTSOUND;
#ifndef NO_XAUDIO2
audioAPI = XAUDIO2;
#else
audioAPI = DIRECTSOUND;
#endif
}
windowPositionX = regQueryDwordValue("windowX", 0);

7
src/win32/XAudio2_Config.cpp
View File

@ -111,7 +111,9 @@ BOOL XAudio2_Config::OnInitDialog()
systemMessage( IDS_XAUDIO2_CANNOT_ENUMERATE_DEVICES, NULL );
break;
} else {
#ifdef _MBCS
#ifdef _UNICODE
int id = m_combo_dev.AddString( dd.DisplayName );
#else
CHAR temp[256];
ZeroMemory( temp, sizeof( temp ) );
WideCharToMultiByte(
@ -125,9 +127,6 @@ BOOL XAudio2_Config::OnInitDialog()
NULL );
int id = m_combo_dev.AddString( temp );
#endif
#ifdef _UNICODE
int id = m_combo_dev.AddString( dd.DisplayName );
#endif
if( id < 0 ) {
systemMessage( IDS_XAUDIO2_CANNOT_ENUMERATE_DEVICES, NULL );