diff options
| author | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2021-06-06 00:37:35 +0300 |
|---|---|---|
| committer | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2021-06-06 00:37:35 +0300 |
| commit | 46d6d316226416a800f5b5b168aea59d45d98272 (patch) | |
| tree | cd52a0ed50b7f996079deec462b40d0baed9929b /vc | |
| parent | 9ad3ad97b01a4affaa1425e9a535b038ca08864a (diff) | |
| parent | d1467182046e7ca00d65cd35f20ee011b2a665e6 (diff) | |
Merge branch 'master' into coolgirl
Diffstat (limited to 'vc')
| -rw-r--r-- | vc/Help/fceux.hnd | bin | 1908736 -> 1933312 bytes | |||
| -rw-r--r-- | vc/vc14_fceux.vcxproj | 18 |
2 files changed, 15 insertions, 3 deletions
diff --git a/vc/Help/fceux.hnd b/vc/Help/fceux.hnd Binary files differindex 218dee30..ca88cc29 100644 --- a/vc/Help/fceux.hnd +++ b/vc/Help/fceux.hnd diff --git a/vc/vc14_fceux.vcxproj b/vc/vc14_fceux.vcxproj index 50fadf9c..71ea67e2 100644 --- a/vc/vc14_fceux.vcxproj +++ b/vc/vc14_fceux.vcxproj @@ -181,7 +181,7 @@ </Manifest>
<PostBuildEvent>
<Command>xcopy /y /d "$(ProjectDir)\..\src\drivers\win\7z.dll" "$(OutDir)"
-</Command>
+xcopy /y /d "$(ProjectDir)\..\src\drivers\win\7z_64.dll" "$(OutDir)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -224,7 +224,7 @@ </Manifest>
<PostBuildEvent>
<Command>xcopy /y /d "$(ProjectDir)\..\src\drivers\win\7z.dll" "$(OutDir)"
-</Command>
+xcopy /y /d "$(ProjectDir)\..\src\drivers\win\7z_64.dll" "$(OutDir)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PublicRelease|Win32'">
@@ -268,7 +268,7 @@ </Manifest>
<PostBuildEvent>
<Command>xcopy /y /d "$(ProjectDir)\..\src\drivers\win\7z.dll" "$(OutDir)"
-</Command>
+xcopy /y /d "$(ProjectDir)\..\src\drivers\win\7z_64.dll" "$(OutDir)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -300,6 +300,10 @@ <PreBuildEvent>
<Command>"%windir%\Sysnative\cscript" /nologo /E:JScript "defaultconfig\make_scmrev.h.js"</Command>
</PreBuildEvent>
+ <PostBuildEvent>
+ <Command>xcopy /y /d "$(ProjectDir)\..\src\drivers\win\7z.dll" "$(OutDir)"
+xcopy /y /d "$(ProjectDir)\..\src\drivers\win\7z_64.dll" "$(OutDir)"</Command>
+ </PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl>
@@ -333,6 +337,10 @@ <PreBuildEvent>
<Command>"%windir%\Sysnative\cscript" /nologo /E:JScript "defaultconfig\make_scmrev.h.js"</Command>
</PreBuildEvent>
+ <PostBuildEvent>
+ <Command>xcopy /y /d "$(ProjectDir)\..\src\drivers\win\7z.dll" "$(OutDir)"
+xcopy /y /d "$(ProjectDir)\..\src\drivers\win\7z_64.dll" "$(OutDir)"</Command>
+ </PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PublicRelease|x64'">
<Midl>
@@ -366,6 +374,10 @@ <PreBuildEvent>
<Command>"%windir%\Sysnative\cscript" /nologo /E:JScript "defaultconfig\make_scmrev.h.js"</Command>
</PreBuildEvent>
+ <PostBuildEvent>
+ <Command>xcopy /y /d "$(ProjectDir)\..\src\drivers\win\7z.dll" "$(OutDir)"
+xcopy /y /d "$(ProjectDir)\..\src\drivers\win\7z_64.dll" "$(OutDir)"</Command>
+ </PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\boards\01-222.cpp">
|