[vlc-commits] macosx: Correctly remove FSPanel.xib from build system

David Fuhrmann git at videolan.org
Sun Jul 9 21:29:17 CEST 2017


vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Sun Jul  9 20:07:16 2017 +0200| [6b9df79e478e274877ab533fb45b69b6b33ecf9d] | committer: David Fuhrmann

macosx: Correctly remove FSPanel.xib from build system

This fixes compilation as FSPanel.xib was not correctly removed
from buildsystem before. Also removes file from xcode project.

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

 extras/package/macosx/VLC.xcodeproj/project.pbxproj | 2 --
 modules/gui/macosx/Makefile.am                      | 1 -
 2 files changed, 3 deletions(-)

diff --git a/extras/package/macosx/VLC.xcodeproj/project.pbxproj b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
index a535bc1e56..734aef09df 100644
--- a/extras/package/macosx/VLC.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
@@ -150,7 +150,6 @@
 		6B8224031E4D2A9000833BE1 /* ConvertAndSave.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ConvertAndSave.xib; sourceTree = "<group>"; };
 		6B8224041E4D2A9000833BE1 /* CoreDialogs.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CoreDialogs.xib; sourceTree = "<group>"; };
 		6B8224051E4D2A9000833BE1 /* DetachedVideoWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DetachedVideoWindow.xib; sourceTree = "<group>"; };
-		6B8224061E4D2A9000833BE1 /* FSPanel.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FSPanel.xib; sourceTree = "<group>"; };
 		6B8224071E4D2A9000833BE1 /* Help.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = Help.xib; sourceTree = "<group>"; };
 		6B8224081E4D2A9000833BE1 /* LogMessageWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LogMessageWindow.xib; sourceTree = "<group>"; };
 		6B8224091E4D2A9000833BE1 /* MainMenu.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainMenu.xib; sourceTree = "<group>"; };
@@ -1794,7 +1793,6 @@
 				6B8224041E4D2A9000833BE1 /* CoreDialogs.xib */,
 				6B8224051E4D2A9000833BE1 /* DetachedVideoWindow.xib */,
 				1CFE8D561EA0D3D300E94451 /* ErrorPanel.xib */,
-				6B8224061E4D2A9000833BE1 /* FSPanel.xib */,
 				6B8224071E4D2A9000833BE1 /* Help.xib */,
 				6B8224081E4D2A9000833BE1 /* LogMessageWindow.xib */,
 				6B8224091E4D2A9000833BE1 /* MainMenu.xib */,
diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am
index 70c8a784da..e97006f18b 100644
--- a/modules/gui/macosx/Makefile.am
+++ b/modules/gui/macosx/Makefile.am
@@ -111,7 +111,6 @@ nodist_libmacosx_plugin_la_SOURCES = \
 	gui/macosx/UI/CoreDialogs.nib \
 	gui/macosx/UI/DetachedVideoWindow.nib \
 	gui/macosx/UI/ErrorPanel.nib \
-	gui/macosx/UI/FSPanel.nib \
 	gui/macosx/UI/Help.nib \
 	gui/macosx/UI/LogMessageWindow.nib \
 	gui/macosx/UI/MainMenu.nib \



More information about the vlc-commits mailing list