Permalink
Browse files

Merge branch 'development' into jsonwork

Conflicts:
	.gitignore
	RA_Integration/RA_Defs.h
  • Loading branch information...
2 parents 58822b7 + 2d370b3 commit 21c34044934de16435d7bcaabaefb9458cb7de3c @RetroAchievements committed Oct 26, 2014
View
Oops, something went wrong.
View
@@ -1,6 +1,3 @@
-[submodule "rapidjson"]
- path = rapidjson
- url = https://github.com/miloyip/rapidjson
[submodule "RA_Integration/rapidjson"]
path = RA_Integration/rapidjson
url = https://github.com/miloyip/rapidjson
@@ -36,7 +36,7 @@ POSTBUILD=copy $(SRC_RA)\RA_Integration_d.dll . && copy $(SRC_RA)\*.pdb .
!ENDIF
!IF "$(RELEASE)"=="1" && "$(RELEASEDEBUG)"!="1"
-LINK_FLAGS=/DEBUG
+LINK_FLAGS=/RELEASE
!ELSE
LINK_FLAGS=/DEBUG
!ENDIF
@@ -1,6 +1,6 @@

Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio Express 2012 for Windows Desktop
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RAGens", "RAGens.vcxproj", "{9FFB7437-AB3B-4B33-9647-2B60D1E93411}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RA_Integration", "..\..\RA_Integration\RA_Integration.vcxproj", "{825CB292-F069-4B27-82CF-3417746ACDF3}"
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Oops, something went wrong.
@@ -29,23 +29,23 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='LIB Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v110_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='LIB Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v110_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL VB|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v110_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v110_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v110_xp</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Binary file not shown.
@@ -1,6 +1,6 @@

Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio Express 2012 for Windows Desktop
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RASnes9X", "snes9xw.vcxproj", "{B86059D8-C9A6-46BE-8FBA-3170C54F1DFD}"
ProjectSection(ProjectDependencies) = postProject
{825CB292-F069-4B27-82CF-3417746ACDF3} = {825CB292-F069-4B27-82CF-3417746ACDF3}
@@ -31,22 +31,23 @@ Global
{B86059D8-C9A6-46BE-8FBA-3170C54F1DFD}.Release|x64.ActiveCfg = Release|x64
{B86059D8-C9A6-46BE-8FBA-3170C54F1DFD}.Release|x64.Build.0 = Release|x64
{B86059D8-C9A6-46BE-8FBA-3170C54F1DFD}.ReleaseWithDebug|Win32.ActiveCfg = Release|Win32
+ {B86059D8-C9A6-46BE-8FBA-3170C54F1DFD}.ReleaseWithDebug|Win32.Build.0 = Release|Win32
{B86059D8-C9A6-46BE-8FBA-3170C54F1DFD}.ReleaseWithDebug|x64.ActiveCfg = Release|x64
{0008960E-E0DD-41A6-8265-00B31DDB4C21}.Debug|Win32.ActiveCfg = LIB Debug|Win32
{0008960E-E0DD-41A6-8265-00B31DDB4C21}.Debug|Win32.Build.0 = LIB Debug|Win32
{0008960E-E0DD-41A6-8265-00B31DDB4C21}.Debug|x64.ActiveCfg = DLL VB|Win32
{0008960E-E0DD-41A6-8265-00B31DDB4C21}.Release|Win32.ActiveCfg = LIB Release|Win32
{0008960E-E0DD-41A6-8265-00B31DDB4C21}.Release|Win32.Build.0 = LIB Release|Win32
{0008960E-E0DD-41A6-8265-00B31DDB4C21}.Release|x64.ActiveCfg = LIB Debug|Win32
- {0008960E-E0DD-41A6-8265-00B31DDB4C21}.ReleaseWithDebug|Win32.ActiveCfg = DLL Debug|Win32
- {0008960E-E0DD-41A6-8265-00B31DDB4C21}.ReleaseWithDebug|Win32.Build.0 = DLL Debug|Win32
+ {0008960E-E0DD-41A6-8265-00B31DDB4C21}.ReleaseWithDebug|Win32.ActiveCfg = LIB Release|Win32
+ {0008960E-E0DD-41A6-8265-00B31DDB4C21}.ReleaseWithDebug|Win32.Build.0 = LIB Release|Win32
{0008960E-E0DD-41A6-8265-00B31DDB4C21}.ReleaseWithDebug|x64.ActiveCfg = DLL Debug|Win32
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64
- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32
- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = ReleaseWithoutAsm|Win32
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithDebug|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
Oops, something went wrong.

0 comments on commit 21c3404

Please sign in to comment.