Skip to content

Commit

Permalink
use created binary of nasm on Windows UWP
Browse files Browse the repository at this point in the history
Was changed before to create own binary as depend, but in conflict
on some cases by UWP build where it try to create for target and not for
host.
  • Loading branch information
AlwinEsch committed Nov 28, 2019
1 parent f4b8726 commit a49bd2b
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 51 deletions.

This file was deleted.

28 changes: 4 additions & 24 deletions depends/windowsstore/nasmw/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,27 +1,7 @@
cmake_minimum_required(VERSION 3.5)
project(nasmw)

include(ExternalProject)

# Prevent this on UWP ARM build
if(NOT CMAKE_GENERATOR MATCHES ARM)
externalproject_add(nasmw
SOURCE_DIR ${PROJECT_SOURCE_DIR}
BINARY_DIR ${PROJECT_SOURCE_DIR}
INSTALL_DIR ${PROJECT_SOURCE_DIR}
CONFIGURE_COMMAND ""
BUILD_COMMAND nmake /f Mkfiles/msvc.mak
INSTALL_COMMAND "")
else()
externalproject_add(nasmw
SOURCE_DIR ${PROJECT_SOURCE_DIR}
BINARY_DIR ${PROJECT_SOURCE_DIR}
INSTALL_DIR ${PROJECT_SOURCE_DIR}
CONFIGURE_COMMAND ""
BUILD_COMMAND cmake -E echo "NASM not used on UWP ARM"
INSTALL_COMMAND "")
endif()

install(PROGRAMS nasm.exe DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
RENAME nasmw.exe
OPTIONAL)
install(
DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
)
2 changes: 1 addition & 1 deletion depends/windowsstore/nasmw/nasmw.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b34bae344a3f2ed93b2ca7bf25f1ed3fb12da89eeda6096e3551fd66adeae9fc
250f9b5eeb2111e8c7b494a977490985b8604fe7518a6f5041cde37cc727a067
2 changes: 1 addition & 1 deletion depends/windowsstore/nasmw/nasmw.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nasmw http://mirrors.kodi.tv/build-deps/sources/nasm-2.14.02.tar.gz
nasmw http://mirrors.kodi.tv/build-deps/sources/nasm-2.14.02-win32.zip

0 comments on commit a49bd2b

Please sign in to comment.