[vlc-commits] video_output: msw -> win32 for Windows

Jean-Baptiste Kempf git at videolan.org
Sun Apr 17 21:51:09 CEST 2016 

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Apr 17 20:46:46 2016 +0200| [3c2143b5936907e5590ac41b023da4ca6ca76bb8] | committer: Jean-Baptiste Kempf

video_output: msw -> win32 for Windows

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3c2143b5936907e5590ac41b023da4ca6ca76bb8
---

 modules/video_output/Makefile.am                   |   52 ++++++++++----------
 .../video_output/{msw => win32}/builtin_shaders.h  |    0
 modules/video_output/{msw => win32}/common.c       |    0
 modules/video_output/{msw => win32}/common.h       |    0
 modules/video_output/{msw => win32}/direct2d.c     |    0
 modules/video_output/{msw => win32}/direct3d11.c   |    0
 modules/video_output/{msw => win32}/direct3d9.c    |    0
 modules/video_output/{msw => win32}/directdraw.c   |    0
 modules/video_output/{msw => win32}/events.c       |    0
 modules/video_output/{msw => win32}/events.h       |    0
 modules/video_output/{msw => win32}/glwin32.c      |    0
 modules/video_output/{msw => win32}/win32touch.c   |    0
 modules/video_output/{msw => win32}/win32touch.h   |    0
 modules/video_output/{msw => win32}/wingdi.c       |    0
 po/POTFILES.in                                     |   14 +++---
 15 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index 83a26e1..9f4a761 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -157,10 +157,10 @@ endif
 
 
 ### Win32 ###
-libdirect2d_plugin_la_SOURCES = video_output/msw/direct2d.c \
-	video_output/msw/common.c video_output/msw/common.h \
-	video_output/msw/events.c video_output/msw/events.h \
-	video_output/msw/win32touch.c video_output/msw/win32touch.h
+libdirect2d_plugin_la_SOURCES = video_output/win32/direct2d.c \
+	video_output/win32/common.c video_output/win32/common.h \
+	video_output/win32/events.c video_output/win32/events.h \
+	video_output/win32/win32touch.c video_output/win32/win32touch.h
 libdirect2d_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
 	-DMODULE_NAME_IS_direct2d
 libdirect2d_plugin_la_LIBADD = -lgdi32 -lole32 -luuid
@@ -168,11 +168,11 @@ libdirect2d_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
 vout_LTLIBRARIES += $(LTLIBdirect2d)
 EXTRA_LTLIBRARIES += libdirect2d_plugin.la
 
-libdirect3d9_plugin_la_SOURCES = video_output/msw/direct3d9.c \
-	video_output/msw/common.c video_output/msw/common.h \
-	video_output/msw/events.c video_output/msw/events.h \
-	video_output/msw/builtin_shaders.h \
-	video_output/msw/win32touch.c video_output/msw/win32touch.h
+libdirect3d9_plugin_la_SOURCES = video_output/win32/direct3d9.c \
+	video_output/win32/common.c video_output/win32/common.h \
+	video_output/win32/events.c video_output/win32/events.h \
+	video_output/win32/builtin_shaders.h \
+	video_output/win32/win32touch.c video_output/win32/win32touch.h
 libdirect3d9_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
 	-DMODULE_NAME_IS_direct3d9
 libdirect3d9_plugin_la_LIBADD = -lgdi32 -lole32 -luuid
@@ -180,15 +180,15 @@ libdirect3d9_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
 vout_LTLIBRARIES += $(LTLIBdirect3d9)
 EXTRA_LTLIBRARIES += libdirect3d9_plugin.la
 
-libdirect3d11_plugin_la_SOURCES = video_output/msw/direct3d11.c \
+libdirect3d11_plugin_la_SOURCES = video_output/win32/direct3d11.c \
  video_chroma/dxgi_fmt.c video_chroma/dxgi_fmt.h \
- video_output/msw/common.c video_output/msw/common.h
+ video_output/win32/common.c video_output/win32/common.h
 libdirect3d11_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
  -DMODULE_NAME_IS_direct3d11
 if !HAVE_WINSTORE
-libdirect3d11_plugin_la_SOURCES += video_output/msw/events.c \
- video_output/msw/events.h \
- video_output/msw/win32touch.c video_output/msw/win32touch.h
+libdirect3d11_plugin_la_SOURCES += video_output/win32/events.c \
+ video_output/win32/events.h \
+ video_output/win32/win32touch.c video_output/win32/win32touch.h
 libdirect3d11_plugin_la_LIBADD = -lgdi32 -lole32 -luuid
 else
 libdirect3d11_plugin_la_LIBADD = -ld3dcompiler -lole32 -luuid
@@ -197,10 +197,10 @@ libdirect3d11_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
 vout_LTLIBRARIES += $(LTLIBdirect3d11)
 EXTRA_LTLIBRARIES += libdirect3d11_plugin.la
 
-libdirectdraw_plugin_la_SOURCES = video_output/msw/directdraw.c \
-	video_output/msw/common.c video_output/msw/common.h \
-	video_output/msw/events.c video_output/msw/events.h \
-	video_output/msw/win32touch.c video_output/msw/win32touch.h
+libdirectdraw_plugin_la_SOURCES = video_output/win32/directdraw.c \
+	video_output/win32/common.c video_output/win32/common.h \
+	video_output/win32/events.c video_output/win32/events.h \
+	video_output/win32/win32touch.c video_output/win32/win32touch.h
 libdirectdraw_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
 	-DMODULE_NAME_IS_directdraw
 libdirectdraw_plugin_la_LIBADD = -luser32 -lgdi32 -lole32 -luuid
@@ -208,11 +208,11 @@ if HAVE_DIRECTX
 vout_LTLIBRARIES += libdirectdraw_plugin.la
 endif
 
-libglwin32_plugin_la_SOURCES = video_output/msw/glwin32.c \
+libglwin32_plugin_la_SOURCES = video_output/win32/glwin32.c \
 	video_output/opengl.c video_output/opengl.h \
-	video_output/msw/common.c video_output/msw/common.h \
-	video_output/msw/events.c video_output/msw/events.h \
-	video_output/msw/win32touch.c video_output/msw/win32touch.h
+	video_output/win32/common.c video_output/win32/common.h \
+	video_output/win32/events.c video_output/win32/events.h \
+	video_output/win32/win32touch.c video_output/win32/win32touch.h
 libglwin32_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
 	-DMODULE_NAME_IS_glwin32
 libglwin32_plugin_la_LIBADD = -lopengl32 -lgdi32 -lole32 -luuid
@@ -220,10 +220,10 @@ libglwin32_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
 vout_LTLIBRARIES += $(LTLIBglwin32)
 EXTRA_LTLIBRARIES += libglwin32_plugin.la
 
-libwingdi_plugin_la_SOURCES = video_output/msw/wingdi.c \
-	video_output/msw/common.c video_output/msw/common.h \
-	video_output/msw/events.c video_output/msw/events.h \
-	video_output/msw/win32touch.c video_output/msw/win32touch.h
+libwingdi_plugin_la_SOURCES = video_output/win32/wingdi.c \
+	video_output/win32/common.c video_output/win32/common.h \
+	video_output/win32/events.c video_output/win32/events.h \
+	video_output/win32/win32touch.c video_output/win32/win32touch.h
 libwingdi_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
 	-DMODULE_NAME_IS_wingdi
 libwingdi_plugin_la_LIBADD = -lgdi32 -lole32 -luuid
diff --git a/modules/video_output/msw/builtin_shaders.h b/modules/video_output/win32/builtin_shaders.h
similarity index 100%
rename from modules/video_output/msw/builtin_shaders.h
rename to modules/video_output/win32/builtin_shaders.h
diff --git a/modules/video_output/msw/common.c b/modules/video_output/win32/common.c
similarity index 100%
rename from modules/video_output/msw/common.c
rename to modules/video_output/win32/common.c
diff --git a/modules/video_output/msw/common.h b/modules/video_output/win32/common.h
similarity index 100%
rename from modules/video_output/msw/common.h
rename to modules/video_output/win32/common.h
diff --git a/modules/video_output/msw/direct2d.c b/modules/video_output/win32/direct2d.c
similarity index 100%
rename from modules/video_output/msw/direct2d.c
rename to modules/video_output/win32/direct2d.c
diff --git a/modules/video_output/msw/direct3d11.c b/modules/video_output/win32/direct3d11.c
similarity index 100%
rename from modules/video_output/msw/direct3d11.c
rename to modules/video_output/win32/direct3d11.c
diff --git a/modules/video_output/msw/direct3d9.c b/modules/video_output/win32/direct3d9.c
similarity index 100%
rename from modules/video_output/msw/direct3d9.c
rename to modules/video_output/win32/direct3d9.c
diff --git a/modules/video_output/msw/directdraw.c b/modules/video_output/win32/directdraw.c
similarity index 100%
rename from modules/video_output/msw/directdraw.c
rename to modules/video_output/win32/directdraw.c
diff --git a/modules/video_output/msw/events.c b/modules/video_output/win32/events.c
similarity index 100%
rename from modules/video_output/msw/events.c
rename to modules/video_output/win32/events.c
diff --git a/modules/video_output/msw/events.h b/modules/video_output/win32/events.h
similarity index 100%
rename from modules/video_output/msw/events.h
rename to modules/video_output/win32/events.h
diff --git a/modules/video_output/msw/glwin32.c b/modules/video_output/win32/glwin32.c
similarity index 100%
rename from modules/video_output/msw/glwin32.c
rename to modules/video_output/win32/glwin32.c
diff --git a/modules/video_output/msw/win32touch.c b/modules/video_output/win32/win32touch.c
similarity index 100%
rename from modules/video_output/msw/win32touch.c
rename to modules/video_output/win32/win32touch.c
diff --git a/modules/video_output/msw/win32touch.h b/modules/video_output/win32/win32touch.h
similarity index 100%
rename from modules/video_output/msw/win32touch.h
rename to modules/video_output/win32/win32touch.h
diff --git a/modules/video_output/msw/wingdi.c b/modules/video_output/win32/wingdi.c
similarity index 100%
rename from modules/video_output/msw/wingdi.c
rename to modules/video_output/win32/wingdi.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0daaa36..cbe4c85 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1160,13 +1160,13 @@ modules/video_output/glx.c
 modules/video_output/ios2.m
 modules/video_output/kva.c
 modules/video_output/macosx.m
-modules/video_output/msw/direct2d.c
-modules/video_output/msw/direct3d9.c
-modules/video_output/msw/direct3d11.c
-modules/video_output/msw/directdraw.c
-modules/video_output/msw/events.c
-modules/video_output/msw/glwin32.c
-modules/video_output/msw/wingdi.c
+modules/video_output/win32/direct2d.c
+modules/video_output/win32/direct3d9.c
+modules/video_output/win32/direct3d11.c
+modules/video_output/win32/directdraw.c
+modules/video_output/win32/events.c
+modules/video_output/win32/glwin32.c
+modules/video_output/win32/wingdi.c
 modules/video_output/sdl.c
 modules/video_output/vdummy.c
 modules/video_output/vmem.c

More information about the vlc-commits mailing list