Fix 2 headers being compiled in VS 2013 and 2015

The headers state_population_trigger.h and change_state_effect.h were marked as compilable source code (translation units). This led to linker errors, because they generated object files, which shadowed their .cpp counterparts.
janx8r · Apr 8, 2019 · 7f8da84 · 7f8da84
1 parent a41b089
commit 7f8da84
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/projects/VS2013/Menge/MengeCore.vcxproj b/projects/VS2013/Menge/MengeCore.vcxproj
@@ -430,8 +430,8 @@ xcopy /y $(TargetPath) $(ExeDir)
     <ClInclude Include="$(SrcDir)\mengeCore\Agents\Events\EventTriggerFactory.h" />
     <ClInclude Include="$(SrcDir)\mengeCore\Agents\Events\StateEvtTrigger.h" />
     <ClInclude Include="$(SrcDir)\mengeCore\Agents\Events\StateMemberTarget.h" />
-    <ClCompile Include="$(SrcDir)\mengeCore\Agents\Events\state_population_trigger.h" />
-    <ClCompile Include="$(SrcDir)\mengeCore\Agents\Events\change_state_effect.h" />
+    <ClInclude Include="$(SrcDir)\mengeCore\Agents\Events\state_population_trigger.h" />
+    <ClInclude Include="$(SrcDir)\mengeCore\Agents\Events\change_state_effect.h" />
     <ClInclude Include="$(SrcDir)\mengeCore\Agents\ObstacleSets\ExplicitObstacleSet.h" />
     <ClInclude Include="$(SrcDir)\mengeCore\Agents\ObstacleSets\ListObstacleSet.h" />
     <ClInclude Include="$(SrcDir)\mengeCore\Agents\ObstacleSets\NavMeshObstacleSet.h" />

diff --git a/projects/VS2013/Menge/MengeCore.vcxproj.filters b/projects/VS2013/Menge/MengeCore.vcxproj.filters
@@ -821,12 +821,12 @@
     <ClInclude Include="$(SrcDir)\mengeCore\Agents\Events\StateMemberTarget.h">
       <Filter>Header Files\Agents\Events</Filter>
     </ClInclude>
-    <ClCompile Include="$(SrcDir)\mengeCore\Agents\Events\state_population_trigger.h">
+    <ClInclude Include="$(SrcDir)\mengeCore\Agents\Events\state_population_trigger.h">
       <Filter>Header Files\Agents\Events</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)\mengeCore\Agents\Events\change_state_effect.h">
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)\mengeCore\Agents\Events\change_state_effect.h">
       <Filter>Header Files\Agents\Events</Filter>
-    </ClCompile>
+    </ClInclude>
     <ClInclude Include="$(SrcDir)\mengeCore\Agents\ObstacleSets\ExplicitObstacleSet.h">
       <Filter>Header Files\Agents\ObstacleSets</Filter>
     </ClInclude>

diff --git a/projects/VS2015/Menge/MengeCore.vcxproj b/projects/VS2015/Menge/MengeCore.vcxproj
@@ -430,8 +430,8 @@ xcopy /y $(TargetPath) $(ExeDir)
     <ClInclude Include="$(SrcDir)\mengeCore\Agents\Events\EventTriggerFactory.h" />
     <ClInclude Include="$(SrcDir)\mengeCore\Agents\Events\StateEvtTrigger.h" />
     <ClInclude Include="$(SrcDir)\mengeCore\Agents\Events\StateMemberTarget.h" />
-    <ClCompile Include="$(SrcDir)\mengeCore\Agents\Events\state_population_trigger.h" />
-    <ClCompile Include="$(SrcDir)\mengeCore\Agents\Events\change_state_effect.h" />
+    <ClInclude Include="$(SrcDir)\mengeCore\Agents\Events\state_population_trigger.h" />
+    <ClInclude Include="$(SrcDir)\mengeCore\Agents\Events\change_state_effect.h" />
     <ClInclude Include="$(SrcDir)\mengeCore\Agents\ObstacleSets\ExplicitObstacleSet.h" />
     <ClInclude Include="$(SrcDir)\mengeCore\Agents\ObstacleSets\ListObstacleSet.h" />
     <ClInclude Include="$(SrcDir)\mengeCore\Agents\ObstacleSets\NavMeshObstacleSet.h" />

diff --git a/projects/VS2015/Menge/MengeCore.vcxproj.filters b/projects/VS2015/Menge/MengeCore.vcxproj.filters
@@ -821,12 +821,12 @@
     <ClInclude Include="$(SrcDir)\mengeCore\Agents\Events\StateMemberTarget.h">
       <Filter>Header Files\Agents\Events</Filter>
     </ClInclude>
-    <ClCompile Include="$(SrcDir)\mengeCore\Agents\Events\state_population_trigger.h">
+    <ClInclude Include="$(SrcDir)\mengeCore\Agents\Events\state_population_trigger.h">
       <Filter>Header Files\Agents\Events</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)\mengeCore\Agents\Events\change_state_effect.h">
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)\mengeCore\Agents\Events\change_state_effect.h">
       <Filter>Header Files\Agents\Events</Filter>
-    </ClCompile>
+    </ClInclude>
     <ClInclude Include="$(SrcDir)\mengeCore\Agents\ObstacleSets\ExplicitObstacleSet.h">
       <Filter>Header Files\Agents\ObstacleSets</Filter>
     </ClInclude>