Skip to content

GitLab

Commit 03d18c98 authored by hartman's avatar hartman
Browse files
Options

* 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
Hide whitespace changes
Inline Side-by-side
Showing with 204 additions and 10 deletions
Makefile.am
View file @ 03d18c98
......@@ -453,7 +453,7 @@ VLC.app: vlc
cp "$(srcdir)/modules/gui/macosx/$$i" \
$(top_builddir)/tmp/modules/gui/macosx; \
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 \
$(top_builddir)/VLC.app
rm -Rf $(top_builddir)/tmp
......
extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
View file @ 03d18c98
......@@ -144,6 +144,7 @@
"o_mi_subtitle" = id;
"o_mi_title" = id;
"o_mi_videotrack" = id;
"o_mi_visual" = id;
"o_mi_vol_down" = id;
"o_mi_vol_up" = id;
"o_mi_website" = id;
......@@ -165,6 +166,7 @@
"o_mu_title" = id;
"o_mu_video" = id;
"o_mu_videotrack" = id;
"o_mu_visual" = id;
"o_mu_window" = id;
"o_playlist" = id;
"o_prefs" = id;
......
extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
View file @ 03d18c98
......@@ -3,25 +3,29 @@
<plist version="1.0">
<dict>
<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>
<dict>
<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>
<string>60 509 104 114 0 0 1280 1002 </string>
<string>259 604 104 118 0 0 1280 1002 </string>
<key>909</key>
<string>72 297 430 172 0 0 1152 746 </string>
<key>915</key>
<string>439 657 93 96 0 0 1280 1002 </string>
<string>439 657 93 99 0 0 1280 1002 </string>
</dict>
<key>IBFramework Version</key>
<string>291.0</string>
<string>349.0</string>
<key>IBLockedObjects</key>
<array>
<integer>977</integer>
</array>
<key>IBOpenObjects</key>
<array>
<integer>29</integer>
</array>
<key>IBSystem Version</key>
<string>6R73</string>
<string>7B85</string>
</dict>
</plist>
extras/MacOSX/vlc.pbproj/project.pbxproj
View file @ 03d18c98
......@@ -3,19 +3,27 @@
archiveVersion = 1;
classes = {
};
objectVersion = 38;
objectVersion = 39;
objects = {
014CEA410018CDE011CA2923 = {
expectedFileType = wrapper.cfbundle;
fallbackIsa = PBXFileReference;
isa = PBXBundleReference;
path = VLC.bundle;
refType = 3;
sourceTree = BUILT_PRODUCTS_DIR;
};
014CEA420018CDE011CA2923 = {
buildRules = (
);
buildSettings = {
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";
ZERO_LINK = YES;
};
isa = PBXBuildStyle;
name = Development;
......@@ -25,6 +33,8 @@
);
buildSettings = {
COPY_PHASE_STRIP = YES;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
ZERO_LINK = NO;
};
isa = PBXBuildStyle;
name = Deployment;
......@@ -40,6 +50,8 @@
//083
//084
089C1669FE841209C02AAC07 = {
buildSettings = {
};
buildStyles = (
014CEA420018CDE011CA2923,
014CEA430018CDE011CA2923,
......@@ -62,6 +74,7 @@
isa = PBXGroup;
name = vlc;
refType = 4;
sourceTree = "<group>";
};
089C1671FE841209C02AAC07 = {
children = (
......@@ -71,12 +84,16 @@
isa = PBXGroup;
name = "Frameworks and Libraries";
refType = 4;
sourceTree = "<group>";
};
089C1672FE841209C02AAC07 = {
expectedFileType = wrapper.framework;
fallbackIsa = PBXFileReference;
isa = PBXFrameworkReference;
name = Foundation.framework;
path = /System/Library/Frameworks/Foundation.framework;
refType = 0;
sourceTree = "<absolute>";
};
089C1673FE841209C02AAC07 = {
buildPhases = (
......@@ -88,6 +105,7 @@
FRAMEWORK_SEARCH_PATHS = "";
HEADER_SEARCH_PATHS = "";
INSTALL_PATH = "$(HOME)/Library/Bundles";
JAVAC_SOURCE_FILE_ENCODING = "ISO-8859-1";
LIBRARY_SEARCH_PATHS = "";
OTHER_CFLAGS = "";
OTHER_LDFLAGS = "";
......@@ -678,12 +696,16 @@
name = Resources;
path = "";
refType = 4;
sourceTree = "<group>";
};
089C167FFE841241C02AAC07 = {
expectedFileType = wrapper.framework;
fallbackIsa = PBXFileReference;
isa = PBXFrameworkReference;
name = AppKit.framework;
path = /System/Library/Frameworks/AppKit.framework;
refType = 0;
sourceTree = "<absolute>";
};
08FB77AFFE84173DC02AAC07 = {
children = (
......@@ -715,6 +737,7 @@
isa = PBXGroup;
name = Classes;
refType = 4;
sourceTree = "<group>";
};
//080
//081
......@@ -733,12 +756,16 @@
isa = PBXGroup;
name = "Linked Frameworks";
refType = 4;
sourceTree = "<group>";
};
1058C7ADFEA557BF11CA2CBB = {
expectedFileType = wrapper.framework;
fallbackIsa = PBXFileReference;
isa = PBXFrameworkReference;
name = Cocoa.framework;
path = /System/Library/Frameworks/Cocoa.framework;
refType = 0;
sourceTree = "<absolute>";
};
1058C7AEFEA557BF11CA2CBB = {
children = (
......@@ -748,6 +775,7 @@
isa = PBXGroup;
name = "Other Frameworks";
refType = 4;
sourceTree = "<group>";
};
1058C7AFFEA557BF11CA2CBB = {
fileRef = 1058C7ADFEA557BF11CA2CBB;
......@@ -772,6 +800,7 @@
isa = PBXGroup;
name = Products;
refType = 4;
sourceTree = "<group>";
};
//190
//191
......@@ -819,138 +848,183 @@
name = fileicons;
path = "";
refType = 4;
sourceTree = "<group>";
};
8E445F8704728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference;
name = a52.icns;
path = Resources/a52.icns;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E445F8804728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference;
name = aac.icns;
path = Resources/aac.icns;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E445F8904728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference;
name = asf.icns;
path = Resources/asf.icns;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E445F8A04728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference;
name = asx.icns;
path = Resources/asx.icns;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E445F8B04728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference;
name = avi.icns;
path = Resources/avi.icns;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E445F8C04728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference;
name = bin.icns;
path = Resources/bin.icns;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E445F8D04728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference;
name = cue.icns;
path = Resources/cue.icns;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E445F8E04728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference;
name = dat.icns;
path = Resources/dat.icns;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E445F8F04728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference;
name = dv.icns;
path = Resources/dv.icns;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E445F9004728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference;
name = m3u.icns;
path = Resources/m3u.icns;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E445F9104728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference;
name = mov.icns;
path = Resources/mov.icns;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E445F9204728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference;
name = mp3.icns;
path = Resources/mp3.icns;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E445F9304728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference;
name = mp4.icns;
path = Resources/mp4.icns;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E445F9404728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference;
name = mpg.icns;
path = Resources/mpg.icns;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E445F9504728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference;
name = ogg.icns;
path = Resources/ogg.icns;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E445F9604728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference;
name = ogm.icns;
path = Resources/ogm.icns;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E445F9704728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference;
name = pls.icns;
path = Resources/pls.icns;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E445F9804728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference;
name = srt.icns;
path = Resources/srt.icns;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E445F9904728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference;
name = sub.icns;
path = Resources/sub.icns;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E445F9A04728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference;
name = vob.icns;
path = Resources/vob.icns;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E445F9B04728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference;
name = wma.icns;
path = Resources/wma.icns;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E445F9C04728A700059A3A7 = {
expectedFileType = image.icns;
isa = PBXFileReference;
name = wmv.icns;
path = Resources/wmv.icns;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E445F9D04728A700059A3A7 = {
fileRef = 8E445F8704728A700059A3A7;
......@@ -1085,45 +1159,57 @@
};
};
8E55FB7F0459B0FD00FB3317 = {
expectedFileType = sourcecode.c.h;
fileEncoding = 30;
isa = PBXFileReference;
name = output.h;
path = ../../modules/gui/macosx/output.h;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E55FB800459B0FD00FB3317 = {
expectedFileType = sourcecode.c.objc;
fileEncoding = 30;
isa = PBXFileReference;
name = output.m;
path = ../../modules/gui/macosx/output.m;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E6BC6F6041643860059A3A7 = {
expectedFileType = sourcecode.c.h;
fileEncoding = 4;
isa = PBXFileReference;
name = applescript.h;
path = ../../modules/gui/macosx/applescript.h;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E6BC6F7041643860059A3A7 = {
expectedFileType = sourcecode.c.objc;
fileEncoding = 4;
isa = PBXFileReference;
name = applescript.m;
path = ../../modules/gui/macosx/applescript.m;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E6BC6FA041684EC0059A3A7 = {
expectedFileType = sourcecode.c.h;
fileEncoding = 4;
isa = PBXFileReference;
name = controls.h;
path = ../../modules/gui/macosx/controls.h;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E88833C03DD6E870059A3A7 = {
expectedFileType = image.png;
isa = PBXFileReference;
name = slow.png;
path = Resources/slow.png;
refType = 4;
sourceTree = "<group>";
};
8E88833D03DD6E870059A3A7 = {
fileRef = 8E88833C03DD6E870059A3A7;
......@@ -1132,11 +1218,13 @@
};
};
8E9CC7B1046EFD700059A3A7 = {
expectedFileType = text;
fileEncoding = 12;
isa = PBXFileReference;
name = THANKS;
path = ../../THANKS;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E9CC7B2046EFD700059A3A7 = {
fileRef = 8E9CC7B1046EFD700059A3A7;
......@@ -1145,10 +1233,12 @@
};
};
8EBF3FA303F13FFB0059A3A7 = {
expectedFileType = text;
isa = PBXFileReference;
name = vlc.scriptSuite;
path = Resources/vlc.scriptSuite;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8EBF3FA403F13FFB0059A3A7 = {
fileRef = 8EBF3FA303F13FFB0059A3A7;
......@@ -1157,10 +1247,12 @@
};
};
8EBF3FA503F140960059A3A7 = {
expectedFileType = text;
isa = PBXFileReference;
name = vlc.scriptTerminology;
path = Resources/English.lproj/vlc.scriptTerminology;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8EBF3FA703F140A80059A3A7 = {
children = (
......@@ -1169,6 +1261,7 @@
isa = PBXVariantGroup;
name = vlc.scriptTerminology;
refType = 4;
sourceTree = "<group>";
};
8EBF3FA803F140A80059A3A7 = {
fileRef = 8EBF3FA703F140A80059A3A7;
......@@ -1177,123 +1270,157 @@
};
};
8ED6C27A03E2EB1C0059A3A7 = {
expectedFileType = sourcecode.c.c;
fileEncoding = 30;
isa = PBXFileReference;
name = coreaudio.c;
path = ../../modules/audio_output/coreaudio.c;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8ED6C27B03E2EB1C0059A3A7 = {
expectedFileType = sourcecode.c.objc;
fileEncoding = 30;
isa = PBXFileReference;
name = controls.m;
path = ../../modules/gui/macosx/controls.m;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8ED6C27C03E2EB1C0059A3A7 = {
expectedFileType = sourcecode.c.h;
fileEncoding = 30;
isa = PBXFileReference;
name = intf.h;
path = ../../modules/gui/macosx/intf.h;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8ED6C27D03E2EB1C0059A3A7 = {
expectedFileType = sourcecode.c.objc;
fileEncoding = 30;
isa = PBXFileReference;
name = intf.m;
path = ../../modules/gui/macosx/intf.m;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8ED6C27E03E2EB1C0059A3A7 = {
expectedFileType = sourcecode.c.objc;
fileEncoding = 30;
isa = PBXFileReference;
name = macosx.m;
path = ../../modules/gui/macosx/macosx.m;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8ED6C27F03E2EB1C0059A3A7 = {
expectedFileType = sourcecode.c.h;
fileEncoding = 30;
isa = PBXFileReference;
name = misc.h;
path = ../../modules/gui/macosx/misc.h;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8ED6C28003E2EB1C0059A3A7 = {
expectedFileType = sourcecode.c.objc;
fileEncoding = 30;
isa = PBXFileReference;
name = misc.m;
path = ../../modules/gui/macosx/misc.m;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8ED6C28103E2EB1C0059A3A7 = {
expectedFileType = sourcecode.c.h;
fileEncoding = 30;
isa = PBXFileReference;
name = open.h;
path = ../../modules/gui/macosx/open.h;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8ED6C28203E2EB1C0059A3A7 = {
expectedFileType = sourcecode.c.objc;
fileEncoding = 30;
isa = PBXFileReference;
name = open.m;
path = ../../modules/gui/macosx/open.m;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8ED6C28303E2EB1C0059A3A7 = {
expectedFileType = sourcecode.c.h;
fileEncoding = 30;
isa = PBXFileReference;
name = playlist.h;
path = ../../modules/gui/macosx/playlist.h;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8ED6C28403E2EB1C0059A3A7 = {
expectedFileType = sourcecode.c.objc;
fileEncoding = 30;
isa = PBXFileReference;
name = playlist.m;
path = ../../modules/gui/macosx/playlist.m;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8ED6C28503E2EB1C0059A3A7 = {
expectedFileType = sourcecode.c.h;
fileEncoding = 30;
isa = PBXFileReference;
name = prefs.h;
path = ../../modules/gui/macosx/prefs.h;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8ED6C28603E2EB1C0059A3A7 = {
expectedFileType = sourcecode.c.objc;
fileEncoding = 30;
isa = PBXFileReference;
name = prefs.m;
path = ../../modules/gui/macosx/prefs.m;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8ED6C28703E2EB1C0059A3A7 = {
expectedFileType = sourcecode.c.h;