From a6d0408f1eabef2f07f7796bba55fc78513d183d Mon Sep 17 00:00:00 2001 From: Vadim Grigoruk Date: Tue, 4 Sep 2018 18:23:27 +0300 Subject: [PATCH] macos bundle fix --- CMakeLists.txt | 4 +++ build/macosx/makefile | 37 ----------------------- build/macosx/{Info.plist => tic80.plist} | 0 build/macosx/tic80Icon.png | Bin 17374 -> 0 bytes build/macosx/tic80pro.plist | 30 ++++++++++++++++++ 5 files changed, 34 insertions(+), 37 deletions(-) delete mode 100644 build/macosx/makefile rename build/macosx/{Info.plist => tic80.plist} (100%) delete mode 100644 build/macosx/tic80Icon.png create mode 100644 build/macosx/tic80pro.plist diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c13d92..bc32bd3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -428,6 +428,10 @@ foreach(TIC80_OUTPUT ${TIC80_OUTPUTS}) if(WIN32) set(TIC80_SRC ${TIC80_SRC} build/windows/tic80.rc) add_executable(${TIC80_OUTPUT} WIN32 ${TIC80_SRC}) + elseif(APPLE) + add_executable(${TIC80_OUTPUT} MACOSX_BUNDLE ${TIC80_SRC} build/macosx/tic80.icns) + set_source_files_properties(build/macosx/tic80.icns PROPERTIES MACOSX_PACKAGE_LOCATION RESOURCES) + set_target_properties(${TIC80_OUTPUT} PROPERTIES MACOSX_BUNDLE_INFO_PLIST build/macosx/${TIC80_OUTPUT}.plist) else() add_executable(${TIC80_OUTPUT} ${TIC80_SRC}) endif() diff --git a/build/macosx/makefile b/build/macosx/makefile deleted file mode 100644 index 758466f..0000000 --- a/build/macosx/makefile +++ /dev/null @@ -1,37 +0,0 @@ -APPNAME=tic80 -APPBUNDLE=$(APPNAME).app -APPBUNDLECONTENTS=$(APPBUNDLE)/Contents -APPBUNDLEEXE=$(APPBUNDLECONTENTS)/MacOS -APPBUNDLEICON=$(APPBUNDLECONTENTS)/Resources - -all: dmg - -dmg: appbundle - hdiutil create -volname $(APPNAME) -srcfolder $(APPNAME).app -ov -format UDZO $(APPNAME).dmg - -appbundle: $(APPNAME).icns - rm -rf $(APPBUNDLE) - mkdir $(APPBUNDLE) - mkdir $(APPBUNDLE)/Contents - mkdir $(APPBUNDLE)/Contents/MacOS - mkdir $(APPBUNDLE)/Contents/Resources - cp Info.plist $(APPBUNDLECONTENTS)/ - echo "APPL????" > $(APPBUNDLECONTENTS)/PkgInfo - cp $(APPNAME).icns $(APPBUNDLEICON)/ - cp ../../bin/$(APPNAME) $(APPBUNDLEEXE)/$(APPNAME) - -$(APPNAME).icns: $(APPNAME)Icon.png - rm -rf $(APPNAME).iconset - mkdir $(APPNAME).iconset - sips -z 16 16 $(APPNAME)Icon.png --out $(APPNAME).iconset/icon_16x16.png - sips -z 32 32 $(APPNAME)Icon.png --out $(APPNAME).iconset/icon_16x16@2x.png - sips -z 32 32 $(APPNAME)Icon.png --out $(APPNAME).iconset/icon_32x32.png - sips -z 64 64 $(APPNAME)Icon.png --out $(APPNAME).iconset/icon_32x32@2x.png - sips -z 128 128 $(APPNAME)Icon.png --out $(APPNAME).iconset/icon_128x128.png - sips -z 256 256 $(APPNAME)Icon.png --out $(APPNAME).iconset/icon_128x128@2x.png - sips -z 256 256 $(APPNAME)Icon.png --out $(APPNAME).iconset/icon_256x256.png - sips -z 512 512 $(APPNAME)Icon.png --out $(APPNAME).iconset/icon_256x256@2x.png - sips -z 512 512 $(APPNAME)Icon.png --out $(APPNAME).iconset/icon_512x512.png - cp $(APPNAME)Icon.png $(APPNAME).iconset/icon_512x512@2x.png - iconutil -c icns -o $(APPNAME).icns $(APPNAME).iconset - rm -r $(APPNAME).iconset \ No newline at end of file diff --git a/build/macosx/Info.plist b/build/macosx/tic80.plist similarity index 100% rename from build/macosx/Info.plist rename to build/macosx/tic80.plist diff --git a/build/macosx/tic80Icon.png b/build/macosx/tic80Icon.png deleted file mode 100644 index 0d6f30dc62db2a246bd903c25e4c525d472115af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17374 zcmeI4Yit}x9l$4XUKj;jsGv|}R%caeMc4bdyWQL6e16=;u~p8sF0SGTrOn>%oW11k z_PV>yoeij_?T3OYN~?;XGzu*$J0u)55Ds@p(q@t2Gt&u3Q@~F-1 zJ?7r0ab+St%t`kBJ@bFfZ~p(8{j&c4h}vk4qIdJ_O&cg?A3cRKzJRkt$znqehje<71Y+5m(H3pq_c2wf%# zXUyz?Z~4?KKE^Z#e0zg&KAwxhS#xZ`hI7AI)pOm zYn6oKCSa8lfh(lm(h*us=ZsoK&&^t{<;+@bO!0IPMk@!dnQD{0H`CS(7R)wg-b~4? zSW~5~4ja0fvh0lJM$C*h1G!vwCd^d_t3?qmZmN2xZK6ie(lJY)^NL_R7C{sJhH0p> zmXbwY46>pjYOJIOG*(H81}lg{QWW%1kPpdWuC1GHFUEhtiI*vZQNG0|wTL77|knpwlj zJGX_oR%X@oafGsaeOAlPKqJCc3@ZceP4cra8$ri{#0uz42u%rs8j#eW{52jO4t&K= zQLDWZGwZloR)^&+GQBNQQc6-z1zCS6rLm$Akl2u4QrJ|$uS-Ts_CwxZ@m^!zK8B`y z=SalS4nd=0SRQLM3Ul6RlQuVU=hhLvy4^Jk^Ges_0u`wElR+9UW|ChRKy>q3}`c|y8cXR8OkB{-@ znj~XiIyP#|tL)3JTbxLvvOgdTetDD^V}h_NpbU$#m@qOr>{mtu{^4jP-5S$ox6n3G zagW+ohVX1bZI7-JwWdyRnaNP$Q+|P!Q?krzfdFKcfFQHUkSrNNNeD@SkXL36=GB}^ z1?Ei~)$_OX=z#`MA>(^R4Fz;X4~eL^c~NEs0S4HlA_rJQ5%r`2m6Q&PCEehx8Vkdz z0;p+S54svh&pL+YYB9})-f`8g+M9H1qIh#r8zK)CFA{nRVnumM@T)>V4JwsGuR*iH zN8B>Z)O^K9$4si44L*u_SoV}K2K~V>*Erm0F=-ZHdOBvJXAQ@@X@UX@RWxdxX=%Byt!2$j*|Kz? z)jS>-%e^#;9=_3YKZhUuYdQg6_Zu%%m$dP|u}2yNqaYC|E)q&uhvLF0NCb+Dgc8=F zxG)M5f#M>egmow`jDkd3f<&OWNGM?)iVLG45hyMaN?3>D!YD`tii?C2)}gpC3KD_hBB6wJC@zeGM4-4x zC}ACn3!@+rC@vC8Scl@mC`bf~i-Z!^p|~`p3(p@elPE{uXiptwjVVI7JKqaYC| zE)q&uhvLF0NCb+Dgc8=FxG)M5f#M>egmow`jDkeyh^xE$DlN>S_h<9yMcL1sz4API z$(GT_5^(?)ZUJEN0RS$qq3??T%<%xccK`tOCjflWdhDLpMgiFV&UkEis<3qF+;j0) zhi+Wd9)5Q0{jI*2KHB`H-+qq0c`}hW^~|C1KWsA}4d1_g>?AY4_?MG@|I-WV%gf(< z`%kB$m;ZC*yBB`y`*?M~J_r_Xjlc8v{cruEclCvp?cU46Jt#2BXA4RReQg3@2LMAz z>O8d`^+yh7SN?cx9{lRn!+XKg?y(DJ*S3xJo7#u=oU{teyQuk>UX}qb?BkhfBd=Uy2U+$ z;)c#F-@U0Pc~pu%bbNR3>ec-5>$U2o8~c9$f%}z_Gxxml<}D}g``2oweSvM?ex7hz#puKPkSp!@hbAb?e~76L;j+dVc;~=i05auFqqgTiu&@ zn0fKurI9mh*Fq;A{N2iD&vjf?Q|k4>*OAxIT|c;?$3)!<67MaYNB_m4>2#?Ucn7zg zr>ZW>-oLfyXM=BF`S%B30Gn?|1txu>I|2D(5T$jHKHYcZt&g9d={hr^V-diUw&lyIxha~-#$G2PwU+Nu1D9p&JUg+yy4_;UhG_G>sVubX*4#*;?gzL d#cOL_;Em|?{7v!2-H0F<-!&0?cI3eQ{{;h@hb903 diff --git a/build/macosx/tic80pro.plist b/build/macosx/tic80pro.plist new file mode 100644 index 0000000..ae2aeb3 --- /dev/null +++ b/build/macosx/tic80pro.plist @@ -0,0 +1,30 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleDisplayName + TIC-80 Pro + CFBundleExecutable + tic80pro + CFBundleIconFile + tic80.icns + CFBundleIdentifier + com.nesbox.tic + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + TIC-80 Pro + CFBundlePackageType + APPL + CFBundleShortVersionString + 0.70.6 + CFBundleVersion + 0.70.6 + NSHumanReadableCopyright + http://tic.computer © 2017 + NSHighResolutionCapable + + +