diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-09-02 07:40:49 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-09-02 07:40:49 +0200 |
| commit | 5941653d474ba27ed40250028e03425cb5c2be5f (patch) | |
| tree | 51538037d9cd4f0ac6d7d096cd940c97756b64a3 /Source/Core/Common | |
| parent | 9b10d36a85bb27681f5d48e3ced9c142a1ac6b47 (diff) | |
| parent | 839cace5ff15b56afa3a72c86b379c6abc4c0bf6 (diff) | |
Merge pull request #920 from shuffle2/msvc-gtest
Provide a way to build and run unittests on Windows
Diffstat (limited to 'Source/Core/Common')
| -rw-r--r-- | Source/Core/Common/Common.vcxproj | 2 | ||||
| -rw-r--r-- | Source/Core/Common/CommonFuncs.h | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj index 67f8a9a5a6..814ac4f04f 100644 --- a/Source/Core/Common/Common.vcxproj +++ b/Source/Core/Common/Common.vcxproj @@ -127,7 +127,7 @@ <Text Include="CMakeLists.txt" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\..\Externals\polarssl\visualc\PolarSSL.vcxproj"> + <ProjectReference Include="$(ExternalsDir)polarssl\visualc\PolarSSL.vcxproj"> <Project>{bdb6578b-0691-4e80-a46c-df21639fd3b8}</Project> </ProjectReference> <ProjectReference Include="SCMRevGen.vcxproj"> diff --git a/Source/Core/Common/CommonFuncs.h b/Source/Core/Common/CommonFuncs.h index eb26364d51..cf197ef660 100644 --- a/Source/Core/Common/CommonFuncs.h +++ b/Source/Core/Common/CommonFuncs.h @@ -161,6 +161,12 @@ extern "C" __declspec(dllimport) void __stdcall DebugBreak(void); } #define Crash() {DebugBreak();} + + #if (_MSC_VER > 1800) + #error alignof compat can be removed + #else + #define alignof(x) __alignof(x) + #endif #endif // WIN32 ndef // Generic function to get last error message. |
