Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
f319b959
Commit
f319b959
authored
Mar 20, 2014
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msw: collect files in a single directory (fixes #10900)
parent
663877d8
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
modules/video_output/Modules.am
modules/video_output/Modules.am
+5
-5
modules/video_output/msw/events.c
modules/video_output/msw/events.c
+1
-1
modules/video_output/msw/win32touch.c
modules/video_output/msw/win32touch.c
+0
-0
modules/video_output/msw/win32touch.h
modules/video_output/msw/win32touch.h
+0
-0
No files found.
modules/video_output/Modules.am
View file @
f319b959
...
...
@@ -131,7 +131,7 @@ endif
### Win32 ###
libdirect2d_plugin_la_SOURCES = msw/direct2d.c \
msw/common.c msw/common.h msw/events.c msw/events.h \
../control/win32touch.c ../control
/win32touch.h
msw/win32touch.c msw
/win32touch.h
libdirect2d_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
-DMODULE_NAME_IS_direct2d
libdirect2d_plugin_la_LIBADD = -lgdi32 -lole32 -luuid
...
...
@@ -141,7 +141,7 @@ EXTRA_LTLIBRARIES += libdirect2d_plugin.la
libdirect3d_plugin_la_SOURCES = msw/direct3d.c \
msw/common.c msw/common.h msw/events.c msw/events.h msw/builtin_shaders.h \
../control/win32touch.c ../control
/win32touch.h
msw/win32touch.c msw
/win32touch.h
libdirect3d_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
-DMODULE_NAME_IS_direct3d
libdirect3d_plugin_la_LIBADD = -lgdi32 -lole32 -luuid
...
...
@@ -151,7 +151,7 @@ EXTRA_LTLIBRARIES += libdirect3d_plugin.la
libdirectdraw_plugin_la_SOURCES = msw/directx.c \
msw/common.c msw/common.h msw/events.c msw/events.h \
../control/win32touch.c ../control
/win32touch.h
msw/win32touch.c msw
/win32touch.h
libdirectdraw_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
-DMODULE_NAME_IS_directdraw
libdirectdraw_plugin_la_LIBADD = -luser32 -lgdi32 -lole32 -luuid
...
...
@@ -161,7 +161,7 @@ endif
libglwin32_plugin_la_SOURCES = msw/glwin32.c opengl.c opengl.h \
msw/common.c msw/common.h msw/events.c msw/events.h \
../control/win32touch.c ../control
/win32touch.h
msw/win32touch.c msw
/win32touch.h
libglwin32_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
-DMODULE_NAME_IS_glwin32
libglwin32_plugin_la_LIBADD = -lopengl32 -lgdi32 -lole32 -luuid
...
...
@@ -171,7 +171,7 @@ EXTRA_LTLIBRARIES += libglwin32_plugin.la
libwingdi_plugin_la_SOURCES = msw/wingdi.c \
msw/common.c msw/common.h msw/events.c msw/events.h \
../control/win32touch.c ../control
/win32touch.h
msw/win32touch.c msw
/win32touch.h
libwingdi_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
-DMODULE_NAME_IS_wingdi
libwingdi_plugin_la_LIBADD = -lgdi32 -lole32 -luuid
...
...
modules/video_output/msw/events.c
View file @
f319b959
...
...
@@ -30,7 +30,7 @@
# include "config.h"
#endif
#include "
../../control/
win32touch.h"
#include "win32touch.h"
#include <vlc_common.h>
#include <vlc_vout_display.h>
...
...
modules/
control
/win32touch.c
→
modules/
video_output/msw
/win32touch.c
View file @
f319b959
File moved
modules/
control
/win32touch.h
→
modules/
video_output/msw
/win32touch.h
View file @
f319b959
File moved
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