diff options
author | Thierry Crozat | 2016-03-25 20:26:01 +0000 |
---|---|---|
committer | Thierry Crozat | 2016-03-25 20:26:01 +0000 |
commit | e917971681edc7f5e8f3f6158646eac9e22fb81d (patch) | |
tree | 7ff9979dcd08ba02c3a3aa886110ca4451317da1 /ports.mk | |
parent | 50f9f19927f6f2587966d63226d4c5170c91db12 (diff) | |
download | scummvm-rg350-e917971681edc7f5e8f3f6158646eac9e22fb81d.tar.gz scummvm-rg350-e917971681edc7f5e8f3f6158646eac9e22fb81d.tar.bz2 scummvm-rg350-e917971681edc7f5e8f3f6158646eac9e22fb81d.zip |
OS X: Clean taskbar code
This involves moving the NSDockTilePlugIn code to backend/taskbar
and fixing style to follow our coding conventions. One make target
was also renamed. All in all there is no change in functionality with this
commit.
Diffstat (limited to 'ports.mk')
-rw-r--r-- | ports.mk | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -60,13 +60,13 @@ ifdef USE_DOCKTILEPLUGIN # Therefore do not use $(CXXFLAGS) and $(LDFLAGS). ScummVMDockTilePlugin32.o: - $(CXX) -mmacosx-version-min=10.6 -arch i386 -O2 -c $(srcdir)/dists/macosx/dockplugin/dockplugin.m -o ScummVMDockTilePlugin32.o + $(CXX) -mmacosx-version-min=10.6 -arch i386 -O2 -c $(srcdir)/backends/taskbar/macosx/dockplugin/dockplugin.m -o ScummVMDockTilePlugin32.o ScummVMDockTilePlugin32: ScummVMDockTilePlugin32.o $(CXX) -mmacosx-version-min=10.6 -arch i386 -bundle -framework Foundation -framework AppKit -fobjc-link-runtime ScummVMDockTilePlugin32.o -o ScummVMDockTilePlugin32 ScummVMDockTilePlugin64.o: - $(CXX) -mmacosx-version-min=10.6 -arch x86_64 -O2 -c $(srcdir)/dists/macosx/dockplugin/dockplugin.m -o ScummVMDockTilePlugin64.o + $(CXX) -mmacosx-version-min=10.6 -arch x86_64 -O2 -c $(srcdir)/backends/taskbar/macosx/dockplugin/dockplugin.m -o ScummVMDockTilePlugin64.o ScummVMDockTilePlugin64: ScummVMDockTilePlugin64.o $(CXX) -mmacosx-version-min=10.6 -arch x86_64 -bundle -framework Foundation -framework AppKit -fobjc-link-runtime ScummVMDockTilePlugin64.o -o ScummVMDockTilePlugin64 @@ -74,7 +74,7 @@ ScummVMDockTilePlugin64: ScummVMDockTilePlugin64.o ScummVMDockTilePlugin: ScummVMDockTilePlugin32 ScummVMDockTilePlugin64 lipo -create ScummVMDockTilePlugin32 ScummVMDockTilePlugin64 -output ScummVMDockTilePlugin -dockplugin: ScummVMDockTilePlugin +scummvm.docktileplugin: ScummVMDockTilePlugin mkdir -p scummvm.docktileplugin/Contents cp $(srcdir)/dists/macosx/dockplugin/Info.plist scummvm.docktileplugin/Contents mkdir -p scummvm.docktileplugin/Contents/MacOS @@ -86,7 +86,7 @@ endif bundle_name = ScummVM.app ifdef USE_DOCKTILEPLUGIN -bundle: scummvm-static dockplugin +bundle: scummvm-static scummvm.docktileplugin else bundle: scummvm-static endif |