Skip to content

Fix freetype build on windows and mark test as crossplaform #22602

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

Merged
merged 2 commits into from
Sep 23, 2024
Merged

Fix freetype build on windows and mark test as crossplaform #22602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d7c55e
Fix freetype build on windows and mark test as crossplaform
sbc100 Sep 20, 2024
7bbf822
Change back to running all crossplatform tests
dschuff Sep 23, 2024
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
1 change: 1 addition & 0 deletions test/test_other.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2479,6 +2479,7 @@ def test_bzip2(self):

@with_all_sjlj
@requires_network
@crossplatform
def test_freetype(self):
# copy the Liberation Sans Bold truetype file located in the
# <emscripten_root>/test/freetype to the compilation folder
Expand Down
40 changes: 3 additions & 37 deletions tools/ports/freetype.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def get(ports, settings, shared):

def create(final):
source_path = ports.get_dir('freetype', f'freetype-{TAG}')
ports.write_file(os.path.join(source_path, 'include/ftconfig.h'), ftconf_h)
# Overwrite the default config file with our own.
ports.install_header_dir(os.path.join(source_path, 'include'),
target=os.path.join('freetype2'))

Expand Down Expand Up @@ -78,8 +78,9 @@ def create(final):

flags = [
'-DFT2_BUILD_LIBRARY',
'-DFT_CONFIG_CONFIG_H=<ftconfig.h>',
'-DFT_CONFIG_OPTION_SYSTEM_ZLIB',
'-DHAVE_UNISTD_H',
'-DHAVE_FCNTL_H',
'-I' + source_path + '/include',
'-I' + source_path + '/truetype',
'-I' + source_path + '/sfnt',
Expand Down Expand Up @@ -110,38 +111,3 @@ def process_args(ports):

def show():
return 'freetype (-sUSE_FREETYPE=1 or --use-port=freetype; freetype license)'


ftconf_h = r'''
/**************************************************************************
*
* This header file contains a number of macro definitions that are used by
* the rest of the engine. Most of the macros here are automatically
* determined at compile time, and you should not need to change it to port
* FreeType, except to compile the library with a non-ANSI compiler.
*
* Note however that if some specific modifications are needed, we advise
* you to place a modified copy in your build directory.
*
* The build directory is usually `builds/<system>`, and contains
* system-specific files that are always included first when building the
* library.
*
*/

#ifndef FTCONFIG_H_
#define FTCONFIG_H_

#include <ft2build.h>
#include FT_CONFIG_OPTIONS_H
#include FT_CONFIG_STANDARD_LIBRARY_H

#define HAVE_UNISTD_H
#define HAVE_FCNTL_H

#include <freetype/config/integer-types.h>
#include <freetype/config/public-macros.h>
#include <freetype/config/mac-support.h>

#endif /* FTCONFIG_H_ */
'''
Loading