From 9fa6b7e2ded58330d0181321acb6b56ee61fb234 Mon Sep 17 00:00:00 2001 From: "FWoltermann@gmail.com" Date: Tue, 5 Jun 2012 08:46:29 +0000 Subject: Add VS2012 configs to the project files. --- nGenEx/D3DXImage.cpp | 13 +++- nGenEx/nGenEx.vcxproj | 212 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 220 insertions(+), 5 deletions(-) (limited to 'nGenEx') diff --git a/nGenEx/D3DXImage.cpp b/nGenEx/D3DXImage.cpp index c83c2c4..a10eac3 100644 --- a/nGenEx/D3DXImage.cpp +++ b/nGenEx/D3DXImage.cpp @@ -12,7 +12,8 @@ D3DX image file loader */ - +#include +#include "afxdlgs.h" #include "MemDebug.h" #include "D3DXImage.h" #include "VideoDX9.h" @@ -53,8 +54,14 @@ bool D3DXImage::Load(char *filename) FILE* f; fopen_s(&f, filename,"rb"); - if (f == NULL) - return success; + if (f == NULL) { + std::string errstring = "Magic was unable to locate the following texture: "; + errstring += filename; + errstring += "\nPlease locate the texture, and copy it to the same directory the Magic executable is in."; + + MessageBox(NULL, errstring.c_str(), "Help!", MB_ICONWARNING | MB_OK); + return success; + } int len = 0; BYTE* buf = 0; diff --git a/nGenEx/nGenEx.vcxproj b/nGenEx/nGenEx.vcxproj index c655fa6..6aa59cb 100644 --- a/nGenEx/nGenEx.vcxproj +++ b/nGenEx/nGenEx.vcxproj @@ -1,6 +1,14 @@  + + Debug VS2012 + Win32 + + + Debug VS2012 + x64 + Debug x64 Win32 @@ -17,6 +25,14 @@ Debug x64 + + Release VS2012 + Win32 + + + Release VS2012 + x64 + Release x64 Win32 @@ -46,13 +62,16 @@ $(VCTargetsPath11) + {CADEA3B5-84A7-C4F6-9F8E-093FD371A4A1} Application + v110 Application + v110 StaticLibrary @@ -60,21 +79,35 @@ MultiByte v100 + + StaticLibrary + false + MultiByte + v110 + StaticLibrary false MultiByte - v100 + v110 StaticLibrary false MultiByte + v110 + + + StaticLibrary + false + MultiByte + v110 StaticLibrary false MultiByte + v110 StaticLibrary @@ -82,13 +115,29 @@ MultiByte v100 + + StaticLibrary + false + MultiByte + v110 + StaticLibrary false MultiByte + v110 + + + StaticLibrary + false + MultiByte + v110 - v100 + v110 + + + v110 @@ -103,6 +152,10 @@ + + + + @@ -111,6 +164,10 @@ + + + + @@ -119,26 +176,49 @@ + + + + + + + + .\Debug\ .\Debug\ ..\oggvorbis\include;$(DXSDK_DIR)\include;$(IncludePath) + + .\Debug\ + .\Debug\ + ..\oggvorbis\include;$(DXSDK_DIR)\include;$(IncludePath) + .\Debug\ .\Debug\ ..\oggvorbis\include;$(DXSDK_DIR)\include;$(IncludePath) + + .\Debug\ + .\Debug\ + ..\oggvorbis\include;$(DXSDK_DIR)\include;$(IncludePath) + .\Release\ .\Release\ ..\oggvorbis\include;$(DXSDK_DIR)\include;$(IncludePath) + + .\Release\ + .\Release\ + ..\oggvorbis\include;$(DXSDK_DIR)\include;$(IncludePath) + .\Release\ .\Release\ @@ -149,6 +229,11 @@ .\Release\ ..\oggvorbis\include;$(DXSDK_DIR)\include;$(IncludePath) + + .\Release\ + .\Release\ + ..\oggvorbis\include;$(DXSDK_DIR)\include;$(IncludePath) + .\Release\ .\Release\ @@ -192,6 +277,38 @@ .\Debug\nGenEx.lib + + + MultiThreadedDebug + Default + false + Disabled + true + Level3 + true + EditAndContinue + ..\oggvorbis\include;..\parser;..\FoundationEx;..\zlib;..\LibPng;..\Opcode\OpcodeLib;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + .\Debug\ + true + .\Debug\nGenEx.pch + .\Debug\ + .\Debug\ + EnableFastChecks + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + + + true + .\Debug\nGenEx.bsc + + + true + .\Debug\nGenEx.lib + + MultiThreadedDebug @@ -223,6 +340,37 @@ .\Debug\nGenEx.lib + + + MultiThreadedDebug + Default + false + Disabled + true + Level3 + ProgramDatabase + ..\parser;..\FoundationEx;..\zlib;..\LibPng;..\Opcode\OpcodeLib;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + .\Debug\ + true + .\Debug\nGenEx.pch + .\Debug\ + .\Debug\ + EnableFastChecks + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + + + true + .\Debug\nGenEx.bsc + + + true + .\Debug\nGenEx.lib + + MultiThreaded @@ -253,6 +401,36 @@ .\Release\nGenEx.lib + + + MultiThreaded + OnlyExplicitInline + true + true + MaxSpeed + true + Level3 + ..\oggvorbis\include;..\parser;..\FoundationEx;..\zlib;..\LibPng;..\Opcode\OpcodeLib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + .\Release\ + true + .\Release\nGenEx.pch + .\Release\ + .\Release\ + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + + + true + .\Release\nGenEx.bsc + + + true + .\Release\nGenEx.lib + + MultiThreaded @@ -313,6 +491,36 @@ .\Release\nGenEx.lib + + + MultiThreaded + OnlyExplicitInline + true + true + MaxSpeed + true + Level3 + ..\parser;..\FoundationEx;..\zlib;..\LibPng;..\Opcode\OpcodeLib;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + .\Release\ + true + .\Release\nGenEx.pch + .\Release\ + .\Release\ + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + + + true + .\Release\nGenEx.bsc + + + true + .\Release\nGenEx.lib + + MultiThreaded -- cgit v1.1