diff options
| author | Markus Wick <markus+github@selfnet.de> | 2015-03-14 17:23:27 +0100 |
|---|---|---|
| committer | Markus Wick <markus+github@selfnet.de> | 2015-03-14 17:23:27 +0100 |
| commit | ec8a074690f170c007870cbd583806c8d32c4bee (patch) | |
| tree | 5746b3a5b9fb56abf5760838cb82f9768b359b37 /Source | |
| parent | 41ad0f697644e0218fd199d6da1f0d585230a927 (diff) | |
| parent | a5ea6c6e9365f7486d3d683ca094fa26e4396977 (diff) | |
Merge pull request #2153 from degasus/enet
enet: Search for shared library
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Common/Common.vcxproj | 5 | ||||
| -rw-r--r-- | Source/Core/Common/TraversalClient.h | 2 | ||||
| -rw-r--r-- | Source/Core/Core/Core.vcxproj | 6 | ||||
| -rw-r--r-- | Source/VSProps/Base.props | 1 |
4 files changed, 9 insertions, 5 deletions
diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj index fdd3183587..00cbae4707 100644 --- a/Source/Core/Common/Common.vcxproj +++ b/Source/Core/Common/Common.vcxproj @@ -135,6 +135,9 @@ <Text Include="CMakeLists.txt" /> </ItemGroup> <ItemGroup> + <ProjectReference Include="$(ExternalsDir)enet\enet.vcxproj"> + <Project>{cbc76802-c128-4b17-bf6c-23b08c313e5e}</Project> + </ProjectReference> <ProjectReference Include="$(ExternalsDir)polarssl\visualc\PolarSSL.vcxproj"> <Project>{bdb6578b-0691-4e80-a46c-df21639fd3b8}</Project> </ProjectReference> @@ -145,4 +148,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/Source/Core/Common/TraversalClient.h b/Source/Core/Common/TraversalClient.h index 7418aa8d25..0263d863fb 100644 --- a/Source/Core/Common/TraversalClient.h +++ b/Source/Core/Common/TraversalClient.h @@ -4,7 +4,7 @@ #include <functional> #include <list> #include <memory> -#include <enet/include/enet/enet.h> +#include <enet/enet.h> #include "Common/Common.h" #include "Common/Thread.h" #include "Common/TraversalProto.h" diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj index 226a45bf85..bf021338fc 100644 --- a/Source/Core/Core/Core.vcxproj +++ b/Source/Core/Core/Core.vcxproj @@ -446,6 +446,9 @@ <ProjectReference Include="$(ExternalsDir)Bochs_disasm\Bochs_disasm.vcxproj"> <Project>{8ada04d7-6db1-4da4-ab55-64fb12a0997b}</Project> </ProjectReference> + <ProjectReference Include="$(ExternalsDir)enet\enet.vcxproj"> + <Project>{cbc76802-c128-4b17-bf6c-23b08c313e5e}</Project> + </ProjectReference> <ProjectReference Include="$(ExternalsDir)libusb\libusb_static_2013.vcxproj"> <Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project> </ProjectReference> @@ -482,9 +485,6 @@ <ProjectReference Include="$(CoreDir)VideoCommon\VideoCommon.vcxproj"> <Project>{3de9ee35-3e91-4f27-a014-2866ad8c3fe3}</Project> </ProjectReference> - <ProjectReference Include="..\..\..\Externals\enet\enet.vcxproj"> - <Project>{cbc76802-c128-4b17-bf6c-23b08c313e5e}</Project> - </ProjectReference> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props index 9347780009..92759d4966 100644 --- a/Source/VSProps/Base.props +++ b/Source/VSProps/Base.props @@ -35,6 +35,7 @@ <AdditionalIncludeDirectories>$(CoreDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ExternalsDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ExternalsDir)Bochs_disasm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(ExternalsDir)enet\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ExternalsDir)GL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ExternalsDir)libpng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ExternalsDir)libusb\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |