Moved to VS2013 and latest SpriteBatch

This commit is contained in:
xawotihs
2014-12-14 22:04:31 +01:00
parent f5702dbdc5
commit 0934b0a27a
67 changed files with 5541 additions and 3287 deletions
-1
View File
@@ -2,7 +2,6 @@
#define _GAME_STATE_MENU_H_
#include <JGui.h>
#include <dirent.h>
#include "GameState.h"
#include "SimpleMenu.h"
#include "TextScroller.h"
+1 -1
View File
@@ -5,7 +5,7 @@
#include "MTGDefinitions.h"
#include "WResourceManager.h"
#include <dirent.h>
#include "PrecompiledHeader.h"
#include <Threading.h>
#include <Subtypes.h>
#include <string>
+50 -2
View File
@@ -16,10 +16,58 @@
#include <assert.h>
#ifdef WP8
#include <wrl.h>
#include <wrl/client.h>
#if !defined(WIN32_LEAN_AND_MEAN)
#define WIN32_LEAN_AND_MEAN
#endif
#if !defined(NOMINMAX)
#define NOMINMAX
#endif
#if defined(_XBOX_ONE) && defined(_TITLE)
#include <d3d11_x.h>
#define DCOMMON_H_INCLUDED
#define NO_D3D11_DEBUG_NAME
#else
#include <d3d11_1.h>
#endif
#include <DirectXMath.h>
#include <DirectXPackedVector.h>
#include <DirectXCollision.h>
#include <algorithm>
#include <array>
#include <exception>
#include <malloc.h>
#include <map>
#include <memory>
#include <set>
#include <string>
#include <vector>
// VS 2010's stdint.h conflicts with intsafe.h
#pragma warning(push)
#pragma warning(disable : 4005)
#include <stdint.h>
#include <intsafe.h>
#pragma warning(pop)
#include <wrl.h>
#include "..\extra\dirent.h"
namespace DirectX
{
#if (DIRECTX_MATH_VERSION < 305) && !defined(XM_CALLCONV)
#define XM_CALLCONV __fastcall
typedef const XMVECTOR& HXMVECTOR;
typedef const XMMATRIX& FXMMATRIX;
#endif
}
#else //WP8
#include <boost/shared_ptr.hpp>
#include <dirent.h>
#endif
#include "JGE.h"