diff options
| author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2020-07-10 11:02:53 +0000 |
|---|---|---|
| committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2020-07-10 11:02:53 +0000 |
| commit | 201ac5f4aa66cbda4b5be60af85de55cae41e33e (patch) | |
| tree | 45d5d6327c66d28ad308a16f5374749beaaa9a08 | |
| parent | 9dfda25061547d5d09d56e5134bd843a6bd0c178 (diff) | |
| parent | 3b95367222abf7520b7a4856be9873014189bc1a (diff) | |
Merge branch 'master' into 'master'
Visual Studio: Improve NMake Makefiles for ARM64 Windows builds (master branch)
See merge request cairo/cairomm!10
| -rw-r--r-- | MSVC_NMake/config-msvc.mak | 3 | ||||
| -rw-r--r-- | MSVC_NMake/detectenv-msvc.mak | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak index 4735b47..c2d0344 100644 --- a/MSVC_NMake/config-msvc.mak +++ b/MSVC_NMake/config-msvc.mak @@ -32,7 +32,8 @@ CAIROMM_BASE_CFLAGS = \ CAIROMM_EXTRA_INCLUDES = \ /I$(PREFIX)\include\sigc++-$(LIBSIGC_MAJOR_VERSION).$(LIBSIGC_MINOR_VERSION) \ - /I$(PREFIX)\lib\sigc++-$(LIBSIGC_MAJOR_VERSION).$(LIBSIGC_MINOR_VERSION)\include + /I$(PREFIX)\lib\sigc++-$(LIBSIGC_MAJOR_VERSION).$(LIBSIGC_MINOR_VERSION)\include \ + /I$(PREFIX)\include LIBCAIROMM_CFLAGS = /DCAIROMM_BUILD $(CAIROMM_BASE_CFLAGS) $(CAIROMM_EXTRA_INCLUDES) CAIROMM_EX_CFLAGS = $(CAIROMM_BASE_CFLAGS) $(CAIROMM_EXTRA_INCLUDES) diff --git a/MSVC_NMake/detectenv-msvc.mak b/MSVC_NMake/detectenv-msvc.mak index c687835..bf2e906 100644 --- a/MSVC_NMake/detectenv-msvc.mak +++ b/MSVC_NMake/detectenv-msvc.mak @@ -68,6 +68,8 @@ _HASH=^# && ![echo PLAT=Win32 >> vercl.x] \ && ![echo $(_HASH)elif defined(_M_AMD64) >> vercl.x] \ && ![echo PLAT=x64 >> vercl.x] \ + && ![echo $(_HASH)elif defined(_M_ARM64) >> vercl.x] \ + && ![echo PLAT=arm64 >> vercl.x] \ && ![echo $(_HASH)endif >> vercl.x] \ && ![cl -nologo -TC -P vercl.x $(ERRNUL)] !include vercl.i @@ -145,6 +147,8 @@ CFLAGS_ADD_NO_GL = $(CFLAGS_ADD) !if "$(PLAT)" == "x64" LDFLAGS_ARCH = /machine:x64 +!elseif "$(PLAT)" == "arm64" +LDFLAGS_ARCH = /machine:arm64 !else LDFLAGS_ARCH = /machine:x86 !endif |