Commit 03d18c98 authored by hartman's avatar hartman

* modules/gui/macosx/*: Commit of the Visualizations menu item.

* ALL: bring the project files to XCode.
  10.2 users should revert the change in Makefile.am or they won't be able to
  build VLC on their machine. Editing the project files will probably also not
  be possible for them.
parent 9a1da9ef
...@@ -453,7 +453,7 @@ VLC.app: vlc ...@@ -453,7 +453,7 @@ VLC.app: vlc
cp "$(srcdir)/modules/gui/macosx/$$i" \ cp "$(srcdir)/modules/gui/macosx/$$i" \
$(top_builddir)/tmp/modules/gui/macosx; \ $(top_builddir)/tmp/modules/gui/macosx; \
done done
cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)' cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'
cp -r $(top_builddir)/tmp/extras/MacOSX/build/vlc.bundle \ cp -r $(top_builddir)/tmp/extras/MacOSX/build/vlc.bundle \
$(top_builddir)/VLC.app $(top_builddir)/VLC.app
rm -Rf $(top_builddir)/tmp rm -Rf $(top_builddir)/tmp
......
...@@ -144,6 +144,7 @@ ...@@ -144,6 +144,7 @@
"o_mi_subtitle" = id; "o_mi_subtitle" = id;
"o_mi_title" = id; "o_mi_title" = id;
"o_mi_videotrack" = id; "o_mi_videotrack" = id;
"o_mi_visual" = id;
"o_mi_vol_down" = id; "o_mi_vol_down" = id;
"o_mi_vol_up" = id; "o_mi_vol_up" = id;
"o_mi_website" = id; "o_mi_website" = id;
...@@ -165,6 +166,7 @@ ...@@ -165,6 +166,7 @@
"o_mu_title" = id; "o_mu_title" = id;
"o_mu_video" = id; "o_mu_video" = id;
"o_mu_videotrack" = id; "o_mu_videotrack" = id;
"o_mu_visual" = id;
"o_mu_window" = id; "o_mu_window" = id;
"o_playlist" = id; "o_playlist" = id;
"o_prefs" = id; "o_prefs" = id;
......
...@@ -3,25 +3,29 @@ ...@@ -3,25 +3,29 @@
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>IBDocumentLocation</key> <key>IBDocumentLocation</key>
<string>32 550 365 441 0 0 1280 1002 </string> <string>23 160 772 722 0 0 1280 1002 </string>
<key>IBEditorPositions</key> <key>IBEditorPositions</key>
<dict> <dict>
<key>29</key> <key>29</key>
<string>431 891 419 44 0 0 1280 1002 </string> <string>430 938 419 44 0 0 1280 1002 </string>
<key>303</key> <key>303</key>
<string>60 509 104 114 0 0 1280 1002 </string> <string>259 604 104 118 0 0 1280 1002 </string>
<key>909</key> <key>909</key>
<string>72 297 430 172 0 0 1152 746 </string> <string>72 297 430 172 0 0 1152 746 </string>
<key>915</key> <key>915</key>
<string>439 657 93 96 0 0 1280 1002 </string> <string>439 657 93 99 0 0 1280 1002 </string>
</dict> </dict>
<key>IBFramework Version</key> <key>IBFramework Version</key>
<string>291.0</string> <string>349.0</string>
<key>IBLockedObjects</key> <key>IBLockedObjects</key>
<array> <array>
<integer>977</integer> <integer>977</integer>
</array> </array>
<key>IBOpenObjects</key>
<array>
<integer>29</integer>
</array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>6R73</string> <string>7B85</string>
</dict> </dict>
</plist> </plist>
...@@ -3,19 +3,27 @@ ...@@ -3,19 +3,27 @@
archiveVersion = 1; archiveVersion = 1;
classes = { classes = {
}; };
objectVersion = 38; objectVersion = 39;
objects = { objects = {
014CEA410018CDE011CA2923 = { 014CEA410018CDE011CA2923 = {
expectedFileType = wrapper.cfbundle;
fallbackIsa = PBXFileReference;
isa = PBXBundleReference; isa = PBXBundleReference;
path = VLC.bundle; path = VLC.bundle;
refType = 3; refType = 3;
sourceTree = BUILT_PRODUCTS_DIR;
}; };
014CEA420018CDE011CA2923 = { 014CEA420018CDE011CA2923 = {
buildRules = ( buildRules = (
); );
buildSettings = { buildSettings = {
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
OPTIMIZATION_CFLAGS = "-O0"; OPTIMIZATION_CFLAGS = "-O0";
ZERO_LINK = YES;
}; };
isa = PBXBuildStyle; isa = PBXBuildStyle;
name = Development; name = Development;
...@@ -25,6 +33,8 @@ ...@@ -25,6 +33,8 @@
); );
buildSettings = { buildSettings = {
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
ZERO_LINK = NO;
}; };
isa = PBXBuildStyle; isa = PBXBuildStyle;
name = Deployment; name = Deployment;
...@@ -40,6 +50,8 @@ ...@@ -40,6 +50,8 @@
//083 //083
//084 //084
089C1669FE841209C02AAC07 = { 089C1669FE841209C02AAC07 = {
buildSettings = {
};
buildStyles = ( buildStyles = (
014CEA420018CDE011CA2923, 014CEA420018CDE011CA2923,
014CEA430018CDE011CA2923, 014CEA430018CDE011CA2923,
...@@ -62,6 +74,7 @@ ...@@ -62,6 +74,7 @@
isa = PBXGroup; isa = PBXGroup;
name = vlc; name = vlc;
refType = 4; refType = 4;
sourceTree = "<group>";
}; };
089C1671FE841209C02AAC07 = { 089C1671FE841209C02AAC07 = {
children = ( children = (
...@@ -71,12 +84,16 @@ ...@@ -71,12 +84,16 @@
isa = PBXGroup; isa = PBXGroup;
name = "Frameworks and Libraries"; name = "Frameworks and Libraries";
refType = 4; refType = 4;
sourceTree = "<group>";
}; };
089C1672FE841209C02AAC07 = { 089C1672FE841209C02AAC07 = {
expectedFileType = wrapper.framework;
fallbackIsa = PBXFileReference;
isa = PBXFrameworkReference; isa = PBXFrameworkReference;
name = Foundation.framework; name = Foundation.framework;
path = /System/Library/Frameworks/Foundation.framework; path = /System/Library/Frameworks/Foundation.framework;
refType = 0; refType = 0;
sourceTree = "<absolute>";
}; };
089C1673FE841209C02AAC07 = { 089C1673FE841209C02AAC07 = {
buildPhases = ( buildPhases = (
...@@ -88,6 +105,7 @@ ...@@ -88,6 +105,7 @@
FRAMEWORK_SEARCH_PATHS = ""; FRAMEWORK_SEARCH_PATHS = "";
HEADER_SEARCH_PATHS = ""; HEADER_SEARCH_PATHS = "";
INSTALL_PATH = "$(HOME)/Library/Bundles"; INSTALL_PATH = "$(HOME)/Library/Bundles";
JAVAC_SOURCE_FILE_ENCODING = "ISO-8859-1";
LIBRARY_SEARCH_PATHS = ""; LIBRARY_SEARCH_PATHS = "";
OTHER_CFLAGS = ""; OTHER_CFLAGS = "";
OTHER_LDFLAGS = ""; OTHER_LDFLAGS = "";
...@@ -678,12 +696,16 @@ ...@@ -678,12 +696,16 @@
name = Resources; name = Resources;
path = ""; path = "";
refType = 4; refType = 4;
sourceTree = "<group>";
}; };
089C167FFE841241C02AAC07 = { 089C167FFE841241C02AAC07 = {
expectedFileType = wrapper.framework;
fallbackIsa = PBXFileReference;
isa = PBXFrameworkReference; isa = PBXFrameworkReference;
name = AppKit.framework; name = AppKit.framework;
path = /System/Library/Frameworks/AppKit.framework; path = /System/Library/Frameworks/AppKit.framework;
refType = 0; refType = 0;
sourceTree = "<absolute>";
}; };
08FB77AFFE84173DC02AAC07 = { 08FB77AFFE84173DC02AAC07 = {
children = ( children = (
...@@ -715,6 +737,7 @@ ...@@ -715,6 +737,7 @@
isa = PBXGroup; isa = PBXGroup;
name = Classes; name = Classes;
refType = 4; refType = 4;
sourceTree = "<group>";
}; };
//080 //080
//081 //081
...@@ -733,12 +756,16 @@ ...@@ -733,12 +756,16 @@
isa = PBXGroup; isa = PBXGroup;
name = "Linked Frameworks"; name = "Linked Frameworks";
refType = 4; refType = 4;
sourceTree = "<group>";
}; };
1058C7ADFEA557BF11CA2CBB = { 1058C7ADFEA557BF11CA2CBB = {
expectedFileType = wrapper.framework;
fallbackIsa = PBXFileReference;
isa = PBXFrameworkReference; isa = PBXFrameworkReference;
name = Cocoa.framework; name = Cocoa.framework;
path = /System/Library/Frameworks/Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework;
refType = 0; refType = 0;
sourceTree = "<absolute>";
}; };
1058C7AEFEA557BF11CA2CBB = { 1058C7AEFEA557BF11CA2CBB = {
children = ( children = (
...@@ -748,6 +775,7 @@ ...@@ -748,6 +775,7 @@
isa = PBXGroup; isa = PBXGroup;
name = "Other Frameworks"; name = "Other Frameworks";
refType = 4; refType = 4;
sourceTree = "<group>";
}; };
1058C7AFFEA557BF11CA2CBB = { 1058C7AFFEA557BF11CA2CBB = {
fileRef = 1058C7ADFEA557BF11CA2CBB; fileRef = 1058C7ADFEA557BF11CA2CBB;
...@@ -772,6 +800,7 @@ ...@@ -772,6 +800,7 @@
isa = PBXGroup; isa = PBXGroup;
name = Products; name = Products;
refType = 4; refType = 4;
sourceTree = "<group>";
}; };
//190 //190
//191 //191
...@@ -819,138 +848,183 @@ ...@@ -819,138 +848,183 @@
name = fileicons; name = fileicons;
path = ""; path = "";
refType = 4; refType = 4;
sourceTree = "<group>";
}; };
8E445F8704728A700059A3A7 = { 8E445F8704728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference; isa = PBXFileReference;
name = a52.icns; name = a52.icns;
path = Resources/a52.icns; path = Resources/a52.icns;
refType = 2; refType = 2;
sourceTree = SOURCE_ROOT;
}; };
8E445F8804728A700059A3A7 = { 8E445F8804728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference; isa = PBXFileReference;
name = aac.icns; name = aac.icns;
path = Resources/aac.icns; path = Resources/aac.icns;
refType = 2; refType = 2;
sourceTree = SOURCE_ROOT;
}; };
8E445F8904728A700059A3A7 = { 8E445F8904728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference; isa = PBXFileReference;
name = asf.icns; name = asf.icns;
path = Resources/asf.icns; path = Resources/asf.icns;
refType = 2; refType = 2;
sourceTree = SOURCE_ROOT;
}; };
8E445F8A04728A700059A3A7 = { 8E445F8A04728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference; isa = PBXFileReference;
name = asx.icns; name = asx.icns;
path = Resources/asx.icns; path = Resources/asx.icns;
refType = 2; refType = 2;
sourceTree = SOURCE_ROOT;
}; };
8E445F8B04728A700059A3A7 = { 8E445F8B04728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference; isa = PBXFileReference;
name = avi.icns; name = avi.icns;
path = Resources/avi.icns; path = Resources/avi.icns;
refType = 2; refType = 2;
sourceTree = SOURCE_ROOT;
}; };
8E445F8C04728A700059A3A7 = { 8E445F8C04728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference; isa = PBXFileReference;
name = bin.icns; name = bin.icns;
path = Resources/bin.icns; path = Resources/bin.icns;
refType = 2; refType = 2;
sourceTree = SOURCE_ROOT;
}; };
8E445F8D04728A700059A3A7 = { 8E445F8D04728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference; isa = PBXFileReference;
name = cue.icns; name = cue.icns;
path = Resources/cue.icns; path = Resources/cue.icns;
refType = 2; refType = 2;
sourceTree = SOURCE_ROOT;
}; };
8E445F8E04728A700059A3A7 = { 8E445F8E04728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference; isa = PBXFileReference;
name = dat.icns; name = dat.icns;
path = Resources/dat.icns; path = Resources/dat.icns;
refType = 2; refType = 2;
sourceTree = SOURCE_ROOT;
}; };
8E445F8F04728A700059A3A7 = { 8E445F8F04728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference; isa = PBXFileReference;
name = dv.icns; name = dv.icns;
path = Resources/dv.icns; path = Resources/dv.icns;
refType = 2; refType = 2;
sourceTree = SOURCE_ROOT;
}; };
8E445F9004728A700059A3A7 = { 8E445F9004728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference; isa = PBXFileReference;
name = m3u.icns; name = m3u.icns;
path = Resources/m3u.icns; path = Resources/m3u.icns;
refType = 2; refType = 2;
sourceTree = SOURCE_ROOT;
}; };
8E445F9104728A700059A3A7 = { 8E445F9104728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference; isa = PBXFileReference;
name = mov.icns; name = mov.icns;
path = Resources/mov.icns; path = Resources/mov.icns;
refType = 2; refType = 2;
sourceTree = SOURCE_ROOT;
}; };
8E445F9204728A700059A3A7 = { 8E445F9204728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference; isa = PBXFileReference;
name = mp3.icns; name = mp3.icns;
path = Resources/mp3.icns; path = Resources/mp3.icns;
refType = 2; refType = 2;
sourceTree = SOURCE_ROOT;
}; };
8E445F9304728A700059A3A7 = { 8E445F9304728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference; isa = PBXFileReference;
name = mp4.icns; name = mp4.icns;
path = Resources/mp4.icns; path = Resources/mp4.icns;
refType = 2; refType = 2;
sourceTree = SOURCE_ROOT;
}; };
8E445F9404728A700059A3A7 = { 8E445F9404728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference; isa = PBXFileReference;
name = mpg.icns; name = mpg.icns;
path = Resources/mpg.icns; path = Resources/mpg.icns;
refType = 2; refType = 2;
sourceTree = SOURCE_ROOT;
}; };
8E445F9504728A700059A3A7 = { 8E445F9504728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference; isa = PBXFileReference;
name = ogg.icns; name = ogg.icns;
path = Resources/ogg.icns; path = Resources/ogg.icns;
refType = 2; refType = 2;
sourceTree = SOURCE_ROOT;
}; };
8E445F9604728A700059A3A7 = { 8E445F9604728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference; isa = PBXFileReference;
name = ogm.icns; name = ogm.icns;
path = Resources/ogm.icns; path = Resources/ogm.icns;
refType = 2; refType = 2;
sourceTree = SOURCE_ROOT;
}; };
8E445F9704728A700059A3A7 = { 8E445F9704728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference; isa = PBXFileReference;
name = pls.icns; name = pls.icns;
path = Resources/pls.icns; path = Resources/pls.icns;
refType = 2; refType = 2;
sourceTree = SOURCE_ROOT;
}; };
8E445F9804728A700059A3A7 = { 8E445F9804728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference; isa = PBXFileReference;
name = srt.icns; name = srt.icns;
path = Resources/srt.icns; path = Resources/srt.icns;
refType = 2; refType = 2;
sourceTree = SOURCE_ROOT;
}; };
8E445F9904728A700059A3A7 = { 8E445F9904728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference; isa = PBXFileReference;
name = sub.icns; name = sub.icns;
path = Resources/sub.icns; path = Resources/sub.icns;
refType = 2; refType = 2;
sourceTree = SOURCE_ROOT;
}; };
8E445F9A04728A700059A3A7 = { 8E445F9A04728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference; isa = PBXFileReference;
name = vob.icns; name = vob.icns;
path = Resources/vob.icns; path = Resources/vob.icns;
refType = 2; refType = 2;
sourceTree = SOURCE_ROOT;
}; };
8E445F9B04728A700059A3A7 = { 8E445F9B04728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference; isa = PBXFileReference;
name = wma.icns; name = wma.icns;
path = Resources/wma.icns; path = Resources/wma.icns;
refType = 2; refType = 2;
sourceTree = SOURCE_ROOT;
}; };
8E445F9C04728A700059A3A7 = { 8E445F9C04728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference; isa = PBXFileReference;
name = wmv.icns; name = wmv.icns;
path = Resources/wmv.icns; path = Resources/wmv.icns;
refType = 2; refType = 2;
sourceTree = SOURCE_ROOT;
}; };
8E445F9D04728A700059A3A7 = { 8E445F9D04728A700059A3A7 = {
fileRef = 8E445F8704728A700059A3A7; fileRef = 8E445F8704728A700059A3A7;
...@@ -1085,45 +1159,57 @@ ...@@ -1085,45 +1159,57 @@
};