Просмотр исходного кода

modify w32-pthreads location in source/project files

jp9000 12 лет назад
Родитель
Сommit
93905e516b
3 измененных файлов с 8 добавлено и 8 удалено
  1. 1 1
      libobs/util/platform-windows.c
  2. 2 2
      libobs/util/threading.h
  3. 5 5
      vs/2010/pthreads/pthreads.vcxproj

+ 1 - 1
libobs/util/platform-windows.c

@@ -26,7 +26,7 @@
 #include "platform.h"
 #include "bmem.h"
 
-#include "../../w32-pthreads/pthread.h"
+#include "../../deps/w32-pthreads/pthread.h"
 
 static bool have_clockfreq = false;
 static LARGE_INTEGER clock_freq;

+ 2 - 2
libobs/util/threading.h

@@ -34,8 +34,8 @@
 #include "c99defs.h"
 
 #ifdef _MSC_VER
-#include "../../w32-pthreads/pthread.h"
-#include "../../w32-pthreads/semaphore.h"
+#include "../../deps/w32-pthreads/pthread.h"
+#include "../../deps/w32-pthreads/semaphore.h"
 #else
 #include <errno.h>
 #include <pthread.h>

+ 5 - 5
vs/2010/pthreads/pthreads.vcxproj

@@ -132,13 +132,13 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\w32-pthreads\pthread.c" />
+    <ClCompile Include="..\..\..\deps\w32-pthreads\pthread.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\w32-pthreads\implement.h" />
-    <ClInclude Include="..\..\..\w32-pthreads\pthread.h" />
-    <ClInclude Include="..\..\..\w32-pthreads\sched.h" />
-    <ClInclude Include="..\..\..\w32-pthreads\semaphore.h" />
+    <ClInclude Include="..\..\..\deps\w32-pthreads\implement.h" />
+    <ClInclude Include="..\..\..\deps\w32-pthreads\pthread.h" />
+    <ClInclude Include="..\..\..\deps\w32-pthreads\sched.h" />
+    <ClInclude Include="..\..\..\deps\w32-pthreads\semaphore.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">