WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-09-24 23:26:37 +00:00
Code Issues Projects Releases Wiki Activity

Change MiniRez to use WindowsUnicodeToolShim

Browse Source
This commit is contained in:
elasota
2021-03-11 22:28:01 -05:00
parent 0a2e730d26
commit c147e1100e
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
MiniRez/MiniRez.cpp
View File

@@ -9,6 +9,7 @@
#include "MacBinary2.h" #include "MacBinary2.h"
#include "MacFileMem.h" #include "MacFileMem.h"
#include "WindowsUnicodeToolShim.h"
// Very simplified resource compiler // Very simplified resource compiler
@@ -117,7 +118,7 @@ void DefError()
exit(-1); exit(-1);
} }
int main(int argc, const char **argv) int toolMain(int argc, const char **argv)
{ {
if (argc != 3) if (argc != 3)
{ {
@@ -125,8 +126,8 @@ int main(int argc, const char **argv)
return -1; return -1;
} }
FILE *f = nullptr; FILE *f = fopen_utf8(argv[1], "rb");
if (fopen_s(&f, argv[1], "rb")) if (!f)
{ {
fprintf(stderr, "Failed to open input file"); fprintf(stderr, "Failed to open input file");
return -1; return -1;
@@ -524,8 +525,8 @@ int main(int argc, const char **argv)
printf("Writing to %s...", argv[2]); printf("Writing to %s...", argv[2]);
FILE *outF = nullptr; FILE *outF = fopen_utf8(argv[2], "wb");
if (fopen_s(&outF, argv[2], "wb")) if (!outF)
{ {
fprintf(stderr, "Failed to open output file"); fprintf(stderr, "Failed to open output file");
return -1; return -1;

5
MiniRez/MiniRez.vcxproj
View File

@@ -41,6 +41,7 @@
<Import Project="..\Common.props" /> <Import Project="..\Common.props" />
<Import Project="..\GpCommon.props" /> <Import Project="..\GpCommon.props" />
<Import Project="..\Debug.props" /> <Import Project="..\Debug.props" />
<Import Project="..\WindowsUnicodeToolShim.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -48,6 +49,7 @@
<Import Project="..\Common.props" /> <Import Project="..\Common.props" />
<Import Project="..\GpCommon.props" /> <Import Project="..\GpCommon.props" />
<Import Project="..\Release.props" /> <Import Project="..\Release.props" />
<Import Project="..\WindowsUnicodeToolShim.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup /> <PropertyGroup />
@@ -80,6 +82,9 @@
<ProjectReference Include="..\PortabilityLayer\PortabilityLayer.vcxproj"> <ProjectReference Include="..\PortabilityLayer\PortabilityLayer.vcxproj">
<Project>{6ec62b0f-9353-40a4-a510-3788f1368b33}</Project> <Project>{6ec62b0f-9353-40a4-a510-3788f1368b33}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\WindowsUnicodeToolShim\WindowsUnicodeToolShim.vcxproj">
<Project>{15009625-1120-405e-8bba-69a16cd6713d}</Project>
</ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">