Skip to content
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

Jump to bottom

Refactor atlas/zimtool CMakeLists.txt #19087

Merged
merged 4 commits into from Apr 29, 2024
Merged

Refactor atlas/zimtool CMakeLists.txt #19087

merged 4 commits into from Apr 29, 2024

Conversation

santiago046
Copy link
Contributor

@santiago046 santiago046 commented Apr 26, 2024 •
edited

Setting C++ standard to C++ fixes this error:

In file included from /home/ppsspp/Common/Data/Encoding/Utf8.cpp:30:
/home/ppsspp/ext/native/tools/../../../Common/Data/Encoding/Utf8.h:36:28: error: ‘string_view’ is not a member of ‘std’
   36 | bool AnyEmojiInString(std::string_view str, size_t byteCount);
      |                            ^~~~~~~~~~~
/home/ppsspp/ext/native/tools/../../../Common/Data/Encoding/Utf8.h:36:28: note: ‘std::string_view’ is only available from C++17 onwards

@santiago046
Refactor atlas/zimtool CMakeLists.txt
4677aec
@santiago046
Update CMakeLists.txt
adaa9fb
@santiago046
Include ARM files in ext/libpng17/CMakeLists.txt for ARM processors
31bf179 
Needed when building atlas/zimtool.It fixes this error:
```
/usr/bin/ld: png17/libpng17.a(pngrutil.c.o): in function `png_read_process_IDAT':
pngrutil.c:(.text+0x548c): undefined reference to `png_init_filter_functions_neon'                                                            collect2: error: ld returned 1 exit status
make[2]: *** [CMakeFiles/zimtool.dir/build.make:134: build/zimtool] Error 1
make[1]: *** [CMakeFiles/Makefile2:128: CMakeFiles/zimtool.dir/all] Error 2                                                                   make[1]: *** Waiting for unfinished jobs....
```
@santiago046
Update ext/libpng17/CMakeLists.txt
6979be0
@hrydgard hrydgard added this to the v1.18.0 milestone Apr 28, 2024
@hrydgard hrydgard enabled auto-merge April 28, 2024 11:37
@hrydgard hrydgard disabled auto-merge April 29, 2024 10:16
@hrydgard hrydgard merged commit 11112d4 into hrydgard:master Apr 29, 2024
17 of 18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hrydgard hrydgard hrydgard approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v1.18.0
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@santiago046 @hrydgard