Skip to content

Add support to windows on ARM build #2807

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
trengginas merged 4 commits into from
Aug 30, 2021
Merged

Add support to windows on ARM build #2807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
21c7452
Add support to ARM64 configuration for win32 build
trengginas Aug 24, 2021
9ad6b55
Add changes notes to webrtc and webrtc_aec3 third party sources
trengginas Aug 24, 2021
6a30902
Remove reference to libwebrtc_aec3 from libpjproject. Add reference i…
trengginas Aug 26, 2021
983f547
Fix build error on Release configuration.
trengginas Aug 26, 2021
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
25 changes: 25 additions & 0 deletions build/vs/pjproject-vs14-arm64-common-defaults.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
</ImportGroup>
<PropertyGroup Label="UserMacros">
<TargetCPU>ARM64</TargetCPU>
</PropertyGroup>
<PropertyGroup>
<_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
</PropertyGroup>
<ItemDefinitionGroup>
<Link>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineARM64</TargetMachine>
</Link>
<Lib>
<AdditionalOptions>/ignore:4221</AdditionalOptions>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
<BuildMacro Include="TargetCPU">
<Value>$(TargetCPU)</Value>
</BuildMacro>
</ItemGroup>
</Project>
12 changes: 12 additions & 0 deletions build/vs/pjproject-vs14-arm64-release-defaults.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="pjproject-vs14-arm64-common-defaults.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
</PropertyGroup>
<ItemDefinitionGroup />
<ItemGroup />
</Project>
1 change: 1 addition & 0 deletions build/vs/pjproject-vs14-common-config.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<BuildToolset>v140</BuildToolset>
<PreprocessorDef Condition="'$(Platform)'=='Win32'">WIN32;PJ_WIN32=1;PJ_M_I386=1;</PreprocessorDef>
<PreprocessorDef Condition="'$(Platform)'=='x64'">WIN64;PJ_WIN64=1;PJ_M_X86_64=1;</PreprocessorDef>
<PreprocessorDef Condition="'$(Platform)'=='ARM64'">PJ_M_ARM64=1;</PreprocessorDef>
</PropertyGroup>
</When>
<When Condition="'$(API_Family)'=='UWP'">
Expand Down
184 changes: 181 additions & 3 deletions pjlib-util/build/pjlib_util.vcxproj
View file
Open in desktop

Large diffs are not rendered by default.

204 changes: 200 additions & 4 deletions pjlib-util/build/pjlib_util_test.vcxproj
View file
Open in desktop

Large diffs are not rendered by default.

233 changes: 232 additions & 1 deletion pjlib/build/pjlib.vcxproj
View file
Open in desktop

Large diffs are not rendered by default.

185 changes: 184 additions & 1 deletion pjlib/build/pjlib_test.vcxproj
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions pjlib/build/pjlib_test.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@
<ClCompile Include="..\src\pjlib-test\util.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\pjlib-test\main.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\pjlib-test\test.h">
Expand Down
8 changes: 8 additions & 0 deletions pjlib/include/pj/compat/os_win32.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,14 @@
*/
#define PJ_THREAD_ALLOCATE_STACK 0

/* Endianness */
#if defined(_M_ARM64)
# ifndef PJ_IS_LITTLE_ENDIAN
# define PJ_IS_LITTLE_ENDIAN 1
# define PJ_IS_BIG_ENDIAN 0
# endif
#endif


#endif /* __PJ_COMPAT_OS_WIN32_H__ */

8 changes: 6 additions & 2 deletions pjlib/include/pj/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,6 @@
# define PJ_IS_LITTLE_ENDIAN 1
# define PJ_IS_BIG_ENDIAN 0


#elif defined (PJ_M_X86_64) || defined(__amd64__) || defined(__amd64) || \
defined(__x86_64__) || defined(__x86_64) || \
defined(_M_X64) || defined(_M_AMD64)
Expand Down Expand Up @@ -255,7 +254,8 @@
# define PJ_IS_LITTLE_ENDIAN 0
# define PJ_IS_BIG_ENDIAN 1

#elif defined(ARM) || defined(_ARM_) || defined(__arm__) || defined(_M_ARM)
#elif defined(ARM) || defined(_ARM_) || defined(__arm__) || \
defined(_M_ARM) || defined(_M_ARM64)
# define PJ_HAS_PENTIUM 0
/*
* ARM, bi-endian, so raise error if endianness is not configured
Expand All @@ -271,6 +271,10 @@
# undef PJ_M_ARMV4
# define PJ_M_ARMV4 1
# define PJ_M_NAME "armv4"
# elif defined (PJ_M_ARM64) || defined(ARM64)
# undef PJ_M_ARM64
# define PJ_M_ARM64 1
# define PJ_M_NAME "arm64"
# endif

#elif defined (PJ_M_POWERPC) || defined(__powerpc) || defined(__powerpc__) || \
Expand Down
159 changes: 159 additions & 0 deletions pjmedia/build/pjmedia.vcxproj
View file
Open in desktop

Large diffs are not rendered by default.

188 changes: 186 additions & 2 deletions pjmedia/build/pjmedia_audiodev.vcxproj
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions pjmedia/build/pjmedia_audiodev.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@
<ClCompile Include="..\src\pjmedia-audiodev\wmme_dev.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\pjmedia-audiodev\wasapi_dev.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\include\pjmedia-audiodev\audiodev.h">
Expand Down
165 changes: 165 additions & 0 deletions pjmedia/build/pjmedia_codec.vcxproj
View file
Open in desktop

Large diffs are not rendered by default.

250 changes: 222 additions & 28 deletions pjmedia/build/pjmedia_test.vcxproj
View file
Open in desktop

Large diffs are not rendered by default.

168 changes: 167 additions & 1 deletion pjmedia/build/pjmedia_videodev.vcxproj
View file
Open in desktop

Large diffs are not rendered by default.

Loading