diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e4d08049..cc0fd34b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -88,7 +88,7 @@ jobs: - name: Import Code Signing Certificate if: github.ref_name == 'main' run: | - misc/ci-macos-import-codesign-cert.sh + misc/macos/ci-macos-import-codesign-cert.sh echo "APPLE_CERTIFICATE_ID=${{ secrets.APPLE_CERTIFICATE_ID }}" >> $GITHUB_ENV env: APPLE_CERTIFICATE_P12_BASE64: ${{ secrets.APPLE_CERTIFICATE_P12_BASE64 }} @@ -117,7 +117,7 @@ jobs: - name: Notarize if: github.ref_name == 'main' run: | - misc/ci-macos-notarize.sh build/Release/*.dmg + misc/macos/ci-macos-notarize.sh build/Release/*.dmg env: APPLE_NOTARIZATION_USERNAME: ${{ secrets.APPLE_NOTARIZATION_USERNAME }} APPLE_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }} diff --git a/cmake/identity.cmake b/cmake/identity.cmake index 2161dbaf..e90934c7 100644 --- a/cmake/identity.cmake +++ b/cmake/identity.cmake @@ -10,9 +10,9 @@ set(CGAME_MODULE cgame) set(GAME_MODULE qagame) set(UI_MODULE ui) -set(WINDOWS_ICON_PATH ${CMAKE_SOURCE_DIR}/misc/quake3.ico) +set(WINDOWS_ICON_PATH ${CMAKE_SOURCE_DIR}/misc/windows/quake3.ico) -set(MACOS_ICON_PATH ${CMAKE_SOURCE_DIR}/misc/quake3_flat.icns) +set(MACOS_ICON_PATH ${CMAKE_SOURCE_DIR}/misc/macos/quake3_flat.icns) set(MACOS_BUNDLE_ID org.ioquake.${CLIENT_NAME}) set(COPYRIGHT "QUAKE III ARENA Copyright © 1999-2000 id Software, Inc. All rights reserved.") diff --git a/cmake/platforms/macos.cmake b/cmake/platforms/macos.cmake index b485328c..8b839b7e 100644 --- a/cmake/platforms/macos.cmake +++ b/cmake/platforms/macos.cmake @@ -105,11 +105,11 @@ endif() set(CPACK_GENERATOR "DragNDrop") set(CPACK_DMG_VOLUME_NAME "${PROJECT_NAME} Installer") -set(CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/misc/macos-dmg-background.png") +set(CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/misc/macos/macos-dmg-background.png") set(CPACK_DMG_SUBDIRECTORY "${CLIENT_NAME}") configure_file( - "${CMAKE_SOURCE_DIR}/misc/macos-dmg-setup.applescript.in" + "${CMAKE_SOURCE_DIR}/misc/macos/macos-dmg-setup.applescript.in" "${CMAKE_BINARY_DIR}/macos-dmg-setup.applescript" @ONLY ) diff --git a/misc/ReadMe-OSX.rtf b/misc/ReadMe-OSX.rtf deleted file mode 100644 index c673741e..00000000 --- a/misc/ReadMe-OSX.rtf +++ /dev/null @@ -1,29 +0,0 @@ -{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf430 -{\fonttbl\f0\fswiss\fcharset0 ArialMT;} -{\colortbl;\red255\green255\blue255;} -\paperw11905\paperh16837\margl1440\margr1440\vieww11380\viewh12260\viewkind0 -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural - -\f0\b\fs24 \cf0 Welcome to ioquake3.\ -\ -You can find us on the web at:\ -http://www.ioquake3.org/\ -This is the 1.36 release for Mac OS X.\ -If you run into any issues, please check out our website's discussion page for a place to talk about them and get help.\ -http://ioquake3.org/discussion/\ -\ -To install, simply copy the ioquake3 folder to your applications directory, then copy the pak0.pk3 file\ -from your legal Quake 3 Arena CDROM into the baseq3 sub-folder.\ -You can also copy it over from a boot camp'd steam install or whatever. \ -Just make sure to get your cd key as well.\ -\ -If you don't have Quake 3, check out some of the excellent games made with ioquake3:\ -http://ioquake3.org/extras/derivative-games/\ -\ -On ioquake3.org you can also find links to the latest source for this release, packages for other platforms, and more.\ -I hope to see you on server.ioquake3.org soon!\ --\ -Thanks,\ -Zachary Slater\ -zachary@ioquake.org\ -} \ No newline at end of file diff --git a/misc/setup/org.ioquake3.ioquake3.metainfo.xml b/misc/linux/org.ioquake3.ioquake3.metainfo.xml similarity index 100% rename from misc/setup/org.ioquake3.ioquake3.metainfo.xml rename to misc/linux/org.ioquake3.ioquake3.metainfo.xml diff --git a/misc/quake3-tango.png b/misc/linux/quake3-tango.png similarity index 100% rename from misc/quake3-tango.png rename to misc/linux/quake3-tango.png diff --git a/misc/quake3-tango.xcf b/misc/linux/quake3-tango.xcf similarity index 100% rename from misc/quake3-tango.xcf rename to misc/linux/quake3-tango.xcf diff --git a/misc/build-macos-sdl.sh b/misc/macos/build-macos-sdl.sh similarity index 100% rename from misc/build-macos-sdl.sh rename to misc/macos/build-macos-sdl.sh diff --git a/misc/ci-macos-import-codesign-cert.sh b/misc/macos/ci-macos-import-codesign-cert.sh similarity index 100% rename from misc/ci-macos-import-codesign-cert.sh rename to misc/macos/ci-macos-import-codesign-cert.sh diff --git a/misc/ci-macos-notarize.sh b/misc/macos/ci-macos-notarize.sh similarity index 100% rename from misc/ci-macos-notarize.sh rename to misc/macos/ci-macos-notarize.sh diff --git a/misc/ioquake3-folder.icns b/misc/macos/ioquake3-folder.icns similarity index 100% rename from misc/ioquake3-folder.icns rename to misc/macos/ioquake3-folder.icns diff --git a/misc/macos-dmg-background.png b/misc/macos/macos-dmg-background.png similarity index 100% rename from misc/macos-dmg-background.png rename to misc/macos/macos-dmg-background.png diff --git a/misc/macos-dmg-setup.applescript.in b/misc/macos/macos-dmg-setup.applescript.in similarity index 100% rename from misc/macos-dmg-setup.applescript.in rename to misc/macos/macos-dmg-setup.applescript.in diff --git a/misc/quake3.icns b/misc/macos/quake3.icns similarity index 100% rename from misc/quake3.icns rename to misc/macos/quake3.icns diff --git a/misc/quake3_flat.icns b/misc/macos/quake3_flat.icns similarity index 100% rename from misc/quake3_flat.icns rename to misc/macos/quake3_flat.icns diff --git a/misc/quake3_flat.iconset/icon_128x128.png b/misc/macos/quake3_flat.iconset/icon_128x128.png similarity index 100% rename from misc/quake3_flat.iconset/icon_128x128.png rename to misc/macos/quake3_flat.iconset/icon_128x128.png diff --git a/misc/quake3_flat.iconset/icon_128x128@2x.png b/misc/macos/quake3_flat.iconset/icon_128x128@2x.png similarity index 100% rename from misc/quake3_flat.iconset/icon_128x128@2x.png rename to misc/macos/quake3_flat.iconset/icon_128x128@2x.png diff --git a/misc/quake3_flat.iconset/icon_16x16.png b/misc/macos/quake3_flat.iconset/icon_16x16.png similarity index 100% rename from misc/quake3_flat.iconset/icon_16x16.png rename to misc/macos/quake3_flat.iconset/icon_16x16.png diff --git a/misc/quake3_flat.iconset/icon_16x16@2x.png b/misc/macos/quake3_flat.iconset/icon_16x16@2x.png similarity index 100% rename from misc/quake3_flat.iconset/icon_16x16@2x.png rename to misc/macos/quake3_flat.iconset/icon_16x16@2x.png diff --git a/misc/quake3_flat.iconset/icon_256x256.png b/misc/macos/quake3_flat.iconset/icon_256x256.png similarity index 100% rename from misc/quake3_flat.iconset/icon_256x256.png rename to misc/macos/quake3_flat.iconset/icon_256x256.png diff --git a/misc/quake3_flat.iconset/icon_256x256@2x.png b/misc/macos/quake3_flat.iconset/icon_256x256@2x.png similarity index 100% rename from misc/quake3_flat.iconset/icon_256x256@2x.png rename to misc/macos/quake3_flat.iconset/icon_256x256@2x.png diff --git a/misc/quake3_flat.iconset/icon_32x32.png b/misc/macos/quake3_flat.iconset/icon_32x32.png similarity index 100% rename from misc/quake3_flat.iconset/icon_32x32.png rename to misc/macos/quake3_flat.iconset/icon_32x32.png diff --git a/misc/quake3_flat.iconset/icon_32x32@2x.png b/misc/macos/quake3_flat.iconset/icon_32x32@2x.png similarity index 100% rename from misc/quake3_flat.iconset/icon_32x32@2x.png rename to misc/macos/quake3_flat.iconset/icon_32x32@2x.png diff --git a/misc/quake3_flat.iconset/icon_512x512.png b/misc/macos/quake3_flat.iconset/icon_512x512.png similarity index 100% rename from misc/quake3_flat.iconset/icon_512x512.png rename to misc/macos/quake3_flat.iconset/icon_512x512.png diff --git a/misc/quake3_flat.iconset/icon_512x512@2x.png b/misc/macos/quake3_flat.iconset/icon_512x512@2x.png similarity index 100% rename from misc/quake3_flat.iconset/icon_512x512@2x.png rename to misc/macos/quake3_flat.iconset/icon_512x512@2x.png diff --git a/misc/osx/start_server.sh b/misc/macos/start_server.sh similarity index 100% rename from misc/osx/start_server.sh rename to misc/macos/start_server.sh diff --git a/misc/quake3.ico b/misc/windows/quake3.ico similarity index 100% rename from misc/quake3.ico rename to misc/windows/quake3.ico