diff --git a/.github/workflows/build_ios.yml b/.github/workflows/build_ios.yml index f21849eff..e2f75c59e 100644 --- a/.github/workflows/build_ios.yml +++ b/.github/workflows/build_ios.yml @@ -19,7 +19,7 @@ jobs: - name: Compile iOS build id: compile run: | - cd ios + cd misc/ios xcodebuild -sdk iphoneos -configuration Release CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO cd build/Release-iphoneos mkdir Payload diff --git a/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/CC_1024.png b/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/CC_1024.png deleted file mode 100644 index 84ccce9c0..000000000 Binary files a/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/CC_1024.png and /dev/null differ diff --git a/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/CC_120.png b/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/CC_120.png deleted file mode 100644 index 7c1a84ab6..000000000 Binary files a/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/CC_120.png and /dev/null differ diff --git a/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/CC_152.png b/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/CC_152.png deleted file mode 100644 index 6a6c1d6c2..000000000 Binary files a/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/CC_152.png and /dev/null differ diff --git a/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/CC_167.png b/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/CC_167.png deleted file mode 100644 index 03b2a1404..000000000 Binary files a/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/CC_167.png and /dev/null differ diff --git a/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/CC_180.png b/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/CC_180.png deleted file mode 100644 index 68b1c2c25..000000000 Binary files a/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/CC_180.png and /dev/null differ diff --git a/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/CC_40.png b/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/CC_40.png deleted file mode 100644 index 2a92b7c7e..000000000 Binary files a/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/CC_40.png and /dev/null differ diff --git a/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/CC_76.png b/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/CC_76.png deleted file mode 100644 index 11a57d6af..000000000 Binary files a/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/CC_76.png and /dev/null differ diff --git a/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/CC_80.png b/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/CC_80.png deleted file mode 100644 index 327bb4f58..000000000 Binary files a/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/CC_80.png and /dev/null differ diff --git a/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index e0639a4aa..000000000 --- a/ios/ClassiCube/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,108 +0,0 @@ -{ - "images" : [ - { - "idiom" : "iphone", - "size" : "20x20", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "20x20", - "scale" : "3x" - }, - { - "idiom" : "iphone", - "size" : "29x29", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "29x29", - "scale" : "3x" - }, - { - "idiom" : "iphone", - "size" : "40x40", - "filename" : "CC_80.png", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "40x40", - "filename" : "CC_120.png", - "scale" : "3x" - }, - { - "idiom" : "iphone", - "size" : "60x60", - "filename" : "CC_120.png", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "60x60", - "filename" : "CC_180.png", - "scale" : "3x" - }, - { - "idiom" : "ipad", - "size" : "20x20", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "20x20", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "29x29", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "29x29", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "40x40", - "filename" : "CC_40.png", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "40x40", - "filename" : "CC_80.png", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "76x76", - "filename" : "CC_76.png", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "76x76", - "filename" : "CC_152.png", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "83.5x83.5", - "filename" : "CC_167.png", - "scale" : "2x" - }, - { - "size" : "1024x1024", - "idiom" : "ios-marketing", - "filename" : "CC_1024.png", - "scale" : "1x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/ios/ClassiCube/Assets.xcassets/Contents.json b/ios/ClassiCube/Assets.xcassets/Contents.json deleted file mode 100644 index da4a164c9..000000000 --- a/ios/ClassiCube/Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/ios/CCIOS.xcodeproj/project.pbxproj b/misc/ios/CCIOS.xcodeproj/project.pbxproj similarity index 99% rename from ios/CCIOS.xcodeproj/project.pbxproj rename to misc/ios/CCIOS.xcodeproj/project.pbxproj index 233ae0900..1cfaefd9b 100644 --- a/ios/CCIOS.xcodeproj/project.pbxproj +++ b/misc/ios/CCIOS.xcodeproj/project.pbxproj @@ -314,7 +314,7 @@ 9A89D47F27F802F600FF3F80 /* interop_ios.m */, ); name = src; - path = ../src; + path = ../../src; sourceTree = SOURCE_ROOT; }; /* End PBXGroup section */ diff --git a/ios/Info.plist b/misc/ios/Info.plist similarity index 100% rename from ios/Info.plist rename to misc/ios/Info.plist diff --git a/misc/x11/linux/flatpak/net.classicube.flatpak.client.SDL3.json b/misc/x11/linux/flatpak/net.classicube.flatpak.client.SDL3.json deleted file mode 100644 index 5c75fad61..000000000 --- a/misc/x11/linux/flatpak/net.classicube.flatpak.client.SDL3.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "id": "net.classicube.flatpak.client", - "runtime": "org.freedesktop.Platform", - "runtime-version": "23.08", - "sdk": "org.freedesktop.Sdk", - "command": "ClassiCubeLauncher", - "finish-args": [ - "--socket=wayland", - "--socket=fallback-x11", - "--device=dri", - "--share=network", - "--share=ipc", - "--socket=pulseaudio" - ], - "modules": [ - { - "name": "SDL3", - "buildsystem": "cmake-ninja", - "builddir": true, - "sources": [ - { - "type": "git", - "url": "https://github.com/libsdl-org/SDL.git", - "branch": "main" - } - ], - "cleanup": [ - "/bin/sdl3-config", - "/include", - "/lib/libSDL3.la", - "/lib/libSDL3main.a", - "/lib/libSDL3main.la", - "/lib/libSDL3_test.a", - "/lib/libSDL3_test.la", - "/lib/cmake", - "/share/aclocal", - "/lib/pkgconfig" - ], - "modules": [ - { - "name": "libdecor", - "buildsystem": "meson", - "config-opts": [ - "-Ddemo=false" - ], - "sources": [ - { - "type": "git", - "url": "https://gitlab.freedesktop.org/libdecor/libdecor.git" - } - ], - "cleanup": [ - "/include", - "/lib/pkgconfig" - ] - } - ] - }, - { - "name": "ClassiCube", - "buildsystem": "simple", - "build-commands": [ - "gcc -fno-math-errno src/*.c -o src/ClassiCube -rdynamic -lpthread -lGL -DCC_WIN_BACKEND=CC_WIN_BACKEND_SDL3 -DCC_GFX_BACKEND=CC_GFX_BACKEND_GL2 -DCC_BUILD_FLATPAK -L /app/lib -lSDL3", - "install -Dm755 src/ClassiCube -t ${FLATPAK_DEST}/bin", - "install -Dm755 misc/linux/flatpak/ClassiCubeLauncher -t ${FLATPAK_DEST}/bin", - "install -Dm644 misc/linux/flatpak/net.classicube.flatpak.client.svg ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/net.classicube.flatpak.client.svg", - "install -Dm644 misc/linux/flatpak/net.classicube.flatpak.client.desktop ${FLATPAK_DEST}/share/applications/net.classicube.flatpak.client.desktop", - "install -Dm644 misc/linux/flatpak/net.classicube.flatpak.client.metainfo.xml ${FLATPAK_DEST}/share/metainfo/net.classicube.flatpak.client.metainfo.xml" - ], - "sources": [ - { - "type": "git", - "url": "https://github.com/ClassiCube/ClassiCube.git" - } - ] - } - ] -} \ No newline at end of file diff --git a/misc/x11/linux/flatpak/net.classicube.flatpak.client.X11.json b/misc/x11/linux/flatpak/net.classicube.flatpak.client.X11.json deleted file mode 100644 index e064afac8..000000000 --- a/misc/x11/linux/flatpak/net.classicube.flatpak.client.X11.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "id": "net.classicube.flatpak.client", - "runtime": "org.freedesktop.Platform", - "runtime-version": "23.08", - "sdk": "org.freedesktop.Sdk", - "command": "ClassiCubeLauncher", - "finish-args": [ - "--socket=x11", - "--device=dri", - "--share=network", - "--share=ipc", - "--socket=pulseaudio" - ], - "modules": [ - { - "name": "ClassiCube", - "buildsystem": "simple", - "build-commands": [ - "gcc -fno-math-errno src/*.c -o src/ClassiCube -O1 -DCC_BUILD_FLATPAK -DCC_GFX_BACKEND=CC_GFX_BACKEND_GL2 -rdynamic -lm -lpthread -lX11 -lXi -lGL -ldl", - "install -Dm755 src/ClassiCube -t ${FLATPAK_DEST}/bin", - "install -Dm755 misc/linux/flatpak/ClassiCubeLauncher -t ${FLATPAK_DEST}/bin", - "install -Dm644 misc/linux/flatpak/net.classicube.flatpak.client.svg ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/net.classicube.flatpak.client.svg", - "install -Dm644 misc/linux/flatpak/net.classicube.flatpak.client.desktop ${FLATPAK_DEST}/share/applications/net.classicube.flatpak.client.desktop", - "install -Dm644 misc/linux/flatpak/net.classicube.flatpak.client.metainfo.xml ${FLATPAK_DEST}/share/metainfo/net.classicube.flatpak.client.metainfo.xml" - ], - "sources": [ - { - "type": "git", - "url": "https://github.com/ClassiCube/ClassiCube.git" - } - ] - } - ] -} \ No newline at end of file diff --git a/misc/x11/linux/flatpak/net.classicube.flatpak.client.desktop b/misc/x11/linux/flatpak/net.classicube.flatpak.client.desktop deleted file mode 100644 index 11f416da3..000000000 --- a/misc/x11/linux/flatpak/net.classicube.flatpak.client.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=ClassiCube -Exec=ClassiCubeLauncher -Comment=Sandbox building-block game -Type=Application -Icon=net.classicube.flatpak.client -Categories=Game;ActionGame; -Terminal=false -MimeType=x-scheme-handler/mc; -StartupWMClass=net.classicube.flatpak.client \ No newline at end of file diff --git a/misc/x11/linux/flatpak/net.classicube.flatpak.client.metainfo.xml b/misc/x11/linux/flatpak/net.classicube.flatpak.client.metainfo.xml deleted file mode 100644 index 7810cb367..000000000 --- a/misc/x11/linux/flatpak/net.classicube.flatpak.client.metainfo.xml +++ /dev/null @@ -1,133 +0,0 @@ - - - net.classicube.flatpak.client - ClassiCube - Sandbox building-block game - - The ClassiCube Project - - CC0-1.0 - BSD-3-Clause - -

ClassiCube brings you back to the days of 2009 where one block game ruled them all, it includes such features as:

- -
- - - Classic mode features faithful classic gameplay - https://github.com/ClassiCube/ClassiCube/assets/6509348/eedee53f-f53e-456f-b51c-92c62079eee0 - - - Enhanced mode allows hacks like flying and noclipping, it also allows servers to provide many custom features - https://github.com/ClassiCube/ClassiCube/assets/6509348/b2fe0e2b-5d76-41ab-909f-048d0ad15f37 - - - - - https://github.com/ClassiCube/ClassiCube/releases/tag/1.3.6 - - - https://github.com/ClassiCube/ClassiCube/releases/tag/1.3.5 - - - https://github.com/ClassiCube/ClassiCube/releases/tag/1.3.4 - - - https://github.com/ClassiCube/ClassiCube/releases/tag/1.3.3 - - - https://github.com/ClassiCube/ClassiCube/releases/tag/1.3.2 - - - https://github.com/ClassiCube/ClassiCube/releases/tag/1.3.1 - - - https://github.com/ClassiCube/ClassiCube/releases/tag/1.3.0 - - - https://github.com/ClassiCube/ClassiCube/releases/tag/1.2.9 - - - https://github.com/ClassiCube/ClassiCube/releases/tag/1.2.8 - - - https://github.com/ClassiCube/ClassiCube/releases/tag/1.2.7 - - - https://github.com/ClassiCube/ClassiCube/releases/tag/1.2.6 - - - https://github.com/ClassiCube/ClassiCube/releases/tag/1.2.5 - - - https://github.com/ClassiCube/ClassiCube/releases/tag/1.2.4 - - - https://github.com/ClassiCube/ClassiCube/releases/tag/1.2.3 - - - https://github.com/ClassiCube/ClassiCube/releases/tag/1.2.2 - - - https://github.com/ClassiCube/ClassiCube/releases/tag/1.2.1 - - - https://github.com/ClassiCube/ClassiCube/releases/tag/1.2.0 - - - https://github.com/ClassiCube/ClassiCube/releases/tag/1.1.9 - - - https://github.com/ClassiCube/ClassiCube/releases/tag/1.1.8 - - - https://github.com/ClassiCube/ClassiCube/releases/tag/1.1.7 - - - https://github.com/ClassiCube/ClassiCube/releases/tag/1.1.6 - - - https://github.com/ClassiCube/ClassiCube/releases/tag/1.1.5 - - - https://github.com/ClassiCube/ClassiCube/releases/tag/1.1.4 - - - https://github.com/ClassiCube/ClassiCube/releases/tag/1.1.3 - - - https://github.com/ClassiCube/ClassiCube/releases/tag/1.1.2 - - - https://github.com/ClassiCube/ClassiCube/releases/tag/1.1.1 - - - https://www.classicube.net/ - https://github.com/ClassiCube/ClassiCube/issues - https://www.patreon.com/ClassiCube - https://github.com/ClassiCube/ClassiCube - - Game - AdventureGame - ActionGame - - - pointing - keyboard - - - moderate - intense - - net.classicube.flatpak.client.desktop - - ClassiCube - -
diff --git a/misc/x11/linux/flatpak/net.classicube.flatpak.client.svg b/misc/x11/linux/flatpak/net.classicube.flatpak.client.svg deleted file mode 100644 index 44324156b..000000000 --- a/misc/x11/linux/flatpak/net.classicube.flatpak.client.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/misc/x11/linux/install-desktop-entry.sh b/misc/x11/linux/install-desktop-entry.sh deleted file mode 100644 index a3c3ab7c5..000000000 --- a/misc/x11/linux/install-desktop-entry.sh +++ /dev/null @@ -1,34 +0,0 @@ -DESKTOP_FILE=ClassiCube.desktop -GAME_DIR=`pwd` - -# remove existing ClassiCube desktop entry file -rm $DESKTOP_FILE - -# download ClassiCube icon from github if necessary -if [ -f "CCicon.png" ] -then - echo "CCicon.png exists already. Skipping download." -else - echo "CCicon.png doesn't exist. Attempting to download it.." - wget "https://raw.githubusercontent.com/ClassiCube/classicube/master/misc/CCicon.png" -fi - -# create ClassiCube desktop entry -echo 'Creating ClassiCube.desktop..' -cat >> $DESKTOP_FILE << EOF -[Desktop Entry] -Type=Application -Comment=Minecraft Classic inspired sandbox game -Name=ClassiCube -Exec=$GAME_DIR/ClassiCube -Icon=$GAME_DIR/CCicon.png -Path=$GAME_DIR -Terminal=false -Categories=Game -EOF -chmod +x $DESKTOP_FILE - -echo 'Installing ClassiCube.desktop..' -# install ClassiCube desktop entry into the system -sudo desktop-file-install --dir=/usr/share/applications ClassiCube.desktop -sudo update-desktop-database /usr/share/applications diff --git a/readme.md b/readme.md index b6d087e90..a21b4f23a 100644 --- a/readme.md +++ b/readme.md @@ -190,7 +190,7 @@ NOTE: If you are distributing a modified version, **please change the bundle ID ##### Using Xcode GUI -1. Open the `ios/CCIOS.xcodeproj` project in Xcode +1. Open the `misc/ios/CCIOS.xcodeproj` project in Xcode 2. Compile the project ##### Using command line (Xcode) diff --git a/src/Window_Win.c b/src/Window_Win.c index 4d83cdd71..6e01047f3 100644 --- a/src/Window_Win.c +++ b/src/Window_Win.c @@ -365,7 +365,7 @@ static ATOM DoRegisterClass(void) { /* Windows NT 3.5 does not support RegisterClassExA function */ res = GetLastError(); if (res == ERROR_CALL_NOT_IMPLEMENTED) { - if ((atom = RegisterClassA((const WNDCLASSA*)&wc))) return atom; + if ((atom = RegisterClassA((const WNDCLASSA*)&wc.style))) return atom; res = GetLastError(); }