Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 38790fc

Browse files
runrevmarkrunrevmark
authored
Merge pull request #7417 from livecodeian/feature-tilecache-gles3
[[ TileCache ]] Add GLES3.x tilecache implementation to iOS and Android
2 parents 57def98 + 2d8aea8 commit 38790fc

File tree

12 files changed

+1555
-107
lines changed

12 files changed

+1555
-107
lines changed

‎engine/engine-sources.gypi‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
'src/customprinter.cpp',
3333
'src/font.cpp',
3434
'src/fonttable.cpp',
35+
'src/glcontext.cpp',
36+
'src/glcontext.h',
3537
'src/gradient.cpp',
3638
'src/graphics_util.cpp',
3739
'src/graphicscontext.cpp',
@@ -48,6 +50,7 @@
4850
'src/tilecache.cpp',
4951
'src/tilecachecg.cpp',
5052
'src/tilecachegl.cpp',
53+
'src/tilecachegl3.x.cpp',
5154
'src/tilecachesw.cpp',
5255
'src/mcsemaphore.h',
5356
'src/mctristate.h',
@@ -1150,6 +1153,8 @@
11501153
[
11511154
'src/fiber.cpp',
11521155
'src/tilecachegl.cpp',
1156+
'src/tilecachegl3.x.cpp',
1157+
'src/glcontext.cpp',
11531158
'src/player-legacy.cpp',
11541159

11551160
'src/desktop-ans.cpp',
@@ -1174,6 +1179,8 @@
11741179
'src/sysunxrandom.cpp',
11751180
'src/sysunxregion.cpp',
11761181
'src/tilecachegl.cpp',
1182+
'src/tilecachegl3.x.cpp',
1183+
'src/glcontext.cpp',
11771184
],
11781185
},
11791186
],
@@ -1204,6 +1211,8 @@
12041211
[
12051212
'src/player-platform.cpp',
12061213
'src/tilecachegl.cpp',
1214+
'src/tilecachegl3.x.cpp',
1215+
'src/glcontext.cpp',
12071216

12081217
'src/desktop.cpp',
12091218
'src/desktop-ans.cpp',
@@ -1225,6 +1234,7 @@
12251234
[
12261235
'src/player-platform.cpp',
12271236
'src/sysunxnetwork.cpp',
1237+
'src/tilecachegl.cpp',
12281238

12291239
'src/desktop.cpp',
12301240
'src/desktop-ans.cpp',
@@ -1248,6 +1258,7 @@
12481258
'src/stacke.cpp',
12491259
'src/sysunxdate.cpp',
12501260
'src/sysunxrandom.cpp',
1261+
'src/tilecachegl.cpp',
12511262

12521263
'src/mbliphoneembedded.mm',
12531264
'src/mbliphoneembeddedtest.mm',
@@ -1282,6 +1293,8 @@
12821293
'src/notify.cpp',
12831294
'src/player-platform.cpp',
12841295
'src/tilecachegl.cpp',
1296+
'src/tilecachegl3.x.cpp',
1297+
'src/glcontext.cpp',
12851298

12861299
'src/desktop.cpp',
12871300
'src/desktop-ans.cpp',

‎engine/kernel.gyp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@
236236
{
237237
'libraries':
238238
[
239-
'-lGLESv1_CM',
239+
'-lGLESv3',
240240
'-lEGL',
241241
'-ljnigraphics',
242242
'-llog',

‎engine/rsrc/android-manifest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
${INSTALL_LOCATION}>
77
${PUSH_PERMISSIONS}
88
${USES_PERMISSION}${USES_FEATURE}
9+
<uses-feature android:glEsVersion="0x00030000"/>
910
<uses-sdk android:minSdkVersion="${MIN_SDK_VERSION}" android:targetSdkVersion="${TARGET_SDK_VERSION}"/>
1011
<supports-screens
1112
android:largeScreens="true"

0 commit comments

Comments
 (0)