Skip to content

Commit 087a891

Browse files
nesboxnesbox
committed
Merge remote-tracking branch 'origin/main' into sokol
2 parents c35ca88 + bae9661 commit 087a891

37 files changed

+6526
-3798
lines changed

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ jobs:
373373
- name: Build
374374
run: |
375375
cd build
376-
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_IPO=ON -DBUILD_WITH_ALL=ON ..
376+
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_IPO=ON -DBUILD_WITH_ALL=ON -DCMAKE_POLICY_VERSION_MINIMUM=3.5 ..
377377
cmake --build . --parallel
378378
379379
- name: Deploy
@@ -387,7 +387,7 @@ jobs:
387387
- name: Build Pro
388388
run: |
389389
cd build
390-
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_IPO=ON -DBUILD_PRO=ON -DBUILD_WITH_ALL=ON ..
390+
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_IPO=ON -DBUILD_PRO=ON -DBUILD_WITH_ALL=ON -DCMAKE_POLICY_VERSION_MINIMUM=3.5 ..
391391
cmake --build . --parallel
392392
393393
# === MacOS 14 / arm64 ===
@@ -454,35 +454,6 @@ jobs:
454454
path: |
455455
build/bin/*
456456
457-
- name: Build website
458-
run: |
459-
mkdir -p website/public/app
460-
cp build/bin/* website/public/app
461-
cd website
462-
npm install
463-
npm run build
464-
465-
- name: Upload pages artifact
466-
uses: actions/upload-pages-artifact@v3
467-
with:
468-
path: website/dist
469-
470-
# === GitHub Pages ===
471-
pages:
472-
runs-on: ubuntu-latest
473-
needs: webapp
474-
475-
# !TODO: change it main
476-
if: github.ref == 'refs/heads/website'
477-
478-
permissions:
479-
pages: write
480-
id-token: write
481-
482-
steps:
483-
- name: Deploy to GitHub Pages
484-
uses: actions/deploy-pages@v4
485-
486457
# === Android ===
487458
android:
488459
runs-on: ubuntu-latest

‎.gitmodules‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,6 @@
6666
path = vendor/naett
6767
url = https://github.com/erkkah/naett.git
6868
shallow = true
69-
[submodule "vendor/msf_gif"]
70-
path = vendor/msf_gif
71-
url = https://github.com/notnullnotvoid/msf_gif.git
72-
shallow = true
7369
[submodule "vendor/dlfcn"]
7470
path = vendor/dlfcn
7571
url = https://github.com/dlfcn-win32/dlfcn-win32.git
@@ -82,7 +78,6 @@
8278
path = vendor/pocketpy
8379
url = https://github.com/pocketpy/pocketpy.git
8480
shallow = true
85-
8681
[submodule "vendor/lpeg"]
8782
path = vendor/lpeg
8883
url = https://github.com/roberto-ieru/LPeg.git

‎build/android/app/src/main/AndroidManifest.xml‎

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- Replace com.test.game with the identifier of your game below, e.g.
3+
com.gamemaker.game
4+
-->
5+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
6+
package="com.nesbox.tic"
7+
android:versionCode="10200"
8+
android:versionName="1.02.00"
9+
android:installLocation="auto">
10+
11+
<!-- OpenGL ES 2.0 -->
12+
<uses-feature android:glEsVersion="0x00020000" />
13+
14+
<!-- Touchscreen support -->
15+
<uses-feature
16+
android:name="android.hardware.touchscreen"
17+
android:required="false" />
18+
19+
<!-- Game controller support -->
20+
<uses-feature
21+
android:name="android.hardware.bluetooth"
22+
android:required="false" />
23+
<uses-feature
24+
android:name="android.hardware.gamepad"
25+
android:required="false" />
26+
<uses-feature
27+
android:name="android.hardware.usb.host"
28+
android:required="false" />
29+
30+
<!-- External mouse input events -->
31+
<uses-feature
32+
android:name="android.hardware.type.pc"
33+
android:required="false" />
34+
35+
<!-- Audio recording support -->
36+
<!-- if you want to capture audio, uncomment this. -->
37+
<!-- <uses-feature
38+
android:name="android.hardware.microphone"
39+
android:required="false" /> -->
40+
41+
<!-- Allow downloading to the external storage on Android 5.1 and older -->
42+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="22" />
43+
44+
<!-- Allow access to Bluetooth devices -->
45+
<!-- Currently this is just for Steam Controller support and requires setting SDL_HINT_JOYSTICK_HIDAPI_STEAM -->
46+
<uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />
47+
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
48+
49+
<!-- Allow access to the vibrator -->
50+
<uses-permission android:name="android.permission.VIBRATE" />
51+
<!-- Allow access to the Internet -->
52+
<uses-permission android:name="android.permission.INTERNET" />
53+
54+
<!-- if you want to capture audio, uncomment this. -->
55+
<!-- <uses-permission android:name="android.permission.RECORD_AUDIO" /> -->
56+
57+
<!-- Create a Java class extending SDLActivity and place it in a
58+
directory under app/src/main/java matching the package, e.g. app/src/main/java/com/gamemaker/game/MyGame.java
59+
60+
then replace "SDLActivity" with the name of your class (e.g. "MyGame")
61+
in the XML below.
62+
63+
An example Java class can be found in README-android.md
64+
-->
65+
<application android:label="@string/app_name"
66+
android:icon="@mipmap/ic_launcher"
67+
android:allowBackup="true"
68+
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
69+
android:hardwareAccelerated="true" >
70+
71+
<meta-data android:name="SDL_ENV.SDL_ACCELEROMETER_AS_JOYSTICK" android:value="0"/>
72+
73+
<activity android:name="TIC"
74+
android:label="@string/app_name"
75+
android:alwaysRetainTaskState="true"
76+
android:launchMode="singleInstance"
77+
android:configChanges="layoutDirection|locale|orientation|uiMode|screenLayout|screenSize|smallestScreenSize|keyboard|keyboardHidden|navigation"
78+
android:preferMinimalPostProcessing="true"
79+
android:exported="true"
80+
>
81+
<intent-filter>
82+
<action android:name="android.intent.action.MAIN" />
83+
<category android:name="android.intent.category.LAUNCHER" />
84+
</intent-filter>
85+
86+
<!-- Let Android know that we can handle some USB devices and should receive this event -->
87+
<intent-filter>
88+
<action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
89+
</intent-filter>
90+
91+
<!-- Drop file event -->
92+
<intent-filter>
93+
<action android:name="android.intent.action.VIEW" />
94+
<category android:name="android.intent.category.DEFAULT" />
95+
<data android:mimeType="*/*" android:pathPattern=".*\\.tic" />
96+
<data android:mimeType="*/*" android:pathPattern=".*\\.png" />
97+
</intent-filter>
98+
99+
</activity>
100+
<activity android:name=".TICFileReceiver"
101+
android:theme="@android:style/Theme.Translucent"
102+
android:exported="true">
103+
<intent-filter>
104+
<action android:name="android.intent.action.SEND" />
105+
<category android:name="android.intent.category.DEFAULT" />
106+
<data android:mimeType="*/*"/>
107+
</intent-filter>
108+
</activity>
109+
110+
<provider
111+
android:name="TICDocumentsProvider"
112+
android:authorities="com.nesbox.tic.documents"
113+
android:exported="true"
114+
android:grantUriPermissions="true"
115+
android:permission="android.permission.MANAGE_DOCUMENTS">
116+
<intent-filter>
117+
<action android:name="android.content.action.DOCUMENTS_PROVIDER" />
118+
</intent-filter>
119+
</provider>
120+
</application>
121+
122+
</manifest>

0 commit comments

Comments
 (0)