Skip to content

Implement Angle for Desktop and iOS. #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MAJigsaw77 wants to merge 1 commit into
base: mobile/main
Choose a base branch
from
Open

Implement Angle for Desktop and iOS. #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added dependencies/angle/Linux/libEGL.so
View file
Open in desktop
Binary file not shown.
Binary file added dependencies/angle/Linux/libGLESv2.so
View file
Open in desktop
Binary file not shown.
Binary file added dependencies/angle/MacOS/libEGL.dylib
View file
Open in desktop
Binary file not shown.
Binary file added dependencies/angle/MacOS/libGLESv2.dylib
View file
Open in desktop
Binary file not shown.
Binary file added dependencies/angle/Windows/d3dcompiler_47.dll
View file
Open in desktop
Binary file not shown.
Binary file added dependencies/angle/Windows/libEGL.dll
View file
Open in desktop
Binary file not shown.
Binary file added dependencies/angle/Windows/libGLESv2.dll
View file
Open in desktop
Binary file not shown.
Binary file removed dependencies/angle/d3dcompiler_47.dll
View file
Open in desktop
Binary file not shown.
44 changes: 44 additions & 0 deletions dependencies/angle/iPhone/libEGL.xcframework/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>AvailableLibraries</key>
<array>
<dict>
<key>BinaryPath</key>
<string>libEGL.framework/libEGL</string>
<key>LibraryIdentifier</key>
<string>ios-arm64_x86_64-simulator</string>
<key>LibraryPath</key>
<string>libEGL.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
<dict>
<key>BinaryPath</key>
<string>libEGL.framework/libEGL</string>
<key>LibraryIdentifier</key>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>libEGL.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
</dict>
</array>
<key>CFBundlePackageType</key>
<string>XFWK</string>
<key>XCFrameworkFormatVersion</key>
<string>1.0</string>
</dict>
</plist>
Binary file added dependencies/angle/iPhone/libEGL.xcframework/ios-arm64/libEGL.framework/Info.plist
View file
Open in desktop
Binary file not shown.
Binary file added dependencies/angle/iPhone/libEGL.xcframework/ios-arm64/libEGL.framework/libEGL
View file
Open in desktop
Binary file not shown.
Binary file added ...encies/angle/iPhone/libEGL.xcframework/ios-arm64_x86_64-simulator/libEGL.framework/libEGL
View file
Open in desktop
Binary file not shown.
44 changes: 44 additions & 0 deletions dependencies/angle/iPhone/libGLESv2.xcframework/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>AvailableLibraries</key>
<array>
<dict>
<key>BinaryPath</key>
<string>libGLESv2.framework/libGLESv2</string>
<key>LibraryIdentifier</key>
<string>ios-arm64_x86_64-simulator</string>
<key>LibraryPath</key>
<string>libGLESv2.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
<dict>
<key>BinaryPath</key>
<string>libGLESv2.framework/libGLESv2</string>
<key>LibraryIdentifier</key>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>libGLESv2.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
</dict>
</array>
<key>CFBundlePackageType</key>
<string>XFWK</string>
<key>XCFrameworkFormatVersion</key>
<string>1.0</string>
</dict>
</plist>
Binary file added dependencies/angle/iPhone/libGLESv2.xcframework/ios-arm64/libGLESv2.framework/Info.plist
View file
Open in desktop
Binary file not shown.
Binary file added dependencies/angle/iPhone/libGLESv2.xcframework/ios-arm64/libGLESv2.framework/libGLESv2
View file
Open in desktop
Binary file not shown.
Binary file added ...gle/iPhone/libGLESv2.xcframework/ios-arm64_x86_64-simulator/libGLESv2.framework/libGLESv2
View file
Open in desktop
Binary file not shown.
Binary file removed dependencies/angle/libegl.dll
View file
Open in desktop
Binary file not shown.
Binary file removed dependencies/angle/libglesv2.dll
View file
Open in desktop
Binary file not shown.
16 changes: 13 additions & 3 deletions include.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,19 @@
<dependency path="dependencies/webgl-debug.js" if="html5 webgl-debug" embed="true" />
<dependency path="dependencies/stats.min.js" if="html5 stats" embed="true" />

<dependency path="dependencies/angle/d3dcompiler_47.dll" if="windows angle" unless="static_link" />
<dependency path="dependencies/angle/libegl.dll" if="windows angle" unless="static_link" />
<dependency path="dependencies/angle/libglesv2.dll" if="windows angle" unless="static_link" />
<dependency path="dependencies/angle/Windows/d3dcompiler_47.dll" if="windows" />
<dependency path="dependencies/angle/Windows/libEGL.dll" if="windows" />
<dependency path="dependencies/angle/Windows/libGLESv2.dll" if="windows" />

<dependency path="dependencies/angle/MacOS/libEGL.dylib" if="mac" />
<dependency path="dependencies/angle/MacOS/libGLESv2.dylib" if="mac" />

<dependency path="dependencies/angle/Linux/libEGL.so" if="linux" />
<dependency path="dependencies/angle/Linux/libGLESv2.so" if="linux" />

<dependency path="dependencies/angle/iPhone/libEGL.xcframework" embed="true" if="ios" />
<dependency path="dependencies/angle/iPhone/libGLESv2.xcframework" embed="true" if="ios" />


<!-- TODO: Move to template or move all template dependencies to XML? -->
<!-- <dependency name="CoreBluetooth.framework" if="ios" /> -->
Expand Down
41 changes: 22 additions & 19 deletions project/Build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,8 @@
<set name="LIME_PIXMAN" value="1" />
<set name="LIME_PNG" value="1" />
<set name="LIME_SDL" value="1" />
<!-- <set name="LIME_SDL_ANGLE" value="1" if="windows" unless="static_link" /> -->
<set name="LIME_SDL_ANGLE" value="1" if="windows LIME_SDL_ANGLE" unless="static_link" />
<set name="LIME_SDL_ANGLE" value="1" if="windows angle" unless="static_link" />
<set name="LIME_SDL_ANGLE" value="1" if="winrt" />
<set name="LIME_ANGLE" value="1" if="iphone" />
<set name="LIME_GLAD" value="1" unless="LIME_ANGLE" />
<set name="LIME_TINYFILEDIALOGS" value="1" if="windows || mac || linux" unless="winrt || emscripten" />
<set name="LIME_VORBIS" value="1" />
<!-- <set name="LIME_VPX" value="1" />
Expand All @@ -53,9 +51,6 @@
<set name="NATIVE_TOOLKIT_HAVE_PNG" value="1" if="LIME_PNG" />
<set name="NATIVE_TOOLKIT_HAVE_SDL" value="1" if="LIME_SDL" />

<set name="NATIVE_TOOLKIT_SDL_STATIC" value="1" />
<set name="NATIVE_TOOLKIT_SDL_ANGLE" value="1" if="LIME_SDL_ANGLE" />

<files id="lime">

<compilerflag value="-Iinclude" />
Expand Down Expand Up @@ -257,7 +252,6 @@
</section>

<compilerflag value="-DLIME_SDL" />
<compilerflag value="-DNATIVE_TOOLKIT_SDL_ANGLE" if="NATIVE_TOOLKIT_SDL_ANGLE" />
<compilerflag value="-D__IPHONEOS__" if="ios || tvos" />
<compilerflag value="-D__APPLETVOS__" if="tvos" />
<compilerflag value="-DAPPLETV" if="tvos" />
Expand All @@ -273,6 +267,22 @@

</section>

<section if="LIME_GLAD">

<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/glad/include/" />

<compilerflag value="-DLIME_GLAD" />

</section>

<section if="LIME_ANGLE">

<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/angle/include/" />

<compilerflag value="-DLIME_ANGLE" />

</section>

<section if="LIME_TINYFILEDIALOGS">

<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/tinyfiledialogs/" />
Expand Down Expand Up @@ -355,6 +365,7 @@
<include name="lib/faudio-files.xml" if="LIME_FAUDIO" />
<include name="lib/freetype-files.xml" />
<include name="lib/harfbuzz-files.xml" />
<include name="lib/glad-files.xml" if="LIME_GLAD" />
<include name="lib/jpeg-files.xml" />
<include name="lib/lzma-files.xml" />
<include name="lib/mbedtls-files.xml" />
Expand Down Expand Up @@ -398,6 +409,7 @@
<files id="native-toolkit-pixman" if="LIME_PIXMAN" />
<files id="native-toolkit-png" if="LIME_PNG" />
<files id="native-toolkit-sdl" if="LIME_SDL" unless="emscripten" />
<files id="native-toolkit-glad" if="LIME_GLAD" />
<files id="native-toolkit-tinyfiledialogs" if="LIME_TINYFILEDIALOGS" />
<files id="native-toolkit-vorbis" if="LIME_VORBIS" />
<files id="native-toolkit-vpx" if="LIME_VPX" />
Expand All @@ -415,7 +427,6 @@
<section if="windows">

<lib name="gdi32.lib" />
<lib name="opengl32.lib" />
<lib name="user32.lib" />
<lib name="kernel32.lib" />
<lib name="advapi32.lib" />
Expand Down Expand Up @@ -450,6 +461,8 @@

<section if="linux">

<flag value="-Wl,-rpath,$ORIGIN"/>

<lib name="-lpthread" />
<lib name="-lrt" />

Expand Down Expand Up @@ -481,8 +494,6 @@
<vflag name="-framework" value="CoreAudio" />
<vflag name="-framework" value="CoreVideo" />
<vflag name="-framework" value="ForceFeedback" />
<vflag name="-framework" value="OpenAL" />
<vflag name="-framework" value="OpenGL" />
<vflag name="-framework" value="SystemConfiguration" />

<lib name="/opt/local/lib/libgc.a" if="LIME_NEKO" />
Expand All @@ -503,7 +514,6 @@
<lib name="-lm" />
<lib name="-lEGL" />
<lib name="-lGLESv2" />
<lib name="-lGLESv1_CM" />
<lib name="-lOpenSLES" />

</section>
Expand All @@ -527,13 +537,10 @@
<vflag name="-framework" value="CoreAudio" />
<vflag name="-framework" value="CoreVideo" />
<vflag name="-framework" value="GameController" />
<vflag name="-framework" value="OpenAL" />
<vflag name="-framework" value="OpenGLES" />
<!-- <vflag name="-framework" value="CoreBluetooth" /> -->

<lib name="-ldl" />
<lib name="-lEGL" />
<lib name="-lGLESv3" />

</section>

Expand All @@ -547,13 +554,9 @@
<vflag name="-framework" value="CoreMotion" />
<vflag name="-framework" value="CoreText" />
<vflag name="-framework" value="CoreVideo" />
<vflag name="-framework" value="OpenAL" />
<vflag name="-framework" value="OpenGLES" />
<!-- <vflag name="-framework" value="CoreBluetooth" /> -->

<lib name="-ldl" />
<lib name="-lEGL" />
<lib name="-lGLESv3" />

</section>

Expand Down
Loading