Skip to content

Commit 1631385

Browse files
TheIndra55TheIndra55
committed
Fixes
1 parent d2f2d1e commit 1631385

6 files changed

Lines changed: 38 additions & 38 deletions

File tree

‎CDRM/CDRM.rc‎

-8 Bytes
Binary file not shown.

‎CDRM/CDRM.vcxproj‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -134,83 +134,83 @@
134134
<ProjectGuid>{5BC1888F-6011-41C9-9A6F-201813A4DF9C}</ProjectGuid>
135135
<Keyword>Win32Proj</Keyword>
136136
<RootNamespace>CDRM</RootNamespace>
137-
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
137+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
138138
</PropertyGroup>
139139
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
140140
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug TR8 PC-W|Win32'" Label="Configuration">
141141
<ConfigurationType>Application</ConfigurationType>
142142
<UseDebugLibraries>true</UseDebugLibraries>
143-
<PlatformToolset>v141</PlatformToolset>
143+
<PlatformToolset>v143</PlatformToolset>
144144
<CharacterSet>MultiByte</CharacterSet>
145145
</PropertyGroup>
146146
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release TR8 PS2-W|Win32'" Label="Configuration">
147147
<ConfigurationType>Application</ConfigurationType>
148148
<UseDebugLibraries>false</UseDebugLibraries>
149-
<PlatformToolset>v141</PlatformToolset>
149+
<PlatformToolset>v143</PlatformToolset>
150150
<WholeProgramOptimization>true</WholeProgramOptimization>
151151
<CharacterSet>MultiByte</CharacterSet>
152152
</PropertyGroup>
153153
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release TR8 WII-W|Win32'" Label="Configuration">
154154
<ConfigurationType>Application</ConfigurationType>
155155
<UseDebugLibraries>false</UseDebugLibraries>
156-
<PlatformToolset>v141</PlatformToolset>
156+
<PlatformToolset>v143</PlatformToolset>
157157
<WholeProgramOptimization>true</WholeProgramOptimization>
158158
<CharacterSet>MultiByte</CharacterSet>
159159
</PropertyGroup>
160160
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release TR8 PC-W|Win32'">
161-
<PlatformToolset>v141</PlatformToolset>
161+
<PlatformToolset>v143</PlatformToolset>
162162
<CharacterSet>MultiByte</CharacterSet>
163163
</PropertyGroup>
164164
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release TRAE PS3-W|Win32'" Label="Configuration">
165-
<PlatformToolset>v141</PlatformToolset>
165+
<PlatformToolset>v143</PlatformToolset>
166166
<CharacterSet>MultiByte</CharacterSet>
167167
</PropertyGroup>
168168
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release TRAE PS2-W|Win32'" Label="Configuration">
169-
<PlatformToolset>v141</PlatformToolset>
169+
<PlatformToolset>v143</PlatformToolset>
170170
<CharacterSet>MultiByte</CharacterSet>
171171
</PropertyGroup>
172172
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release TRAE XENON-W|Win32'" Label="Configuration">
173-
<PlatformToolset>v141</PlatformToolset>
173+
<PlatformToolset>v143</PlatformToolset>
174174
<CharacterSet>MultiByte</CharacterSet>
175175
</PropertyGroup>
176176
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release TRAE PC-W|Win32'" Label="Configuration">
177-
<PlatformToolset>v141</PlatformToolset>
177+
<PlatformToolset>v143</PlatformToolset>
178178
<CharacterSet>MultiByte</CharacterSet>
179179
</PropertyGroup>
180180
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release TRAE PSP-W|Win32'" Label="Configuration">
181-
<PlatformToolset>v141</PlatformToolset>
181+
<PlatformToolset>v143</PlatformToolset>
182182
<CharacterSet>MultiByte</CharacterSet>
183183
</PropertyGroup>
184184
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release TRAE WII-W|Win32'" Label="Configuration">
185-
<PlatformToolset>v141</PlatformToolset>
185+
<PlatformToolset>v143</PlatformToolset>
186186
<CharacterSet>MultiByte</CharacterSet>
187187
</PropertyGroup>
188188
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release TR7 PSP-W|Win32'" Label="Configuration">
189-
<PlatformToolset>v141</PlatformToolset>
189+
<PlatformToolset>v143</PlatformToolset>
190190
<CharacterSet>MultiByte</CharacterSet>
191191
</PropertyGroup>
192192
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release TR7 PS2-W|Win32'" Label="Configuration">
193-
<PlatformToolset>v141</PlatformToolset>
193+
<PlatformToolset>v143</PlatformToolset>
194194
<CharacterSet>MultiByte</CharacterSet>
195195
</PropertyGroup>
196196
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release TR7 PC-W|Win32'" Label="Configuration">
197-
<PlatformToolset>v141</PlatformToolset>
197+
<PlatformToolset>v143</PlatformToolset>
198198
<CharacterSet>MultiByte</CharacterSet>
199199
</PropertyGroup>
200200
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release TR7 XENON-W|Win32'" Label="Configuration">
201-
<PlatformToolset>v141</PlatformToolset>
201+
<PlatformToolset>v143</PlatformToolset>
202202
<CharacterSet>MultiByte</CharacterSet>
203203
</PropertyGroup>
204204
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release TR7 PS3-W|Win32'" Label="Configuration">
205-
<PlatformToolset>v141</PlatformToolset>
205+
<PlatformToolset>v143</PlatformToolset>
206206
<CharacterSet>MultiByte</CharacterSet>
207207
</PropertyGroup>
208208
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release TR8 XENON-W|Win32'">
209-
<PlatformToolset>v141</PlatformToolset>
209+
<PlatformToolset>v143</PlatformToolset>
210210
<CharacterSet>MultiByte</CharacterSet>
211211
</PropertyGroup>
212212
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release TR8 PS3-W|Win32'">
213-
<PlatformToolset>v141</PlatformToolset>
213+
<PlatformToolset>v143</PlatformToolset>
214214
<CharacterSet>MultiByte</CharacterSet>
215215
</PropertyGroup>
216216
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='TR8 PC-W|Win32'">
@@ -235,63 +235,63 @@
235235
<PlatformToolset>v120</PlatformToolset>
236236
</PropertyGroup>
237237
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug TR8 XENON-W|Win32'">
238-
<PlatformToolset>v141</PlatformToolset>
238+
<PlatformToolset>v143</PlatformToolset>
239239
<CharacterSet>MultiByte</CharacterSet>
240240
</PropertyGroup>
241241
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug TRAS XENON-W|Win32'" Label="Configuration">
242-
<PlatformToolset>v141</PlatformToolset>
242+
<PlatformToolset>v143</PlatformToolset>
243243
<CharacterSet>MultiByte</CharacterSet>
244244
</PropertyGroup>
245245
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug TR7 PC-W|Win32'" Label="Configuration">
246-
<PlatformToolset>v141</PlatformToolset>
246+
<PlatformToolset>v143</PlatformToolset>
247247
<CharacterSet>MultiByte</CharacterSet>
248248
</PropertyGroup>
249249
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug TR7 XENON-W|Win32'" Label="Configuration">
250-
<PlatformToolset>v141</PlatformToolset>
250+
<PlatformToolset>v143</PlatformToolset>
251251
<CharacterSet>MultiByte</CharacterSet>
252252
</PropertyGroup>
253253
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug TRAE PS2-W|Win32'" Label="Configuration">
254-
<PlatformToolset>v141</PlatformToolset>
254+
<PlatformToolset>v143</PlatformToolset>
255255
<CharacterSet>MultiByte</CharacterSet>
256256
</PropertyGroup>
257257
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug TRAE XENON-W|Win32'" Label="Configuration">
258-
<PlatformToolset>v141</PlatformToolset>
258+
<PlatformToolset>v143</PlatformToolset>
259259
<CharacterSet>MultiByte</CharacterSet>
260260
</PropertyGroup>
261261
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug TRAE PC-W|Win32'" Label="Configuration">
262-
<PlatformToolset>v141</PlatformToolset>
262+
<PlatformToolset>v143</PlatformToolset>
263263
<CharacterSet>MultiByte</CharacterSet>
264264
</PropertyGroup>
265265
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug TRAE PS3-W|Win32'" Label="Configuration">
266-
<PlatformToolset>v141</PlatformToolset>
266+
<PlatformToolset>v143</PlatformToolset>
267267
<CharacterSet>MultiByte</CharacterSet>
268268
</PropertyGroup>
269269
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug TRAE PSP-W|Win32'" Label="Configuration">
270-
<PlatformToolset>v141</PlatformToolset>
270+
<PlatformToolset>v143</PlatformToolset>
271271
<CharacterSet>MultiByte</CharacterSet>
272272
</PropertyGroup>
273273
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug TR7 PS2-W|Win32'" Label="Configuration">
274-
<PlatformToolset>v141</PlatformToolset>
274+
<PlatformToolset>v143</PlatformToolset>
275275
<CharacterSet>MultiByte</CharacterSet>
276276
</PropertyGroup>
277277
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug TR7 PSP-W|Win32'" Label="Configuration">
278-
<PlatformToolset>v141</PlatformToolset>
278+
<PlatformToolset>v143</PlatformToolset>
279279
<CharacterSet>MultiByte</CharacterSet>
280280
</PropertyGroup>
281281
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug TR7 PS3-W|Win32'" Label="Configuration">
282-
<PlatformToolset>v141</PlatformToolset>
282+
<PlatformToolset>v143</PlatformToolset>
283283
<CharacterSet>MultiByte</CharacterSet>
284284
</PropertyGroup>
285285
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug TR8 PS2-W|Win32'">
286-
<PlatformToolset>v141</PlatformToolset>
286+
<PlatformToolset>v143</PlatformToolset>
287287
<CharacterSet>MultiByte</CharacterSet>
288288
</PropertyGroup>
289289
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug TR8 PS3-W|Win32'">
290-
<PlatformToolset>v141</PlatformToolset>
290+
<PlatformToolset>v143</PlatformToolset>
291291
<CharacterSet>MultiByte</CharacterSet>
292292
</PropertyGroup>
293293
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug TR8 WII-W|Win32'">
294-
<PlatformToolset>v141</PlatformToolset>
294+
<PlatformToolset>v143</PlatformToolset>
295295
<CharacterSet>MultiByte</CharacterSet>
296296
</PropertyGroup>
297297
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

‎CDRM/Main.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ int main(int argc, char* argv[])
5252
void PrintToolInfo()
5353
{
5454
#if DEBUG
55-
std::cout << "CDRM v1.1 (DEBUG) for " << GAME_NAME << std::endl;
55+
std::cout << "CDRM v1.6 (DEBUG) for " << GAME_NAME << std::endl;
5656
#else
57-
std::cout << "CDRM v1.1 for " << GAME_NAME << std::endl;
57+
std::cout << "CDRM v1.6 for " << GAME_NAME << std::endl;
5858
#endif
5959
std::cout << "Platform: " << PLATFORM_FULL_NAME << " (" << PLATFORM_CONFIG_NAME << ")" << std::endl;
6060
std::cout << "Built: " << (__DATE__ ", " __TIME__) << std::endl;

‎DRM/DRM.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,9 @@ void cDRM::ExtractSections(char* szFilePath)
268268

269269
char* cDRM::DetectExtension(std::ifstream& ifs, int sectionIndex)
270270
{
271-
#if TR7 || TRAE
272271
Section* section = &m_sections[sectionIndex];
273272

273+
#if TR7 || TRAE
274274
//Detect the extension
275275
char* extension = SectionDetect::GetExtension(ifs, section);
276276
if (extension)

‎DRM/DRM.rc‎

0 Bytes
Binary file not shown.

‎DRM/Main.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ int main(int argc, char* argv[])
5151
void PrintToolInfo()
5252
{
5353
#if DEBUG
54-
std::cout << "DRM v1.4 (DEBUG) for " << GAME_NAME << std::endl;
54+
std::cout << "DRM v1.6 (DEBUG) for " << GAME_NAME << std::endl;
5555
#else
56-
std::cout << "DRM v1.4 for " << GAME_NAME << std::endl;
56+
std::cout << "DRM v1.6 for " << GAME_NAME << std::endl;
5757
#endif
5858
std::cout << "Platform: " << PLATFORM_FULL_NAME << " (" << PLATFORM_CONFIG_NAME << ")" << std::endl;
5959
std::cout << "Built: " << (__DATE__ ", " __TIME__) << std::endl;

0 commit comments

Comments
 (0)