aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alex@karatarakis.com>2016-11-16 12:46:00 -0800
committerGitHub <noreply@github.com>2016-11-16 12:46:00 -0800
commit97d5b082b76290f5f2356753c01396a080bc2fba (patch)
tree44c96fb7b53e1bd7369d83379809c51c1395fe1b
parent42df44ca7bba06dfadb6ac7a0e2c7fe611cd6121 (diff)
parent46761d7e340eca3302a4b66137463f3902a8a30a (diff)
downloadvcpkg-97d5b082b76290f5f2356753c01396a080bc2fba.tar.gz
vcpkg-97d5b082b76290f5f2356753c01396a080bc2fba.zip
Merge pull request #290 from jjcamp/pdcurses
Adds PDBs and 64bit builds to PDCurses
-rw-r--r--ports/pdcurses/portfile.cmake12
1 files changed, 6 insertions, 6 deletions
diff --git a/ports/pdcurses/portfile.cmake b/ports/pdcurses/portfile.cmake
index 8ba0f99ba..4c43e68d2 100644
--- a/ports/pdcurses/portfile.cmake
+++ b/ports/pdcurses/portfile.cmake
@@ -1,8 +1,4 @@
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64)
- message(FATAL_ERROR "64-bit builds are not supported for PDCurses.")
-endif()
-
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src)
find_program(NMAKE nmake)
@@ -14,10 +10,14 @@ vcpkg_download_distfile(ARCHIVE
)
vcpkg_extract_source_archive(${ARCHIVE})
-set(PDC_NMAKE_CMD ${NMAKE} -f vcwin32.mak WIDE=Y UTF8=Y)
+set(PDC_NMAKE_CMD ${NMAKE} /A -f vcpkg.mak WIDE=Y UTF8=Y)
set(PDC_NMAKE_CWD ${SOURCE_PATH}/win32)
set(PDC_PDCLIB ${SOURCE_PATH}/win32/pdcurses)
-set(PDC_OUTPUT bin)
+
+file(READ ${SOURCE_PATH}/win32/vcwin32.mak PDC_MAK)
+string(REPLACE " -pdb:none" "" PDC_MAK ${PDC_MAK})
+string(REPLACE "/MACHINE:IX86 " "" PDC_MAK ${PDC_MAK})
+file(WRITE ${SOURCE_PATH}/win32/vcpkg.mak ${PDC_MAK})
if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
set(PDC_NMAKE_CMD ${PDC_NMAKE_CMD} DLL=Y)