Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
7fba4e1c
Commit
7fba4e1c
authored
Nov 09, 2011
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Contribs: don't use pthread for Win32
parent
f12f0adb
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
1 deletion
+27
-1
contrib/src/projectM/rules.mak
contrib/src/projectM/rules.mak
+1
-1
contrib/src/projectM/win32.patch
contrib/src/projectM/win32.patch
+26
-0
No files found.
contrib/src/projectM/rules.mak
View file @
7fba4e1c
...
@@ -27,7 +27,7 @@ endif
...
@@ -27,7 +27,7 @@ endif
DEPS_projectM
=
glew
$(DEPS_glew)
DEPS_projectM
=
glew
$(DEPS_glew)
.projectM
:
projectM .glew
.pthreads
.projectM
:
projectM .glew
-
cd
$<
&&
rm
CMakeCache.txt
-
cd
$<
&&
rm
CMakeCache.txt
cd
$<
&&
$(HOSTVARS)
$(CMAKE)
\
cd
$<
&&
$(HOSTVARS)
$(CMAKE)
\
-DINCLUDE-PROJECTM-LIBVISUAL
:BOOL
=
OFF
\
-DINCLUDE-PROJECTM-LIBVISUAL
:BOOL
=
OFF
\
...
...
contrib/src/projectM/win32.patch
View file @
7fba4e1c
...
@@ -199,3 +199,29 @@ diff -ruN libprojectM/Renderer/TextureManager.cpp libprojectM.new/Renderer/Textu
...
@@ -199,3 +199,29 @@ diff -ruN libprojectM/Renderer/TextureManager.cpp libprojectM.new/Renderer/Textu
TextureManager::TextureManager(const std::string _presetURL): presetURL(_presetURL)
TextureManager::TextureManager(const std::string _presetURL): presetURL(_presetURL)
{
{
--- projectM/projectM.hpp 2011-11-09 22:33:29.997034349 +0100
+++ projectM.new/projectM.hpp 2011-11-09 22:32:27.064722289 +0100
@@ -57,7 +57,9 @@
#include "event.h"
#include "fatal.h"
#include "PCM.hpp"
-#include "pthread.h"
+#ifdef USE_THREADS
+# include "pthread.h"
+#endif
class PipelineContext;
class BeatDetect;
@@ -309,10 +311,12 @@
RenderItemMatcher * _matcher;
MasterRenderItemMerge * _merger;
+#ifdef USE_THREADS
pthread_mutex_t mutex;
pthread_cond_t condition;
pthread_t thread;
+#endif
bool running;
Pipeline* currentPipe;
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment