Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
e57042e8
Commit
e57042e8
authored
Oct 15, 2016
by
Rémi Verschelde
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
png: Try to fix neon issue on iphone armv7
parent
248bc915
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
22 deletions
+24
-22
SCsub
drivers/png/SCsub
+24
-22
No files found.
drivers/png/SCsub
View file @
e57042e8
...
...
@@ -6,22 +6,26 @@ env_png = env.Clone()
if (env["libpng"] == "builtin"):
thirdparty_dir = "#thirdparty/libpng/"
thirdparty_sources = [
thirdparty_dir +
"png.c",
thirdparty_dir +
"pngerror.c",
thirdparty_dir +
"pngget.c",
thirdparty_dir +
"pngmem.c",
thirdparty_dir +
"pngpread.c",
thirdparty_dir +
"pngread.c",
thirdparty_dir +
"pngrio.c",
thirdparty_dir +
"pngrtran.c",
thirdparty_dir +
"pngrutil.c",
thirdparty_dir +
"pngset.c",
thirdparty_dir +
"pngtrans.c",
thirdparty_dir +
"pngwio.c",
thirdparty_dir +
"pngwrite.c",
thirdparty_dir +
"pngwtran.c",
thirdparty_dir +
"pngwutil.c",
"png.c",
"pngerror.c",
"pngget.c",
"pngmem.c",
"pngpread.c",
"pngread.c",
"pngrio.c",
"pngrtran.c",
"pngrutil.c",
"pngset.c",
"pngtrans.c",
"pngwio.c",
"pngwrite.c",
"pngwtran.c",
"pngwutil.c",
]
thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
env_png.add_source_files(env.drivers_sources, thirdparty_sources)
env_png.Append(CPPPATH = [thirdparty_dir])
# Currently .ASM filter_neon.S does not compile on NT.
import os
...
...
@@ -30,16 +34,14 @@ if (env["libpng"] == "builtin"):
env_neon = env_png.Clone();
if "S_compiler" in env:
env_neon['CC'] = env['S_compiler']
#env_neon.Append(CPPFLAGS = ["-DPNG_ARM_NEON"])
thirdparty_sources.append(env_neon.Object(thirdparty_dir + "/arm/arm_init.c"))
thirdparty_sources.append(env_neon.Object(thirdparty_dir + "/arm/filter_neon.S"))
neon_sources = []
neon_sources.append(env_neon.Object(thirdparty_dir + "/arm/arm_init.c"))
neon_sources.append(env_neon.Object(thirdparty_dir + "/arm/filter_neon_intrinsics.c"))
neon_sources.append(env_neon.Object(thirdparty_dir + "/arm/filter_neon.S"))
env.drivers_sources += neon_sources
else:
env_png.Append(CPPFLAGS = ["-DPNG_ARM_NEON_OPT=0"])
#env_png.add_source_files(env.drivers_sources, thirdparty_sources)
env.drivers_sources += thirdparty_sources # Concatenation necessary for neon objects it seems?
env_png.Append(CPPPATH = [thirdparty_dir])
# Godot source files
env_png.add_source_files(env.drivers_sources, "*.cpp")
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment