Skip to content

Commit 289f96d

Browse files
elishacloudelishacloud
committed
Share build and version between dxwrapper and stub
1 parent d7906d4 commit 289f96d

10 files changed

Lines changed: 18 additions & 21 deletions

File tree

‎Dllmain/BuildNo.rc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
#define BUILD_NUMBER 7260
1+
#define BUILD_NUMBER 7300

‎Dllmain/Resource.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#pragma once
2+
3+
#include "..\Dllmain\BuildNo.rc"
4+
5+
#define APP_MAJOR 1
6+
#define APP_MINOR 2
7+
#define APP_BUILDNUMBER BUILD_NUMBER
8+
#define APP_REVISION 25

‎Dllmain/dxwrapper.h‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@
22
// Microsoft Visual C++ generated include file.
33
// Used by dxwrapper.rc
44

5-
#include "Dllmain\BuildNo.rc"
5+
#include "..\Dllmain\Resource.h"
66

77
// Main resource file details
88
#define APP_NAME "DirectX Dynamic Link Library"
9-
#define APP_MAJOR 1
10-
#define APP_MINOR 2
11-
#define APP_BUILDNUMBER BUILD_NUMBER
12-
#define APP_REVISION 25
139
#define APP_COMPANYNAME "Sadrate Presents"
1410
#define APP_DESCRPTION "Wraps or hooks DirectX files to fix compatibility issues in older games. Also allows code to be executed from inside the application."
1511
#define APP_COPYRIGHT "Copyright (C) 2024 Elisha Riedlinger"

‎Stub/BuildNo.rc‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Stub/stub.h‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@
22
// Microsoft Visual C++ generated include file.
33
// Used by stub.rc
44

5-
#include "BuildNo.rc"
5+
#include "..\Dllmain\Resource.h"
66

77
// Main resource file details
88
#define APP_NAME "DxWrapper Stub"
9-
#define APP_MAJOR 1
10-
#define APP_MINOR 0
11-
#define APP_BUILDNUMBER BUILD_NUMBER
12-
#define APP_REVISION 1
139
#define APP_COMPANYNAME "Sadrate Presents"
1410
#define APP_DESCRPTION "Stub for DxWrapper. Supports: bcrypt.dll, cryptsp.dll, d2d1.dll, d3d8.dll, d3d9.dll, d3d10.dll, d3d11.dll, d3d12.dll, dciman32.dll, ddraw.dll, dinput.dll, dinput8.dll, dplayx.dll, dsound.dll, msacm32.dll, msvfw32.dll, version.dll, winmm.dll, winmmbase.dll" // Can only be 256 characters long
1511
#define APP_COPYRIGHT "Copyright (C) 2024 Elisha Riedlinger"

‎Stub/stub.vcxproj‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,6 @@ copy /Y "$(TargetDir)$(TargetName).dll" "$(TargetDir)Build\Stub\wsock32.dll" &gt
147147
<OptimizeReferences>true</OptimizeReferences>
148148
<EnableCOMDATFolding>true</EnableCOMDATFolding>
149149
</Link>
150-
<PreBuildEvent>
151-
<Command>cmd /c "@echo off &amp;&amp; cd /D ""$(ProjectDir)"" &amp;&amp; if not exist BuildNo.rc echo #define BUILD_NUMBER 0 &gt;BuildNo.rc"
152-
cmd /c "@echo off &amp;&amp; cd /D ""$(ProjectDir)"" &amp;&amp; FOR /F "tokens=3" %%i IN (BuildNo.rc) DO set /a var=%%i+1 &gt;Build.txt"
153-
cmd /c "@echo off &amp;&amp; cd /D ""$(ProjectDir)"" &amp;&amp; FOR /F %%i IN (Build.txt) DO echo #define BUILD_NUMBER %%i &gt;BuildNo.rc"
154-
cmd /c "@echo off &amp;&amp; cd /D ""$(ProjectDir)"" &amp;&amp; del Build.txt"
155-
cmd /c "@echo off &amp;&amp; cd /D ""$(ProjectDir)"" &amp;&amp; type BuildNo.rc"</Command>
156-
</PreBuildEvent>
157150
<PostBuildEvent>
158151
<Command>IF NOT EXIST "$(TargetDir)Build" mkdir "$(TargetDir)Build" &gt;nul
159152
IF NOT EXIST "$(TargetDir)Build\Stub" mkdir "$(TargetDir)Build\Stub" &gt;nul
@@ -297,7 +290,6 @@ copy /Y "$(TargetDir)$(TargetName).dll" "$(TargetDir)Build\Stub\wsock32.dll" &gt
297290
<None Include="..\Wrappers\wrapper.def" />
298291
</ItemGroup>
299292
<ItemGroup>
300-
<ResourceCompile Include="BuildNo.rc" />
301293
<ResourceCompile Include="stub.rc" />
302294
</ItemGroup>
303295
<ItemGroup>

‎Stub/stub.vcxproj.filters‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@
103103
</ClInclude>
104104
</ItemGroup>
105105
<ItemGroup>
106-
<ResourceCompile Include="BuildNo.rc" />
107106
<ResourceCompile Include="stub.rc" />
108107
</ItemGroup>
109108
<ItemGroup>

‎dxwrapper.sln‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dxwrapper", "dxwrapper.vcxp
99
EndProjectSection
1010
EndProject
1111
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stub", "Stub\stub.vcxproj", "{E204DCB3-D122-4F2E-88A8-89AC22CE3274}"
12+
ProjectSection(ProjectDependencies) = postProject
13+
{579E7FE7-2745-4100-A802-23511711FCDE} = {579E7FE7-2745-4100-A802-23511711FCDE}
14+
EndProjectSection
1215
EndProject
1316
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "depot", "depot", "{6F83E1F5-98B8-4834-913B-52E129EB4822}"
1417
EndProject

‎dxwrapper.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1293,6 +1293,7 @@ copy /Y "$(ProjectDir)Settings\Settings.ini" "$(TargetDir)Build\dxwrapper.ini" &
12931293
<ClInclude Include="Disasm\disasm.h" />
12941294
<ClInclude Include="Dllmain\Dllmain.h" />
12951295
<ClInclude Include="Dllmain\dxwrapper.h" />
1296+
<ClInclude Include="Dllmain\Resource.h" />
12961297
<ClInclude Include="dsound\AddressLookupTable.h" />
12971298
<ClInclude Include="dsound\dsound.h" />
12981299
<ClInclude Include="dsound\dsoundExternal.h" />

‎dxwrapper.vcxproj.filters‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1874,6 +1874,9 @@
18741874
<ClInclude Include="DDrawCompat\v0.3.2\Win32\Version.h">
18751875
<Filter>DDrawCompat\v0.3.2</Filter>
18761876
</ClInclude>
1877+
<ClInclude Include="Dllmain\Resource.h">
1878+
<Filter>Dllmain</Filter>
1879+
</ClInclude>
18771880
</ItemGroup>
18781881
<ItemGroup>
18791882
<ResourceCompile Include="Dllmain\BuildNo.rc">

0 commit comments

Comments
 (0)