win32: continue to overhaul vs project organization. You will need to delete your sln files as I am now checking these in. Additionally, every build is now SSE2. If you want a non-sse2 build you better define NOSSE2 and turn off the codegen option.
This commit is contained in:
zeromus
parent
b831e49635
commit
da9cfbe200
|
|
@ -33,7 +33,7 @@ void MatrixInit (float *matrix)
|
|||
matrix[0] = matrix[5] = matrix[10] = matrix[15] = 1.f;
|
||||
}
|
||||
|
||||
#ifndef SSE2
|
||||
#ifdef NOSSE2
|
||||
void MATRIXFASTCALL MatrixMultVec4x4 (const float *matrix, float *vecPtr)
|
||||
{
|
||||
float x = vecPtr[0];
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ void MatrixInit (float *matrix);
|
|||
//In order to conditionally use these asm optimized functions in visual studio
|
||||
//without having to make new build types to exclude the assembly files.
|
||||
//a bit sloppy, but there aint much to it
|
||||
#ifdef SSE2
|
||||
#ifndef NOSSE2
|
||||
#define SSE2_FUNC(X) _sse2_##X
|
||||
#define MatrixMultVec4x4 _sse2_MatrixMultVec4x4
|
||||
#define MatrixMultVec3x3 _sse2_MatrixMultVec3x3
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#include "common.h"
|
||||
|
||||
#define MAX_TEXTURE 500
|
||||
#ifdef SSE2
|
||||
#ifndef NOSSE2
|
||||
struct ALIGN(16) TextureCache
|
||||
#else
|
||||
struct ALIGN(8) TextureCache
|
||||
|
|
|
|||
|
|
@ -37,8 +37,8 @@
|
|||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef SSE2
|
||||
#define DESMUME_CPUEXT_STRING " SSE2"
|
||||
#ifdef NOSSE2
|
||||
#define DESMUME_CPUEXT_STRING " NOSSE2"
|
||||
#else
|
||||
#define DESMUME_CPUEXT_STRING ""
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 9.00
|
||||
# Visual Studio 2005
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DeSmuME_VS2005", "DeSmuME_2005.vcproj", "{9F5F72A1-D3A5-4918-B460-E076B16D10A9}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Win32 = Debug|Win32
|
||||
Release|Win32 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release|Win32.Build.0 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
@ -51,10 +51,10 @@
|
|||
EnableFiberSafeOptimizations="false"
|
||||
WholeProgramOptimization="false"
|
||||
AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig"
|
||||
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;SPU_INTERPOLATE;HAVE_LIBZ;HAVE_LIBZZIP;NOMINMAX;DEBUG;EXPERIMENTAL_WIFI"
|
||||
PreprocessorDefinitions="DEBUG;_CRT_SECURE_NO_DEPRECATE;WIN32;SPU_INTERPOLATE;HAVE_LIBZ;HAVE_LIBZZIP;NOMINMAX;DEBUG;EXPERIMENTAL_WIFI"
|
||||
ExceptionHandling="1"
|
||||
BufferSecurityCheck="false"
|
||||
EnableEnhancedInstructionSet="0"
|
||||
EnableEnhancedInstructionSet="2"
|
||||
FloatingPointModel="2"
|
||||
WarningLevel="1"
|
||||
DebugInformationFormat="4"
|
||||
|
|
@ -168,7 +168,7 @@
|
|||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2005-x32.lib zziplib-2005-x32.lib shlwapi.lib winpcap\wpcap.lib"
|
||||
OutputFile="$(OutDir)\$(ProjectName)_sse2.exe"
|
||||
OutputFile="$(OutDir)\$(ProjectName)_release.exe"
|
||||
AdditionalLibraryDirectories=".\zlib123;.\zziplib"
|
||||
DelayLoadDLLs="wpcap.dll"
|
||||
GenerateDebugInformation="true"
|
||||
|
|
@ -546,13 +546,6 @@
|
|||
<File
|
||||
RelativePath="..\matrix_sse2-x86.asm"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="MASM"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 10.00
|
||||
# Visual C++ Express 2008
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DeSmuME_VS2008", "DeSmuME_2008.vcproj", "{9F5F72A1-D3A5-4918-B460-E076B16D10A9}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Win32 = Debug|Win32
|
||||
Release|Win32 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release|Win32.Build.0 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
@ -52,10 +52,10 @@
|
|||
EnableFiberSafeOptimizations="false"
|
||||
WholeProgramOptimization="false"
|
||||
AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig"
|
||||
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX;EXPERIMENTAL_WIFI"
|
||||
PreprocessorDefinitions="DEBUG;_CRT_SECURE_NO_DEPRECATE;WIN32;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX;EXPERIMENTAL_WIFI"
|
||||
ExceptionHandling="1"
|
||||
BufferSecurityCheck="false"
|
||||
EnableEnhancedInstructionSet="0"
|
||||
EnableEnhancedInstructionSet="2"
|
||||
FloatingPointModel="2"
|
||||
DebugInformationFormat="4"
|
||||
CallingConvention="0"
|
||||
|
|
@ -482,13 +482,6 @@
|
|||
<File
|
||||
RelativePath="..\matrix_sse2-x86.asm"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="MASM"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Debug|x64"
|
||||
ExcludedFromBuild="true"
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
|
||||
///////////////////////////////////////////////////////////////// Console
|
||||
#ifdef BETA_VERSION
|
||||
#if !defined(PUBLIC_RELEASE) || defined(DEVELOPER)
|
||||
#define BUFFER_SIZE 100
|
||||
HANDLE hConsole;
|
||||
void printlog(const char *fmt, ...);
|
||||
|
|
@ -87,4 +87,9 @@ void printlog(const char *fmt, ...)
|
|||
va_end(list);
|
||||
WriteConsole(hConsole,msg, (DWORD)strlen(msg), &tmp, 0);
|
||||
}
|
||||
#else
|
||||
|
||||
void OpenConsole() {}
|
||||
void CloseConsole() {}
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -29,15 +29,13 @@
|
|||
#include <stdio.h>
|
||||
#include "debug.h"
|
||||
|
||||
void OpenConsole();
|
||||
void CloseConsole();
|
||||
|
||||
#else
|
||||
|
||||
#define OpenConsole()
|
||||
#define CloseConsole()
|
||||
#define pringlog(...)
|
||||
|
||||
#endif
|
||||
|
||||
void OpenConsole();
|
||||
void CloseConsole();
|
||||
|
||||
#endif
|
||||
|
|
@ -5,8 +5,8 @@
|
|||
//to customize your build, place a customized copy in the userconfig directory
|
||||
//(alongside this defaultconfig directory)
|
||||
|
||||
//#define SSE2
|
||||
//#define DEVELOPER
|
||||
//#define NOSSE2 //disables SSE2 optimizations (better change it in the vc++ codegen options too)
|
||||
//#define DEVELOPER //enables dev+ features
|
||||
|
||||
|
||||
#endif //_USERCONFIG_H
|
||||
|
|
|
|||
Loading…
Reference in New Issue