id-software/DoomRTX
1
0
Fork 0
mirror of https://github.com/jmarshall23/DoomRTX.git synced 2026-08-12 08:11:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed an issue when compiling Doom and not prey.

Browse Source
This commit is contained in:
Justin Marshall
2026-05-06 15:19:25 -07:00
parent 7c5ddb4336
commit f238db4a34
2 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
neo/doomdll.vcxproj
+25 -8
View File
@@ -1386,14 +1386,30 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Dedicated Debug with inlines|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="cm\PreyCM\CollisionModel_contacts.cpp" />
<ClCompile Include="cm\PreyCM\CollisionModel_contents.cpp" />
<ClCompile Include="cm\PreyCM\CollisionModel_debug.cpp" />
<ClCompile Include="cm\PreyCM\CollisionModel_files.cpp" />
<ClCompile Include="cm\PreyCM\CollisionModel_load.cpp" />
<ClCompile Include="cm\PreyCM\CollisionModel_rotate.cpp" />
<ClCompile Include="cm\PreyCM\CollisionModel_trace.cpp" />
<ClCompile Include="cm\PreyCM\CollisionModel_translate.cpp" />
<ClCompile Include="cm\PreyCM\CollisionModel_contacts.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="cm\PreyCM\CollisionModel_contents.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="cm\PreyCM\CollisionModel_debug.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="cm\PreyCM\CollisionModel_files.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="cm\PreyCM\CollisionModel_load.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="cm\PreyCM\CollisionModel_rotate.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="cm\PreyCM\CollisionModel_trace.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="cm\PreyCM\CollisionModel_translate.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="framework\CmdSystem.cpp" />
<ClCompile Include="framework\Common.cpp" />
<ClCompile Include="framework\Compressor.cpp" />
@@ -3341,6 +3357,7 @@
</ProjectReference>
<ProjectReference Include="prey\PreyGame.vcxproj">
<Project>{6cd8e46d-e28e-493f-bb06-537a637a68c2}</Project>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
</ItemGroup>
<ItemGroup>
neo/renderer/Material.cpp
+2
View File
@@ -1906,11 +1906,13 @@ idMaterial::GetGlowImage
===================
*/
idImage* idMaterial::GetGlowImage(void) const {
#ifdef PREY
for (int i = 0; i < numStages; i++) {
if ((stages[i].lighting == SL_GLOWMAP || stages[i].isGlow) && stages[i].texture.image) {
return stages[i].texture.image;
}
}
#endif
return NULL;
}