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

Add gpr2gpa to CMake, port to *nix

Browse Source
This commit is contained in:
Diomendius
2024-06-11 02:08:39 +12:00
parent e2da9bb7c5
commit 7a81b2b396
2 changed files with 51 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

@@ -335,5 +335,23 @@ target_include_directories(hqx2gp PRIVATE
) )
target_link_libraries(hqx2gp PortabilityLayer) target_link_libraries(hqx2gp PortabilityLayer)
add_executable(gpr2gpa
gpr2gpa/gpr2gpa.cpp
gpr2gpa/macedec.cpp
AerofoilPortable/GpAllocator_C.cpp
WindowsUnicodeToolShim/UnixUnicodeToolShim.cpp
)
target_include_directories(gpr2gpa PRIVATE
Common
GpCommon
PortabilityLayer
AerofoilPortable
MacRomanConversion
WindowsUnicodeToolShim
rapidjson/include
zlib
)
target_link_libraries(gpr2gpa PortabilityLayer MacRomanConversion zlib)
install (TARGETS ${EXECNAME}) install (TARGETS ${EXECNAME})

63
gpr2gpa/gpr2gpa.cpp
View File

@@ -31,9 +31,9 @@
#include <stdio.h> #include <stdio.h>
#include <string> #include <string>
#include <sstream> #include <sstream>
#include <utility>
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
#include "GpWindows.h"
enum AudioCompressionCodecID enum AudioCompressionCodecID
{ {
@@ -2432,14 +2432,11 @@ int ConvertSingleFile(const char *resPath, const PortabilityLayer::CombinedTimes
const size_t numRefs = typeList.m_numRefs; const size_t numRefs = typeList.m_numRefs;
{ {
char subName[256];
sprintf_s(subName, "%s", resTag.m_id);
PlannedEntry entry; PlannedEntry entry;
entry.m_name = subName; entry.m_name = resTag.m_id;
entry.m_isDirectory = true; entry.m_isDirectory = true;
contents.push_back(entry); contents.push_back(std::move(entry));
} }
for (size_t rlIndex = 0; rlIndex < numRefs; rlIndex++) for (size_t rlIndex = 0; rlIndex < numRefs; rlIndex++)
@@ -2458,14 +2455,15 @@ int ConvertSingleFile(const char *resPath, const PortabilityLayer::CombinedTimes
if (typeList.m_resType == pictTypeID || typeList.m_resType == dateTypeID) if (typeList.m_resType == pictTypeID || typeList.m_resType == dateTypeID)
{ {
char resName[256]; std::string resName = (
sprintf_s(resName, "%s/%i.bmp", resTag.m_id, static_cast<int>(res.m_resID)); std::ostringstream() << resTag.m_id << '/' << res.m_resID << ".bmp"
).str();
if (ContainsName(reservedNames, resName)) if (ContainsName(reservedNames, resName.c_str()))
continue; continue;
PlannedEntry entry; PlannedEntry entry;
entry.m_name = resName; entry.m_name = std::move(resName);
entry.m_comment = resComment; entry.m_comment = resComment;
if (ImportPICT(entry.m_uncompressedContents, resData, resSize, dumpqtDir, res.m_resID)) if (ImportPICT(entry.m_uncompressedContents, resData, resSize, dumpqtDir, res.m_resID))
@@ -2475,14 +2473,15 @@ int ConvertSingleFile(const char *resPath, const PortabilityLayer::CombinedTimes
} }
else if (typeList.m_resType == sndTypeID) else if (typeList.m_resType == sndTypeID)
{ {
char resName[256]; std::string resName = (
sprintf_s(resName, "%s/%i.wav", resTag.m_id, static_cast<int>(res.m_resID)); std::ostringstream() << resTag.m_id << '/' << res.m_resID << ".wav"
).str();
if (ContainsName(reservedNames, resName)) if (ContainsName(reservedNames, resName.c_str()))
continue; continue;
PlannedEntry entry; PlannedEntry entry;
entry.m_name = resName; entry.m_name = std::move(resName);
entry.m_comment = resComment; entry.m_comment = resComment;
if (ImportSound(entry.m_uncompressedContents, resData, resSize, res.m_resID)) if (ImportSound(entry.m_uncompressedContents, resData, resSize, res.m_resID))
@@ -2492,14 +2491,15 @@ int ConvertSingleFile(const char *resPath, const PortabilityLayer::CombinedTimes
} }
else if (typeList.m_resType == indexStringTypeID) else if (typeList.m_resType == indexStringTypeID)
{ {
char resName[256]; std::string resName = (
sprintf_s(resName, "%s/%i.txt", resTag.m_id, static_cast<int>(res.m_resID)); std::ostringstream() << resTag.m_id << '/' << res.m_resID << ".txt"
).str();
if (ContainsName(reservedNames, resName)) if (ContainsName(reservedNames, resName.c_str()))
continue; continue;
PlannedEntry entry; PlannedEntry entry;
entry.m_name = resName; entry.m_name = std::move(resName);
entry.m_comment = resComment; entry.m_comment = resComment;
if (ImportIndexedString(entry.m_uncompressedContents, resData, resSize)) if (ImportIndexedString(entry.m_uncompressedContents, resData, resSize))
@@ -2507,14 +2507,15 @@ int ConvertSingleFile(const char *resPath, const PortabilityLayer::CombinedTimes
} }
else if (typeList.m_resType == ditlTypeID) else if (typeList.m_resType == ditlTypeID)
{ {
char resName[256]; std::string resName = (
sprintf_s(resName, "%s/%i.json", resTag.m_id, static_cast<int>(res.m_resID)); std::ostringstream() << resTag.m_id << '/' << res.m_resID << ".json"
).str();
if (ContainsName(reservedNames, resName)) if (ContainsName(reservedNames, resName.c_str()))
continue; continue;
PlannedEntry entry; PlannedEntry entry;
entry.m_name = resName; entry.m_name = std::move(resName);
entry.m_comment = resComment; entry.m_comment = resComment;
if (ImportDialogItemTemplate(entry.m_uncompressedContents, resData, resSize)) if (ImportDialogItemTemplate(entry.m_uncompressedContents, resData, resSize))
@@ -2529,15 +2530,16 @@ int ConvertSingleFile(const char *resPath, const PortabilityLayer::CombinedTimes
const IconTypeSpec &iconSpec = iconTypeSpecs[i]; const IconTypeSpec &iconSpec = iconTypeSpecs[i];
if (typeList.m_resType == iconSpec.m_resTypeID) if (typeList.m_resType == iconSpec.m_resTypeID)
{ {
char resName[256]; std::string resName = (
sprintf_s(resName, "%s/%i.bmp", resTag.m_id, static_cast<int>(res.m_resID)); std::ostringstream() << resTag.m_id << '/' << res.m_resID << ".bmp"
).str();
if (!ContainsName(reservedNames, resName)) if (!ContainsName(reservedNames, resName.c_str()))
{ {
isIcon = true; isIcon = true;
PlannedEntry entry; PlannedEntry entry;
entry.m_name = resName; entry.m_name = std::move(resName);
entry.m_comment = resComment; entry.m_comment = resComment;
if (ImportIcon(entry.m_uncompressedContents, resData, resSize, iconSpec.m_width, iconSpec.m_height, iconSpec.m_bpp)) if (ImportIcon(entry.m_uncompressedContents, resData, resSize, iconSpec.m_width, iconSpec.m_height, iconSpec.m_bpp))
@@ -2550,15 +2552,16 @@ int ConvertSingleFile(const char *resPath, const PortabilityLayer::CombinedTimes
if (!isIcon) if (!isIcon)
{ {
char resName[256]; std::string resName = (
sprintf_s(resName, "%s/%i.bin", resTag.m_id, static_cast<int>(res.m_resID)); std::ostringstream() << resTag.m_id << '/' << res.m_resID << ".bin"
).str();
if (ContainsName(reservedNames, resName)) if (ContainsName(reservedNames, resName.c_str()))
continue; continue;
PlannedEntry entry; PlannedEntry entry;
entry.m_name = resName; entry.m_name = std::move(resName);
entry.m_comment = resComment; entry.m_comment = resComment;
entry.m_uncompressedContents.resize(res.GetSize()); entry.m_uncompressedContents.resize(res.GetSize());