Commit ad730d05 authored by Felix Paul Kühne's avatar Felix Paul Kühne

* whoops

parent 509ed543
...@@ -581,9 +581,9 @@ VLC-release.app: vlc ...@@ -581,9 +581,9 @@ VLC-release.app: vlc
cd ../../../; \ cd ../../../; \
cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \ cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
$(top_builddir)/VLC-release.app;; \ $(top_builddir)/VLC-release.app;; \
*darwin8*) cd $(top_builddir)/tmp/extras/Default/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \ *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
cd ../../../; \ cd ../../../; \
cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \ cp -r $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
$(top_builddir)/VLC-release.app;; \ $(top_builddir)/VLC-release.app;; \
esac esac
rm -Rf $(top_builddir)/tmp rm -Rf $(top_builddir)/tmp
...@@ -695,9 +695,9 @@ VLC.app: vlc ...@@ -695,9 +695,9 @@ VLC.app: vlc
cd ../../../; \ cd ../../../; \
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;; \
*darwin8*) cd $(top_builddir)/tmp/extras/Default/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \ *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
cd ../../../; \ cd ../../../; \
cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \ cp -r $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
$(top_builddir)/VLC.app;; \ $(top_builddir)/VLC.app;; \
esac esac
rm -Rf $(top_builddir)/tmp rm -Rf $(top_builddir)/tmp
......
...@@ -1484,12 +1484,6 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -1484,12 +1484,6 @@ static VLCMain *_o_sharedMainInstance = nil;
- (IBAction)showExtended:(id)sender - (IBAction)showExtended:(id)sender
{ {
/* we need the wizard-nib for the bookmarks's extract functionality */
if (!nib_wizard_loaded)
{
nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner:self];
}
if (!nib_extended_loaded) if (!nib_extended_loaded)
{ {
nib_extended_loaded = [NSBundle loadNibNamed:@"Extended" owner:self]; nib_extended_loaded = [NSBundle loadNibNamed:@"Extended" owner:self];
...@@ -1502,6 +1496,12 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -1502,6 +1496,12 @@ static VLCMain *_o_sharedMainInstance = nil;
- (IBAction)showBookmarks:(id)sender - (IBAction)showBookmarks:(id)sender
{ {
/* we need the wizard-nib for the bookmarks's extract functionality */
if (!nib_wizard_loaded)
{
nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner:self];
}
if (!nib_bookmarks_loaded) if (!nib_bookmarks_loaded)
{ {
nib_bookmarks_loaded = [NSBundle loadNibNamed:@"Bookmarks" owner:self]; nib_bookmarks_loaded = [NSBundle loadNibNamed:@"Bookmarks" owner:self];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment