Skip to content

Commit ccadb19

Browse files
Gh0stBladeGh0stBlade
committed
[Fix] TRAE building , extensions issue.
1 parent 67a4cf4 commit ccadb19

6 files changed

Lines changed: 41 additions & 34 deletions

File tree

‎DRM/DRM.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ void cDRM::ExtractSections(char* szFilePath)
116116

117117

118118
//Skip header info
119-
#if TR7
119+
#if TR7 || TRAE
120120
ifs.seekg(((this->pSections[i].uiHeaderSize >> 0x8) * 0x8), SEEK_CUR);
121121
#elif TR8
122122
ifs.seekg((this->pSections[i].uiHeaderSize >> 0x8), SEEK_CUR);
@@ -142,7 +142,7 @@ void cDRM::ExtractSections(char* szFilePath)
142142
std::ofstream ofs(strOutPath2.str(), std::ios::binary);
143143

144144
//Read then write the section data
145-
#if TR7
145+
#if TR7 || TRAE
146146
ifs.read(szSectionData, this->pSections[i].uiSize + ((this->pSections[i].uiHeaderSize >> 0x8) * 0x8));
147147
ofs.write(szSectionData, this->pSections[i].uiSize + ((this->pSections[i].uiHeaderSize >> 0x8) * 0x8));
148148
#elif TR8

‎DRM/DRM.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
//Definitions
2727
#define DRM_MAX_SECTIONS (16777215)
2828

29-
#if TR7
29+
#if TR7 || TRAE
3030
#define DRM_VERSION (14)
3131
#elif TR8
3232
#define DRM_VERSION (19)

‎DRM/FileExtensions.h‎

Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,37 @@
2222

2323
#if TR7
2424

25-
char* szExtensions[]
26-
{
27-
".gnc",
28-
".ept",
29-
".ani",
30-
".pbrwc",
31-
".pbr",
32-
".pcd",
33-
".fsb",
34-
".dtp",
35-
".script",
36-
".shad",
37-
".nst"
38-
};
25+
char* szExtensions[]
26+
{
27+
".gnc",
28+
".ept",
29+
".ani",
30+
".pbrwc",
31+
".pbr",
32+
".pcd",
33+
".fsb",
34+
".dtp",
35+
".script",
36+
".shad",
37+
".nst"
38+
};
39+
40+
#elif TRAE
41+
42+
char* szExtensions[]
43+
{
44+
".gnc",
45+
".ept",
46+
".ani",
47+
".pbrwc",
48+
".pbr",
49+
".pcd",
50+
".fsb",
51+
".dtp",
52+
".script",
53+
".shad",
54+
".nst"
55+
};
3956

4057
#elif TR8
4158
#if PC
@@ -77,7 +94,7 @@ char* szExtensions[]
7794
#elif PS3
7895
char* szExtensions[]
7996
{
80-
" .gnc",
97+
".gnc",
8198
".unk01",
8299
".ani",
83100
".unk03",
@@ -93,7 +110,7 @@ char* szExtensions[]
93110
".unk13"
94111
};
95112
#elif WII
96-
char* szFileExtensions[]
113+
char* szExtensions[]
97114
{
98115
".gnc",
99116
".unk01",
@@ -111,7 +128,7 @@ char* szExtensions[]
111128
".unk13"
112129
};
113130
#elif PS2
114-
char* szFileExtensions[]
131+
char* szExtensions[]
115132
{
116133
".gnc",
117134
".unk01",

‎DRM/Game.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,11 @@
2222

2323
#if TR7
2424
#define GAME_NAME "Tomb Raider: Legend"
25+
#elif TRAE
26+
#define GAME_NAME "Tomb Raider: Anniversary"
2527
#elif TR8
2628
#define GAME_NAME "Tomb Raider: Underworld"
27-
#endif
2829
#else
2930
#error "Unsupported Game!"
31+
#endif
3032
#endif

‎External/zlib/contrib/vstudio/vc11/zlibstat.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@
231231
<PropertyGroup>
232232
<_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
233233
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\Libs\x86\$(Configuration)\</OutDir>
234-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\External\zlib-1.2.8\contrib\vstudio\vc11\$(Configuration)\</IntDir>
234+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\External\zlib\contrib\vstudio\vc11\$(Configuration)\</IntDir>
235235
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\Libs\x86\$(Configuration)\</OutDir>
236236
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\External\zlib\contrib\vstudio\vc11\$(Configuration)\</IntDir>
237237
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\</OutDir>

‎cdcEngineTools.sln‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,6 @@ Global
8080
Release TRAE WII-W|x64 = Release TRAE WII-W|x64
8181
Release TRAE XENON-W|Win32 = Release TRAE XENON-W|Win32
8282
Release TRAE XENON-W|x64 = Release TRAE XENON-W|x64
83-
ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32
84-
ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64
8583
EndGlobalSection
8684
GlobalSection(ProjectConfigurationPlatforms) = postSolution
8785
{DA7A1125-1A5A-4FC4-B991-0E57FAF7B85B}.Debug TR7 PC-W|Win32.ActiveCfg = Debug TR7 PC-W|Win32
@@ -177,9 +175,6 @@ Global
177175
{DA7A1125-1A5A-4FC4-B991-0E57FAF7B85B}.Release TRAE XENON-W|Win32.ActiveCfg = Release TRAE XENON-W|Win32
178176
{DA7A1125-1A5A-4FC4-B991-0E57FAF7B85B}.Release TRAE XENON-W|Win32.Build.0 = Release TRAE XENON-W|Win32
179177
{DA7A1125-1A5A-4FC4-B991-0E57FAF7B85B}.Release TRAE XENON-W|x64.ActiveCfg = Release TRAE XENON-W|Win32
180-
{DA7A1125-1A5A-4FC4-B991-0E57FAF7B85B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release TRAE XENON-W|Win32
181-
{DA7A1125-1A5A-4FC4-B991-0E57FAF7B85B}.ReleaseWithoutAsm|Win32.Build.0 = Release TRAE XENON-W|Win32
182-
{DA7A1125-1A5A-4FC4-B991-0E57FAF7B85B}.ReleaseWithoutAsm|x64.ActiveCfg = Release TRAE XENON-W|Win32
183178
{5BC1888F-6011-41C9-9A6F-201813A4DF9C}.Debug TR7 PC-W|Win32.ActiveCfg = Debug TR7 PC-W|Win32
184179
{5BC1888F-6011-41C9-9A6F-201813A4DF9C}.Debug TR7 PC-W|Win32.Build.0 = Debug TR7 PC-W|Win32
185180
{5BC1888F-6011-41C9-9A6F-201813A4DF9C}.Debug TR7 PC-W|x64.ActiveCfg = Debug TR7 PC-W|Win32
@@ -273,9 +268,6 @@ Global
273268
{5BC1888F-6011-41C9-9A6F-201813A4DF9C}.Release TRAE XENON-W|Win32.ActiveCfg = Release TRAE XENON-W|Win32
274269
{5BC1888F-6011-41C9-9A6F-201813A4DF9C}.Release TRAE XENON-W|Win32.Build.0 = Release TRAE XENON-W|Win32
275270
{5BC1888F-6011-41C9-9A6F-201813A4DF9C}.Release TRAE XENON-W|x64.ActiveCfg = Release TRAE XENON-W|Win32
276-
{5BC1888F-6011-41C9-9A6F-201813A4DF9C}.ReleaseWithoutAsm|Win32.ActiveCfg = Release TR8 XENON-W|Win32
277-
{5BC1888F-6011-41C9-9A6F-201813A4DF9C}.ReleaseWithoutAsm|Win32.Build.0 = Release TR8 XENON-W|Win32
278-
{5BC1888F-6011-41C9-9A6F-201813A4DF9C}.ReleaseWithoutAsm|x64.ActiveCfg = Release TR8 XENON-W|Win32
279271
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug TR7 PC-W|Win32.ActiveCfg = Debug|Win32
280272
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug TR7 PC-W|Win32.Build.0 = Debug|Win32
281273
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug TR7 PC-W|x64.ActiveCfg = Debug|x64
@@ -400,10 +392,6 @@ Global
400392
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release TRAE XENON-W|Win32.Build.0 = Release|Win32
401393
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release TRAE XENON-W|x64.ActiveCfg = Release|x64
402394
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release TRAE XENON-W|x64.Build.0 = Release|x64
403-
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
404-
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
405-
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
406-
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = Release|x64
407395
EndGlobalSection
408396
GlobalSection(SolutionProperties) = preSolution
409397
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)