From df207430c90ee56a2277525a2fd879bc27f628e8 Mon Sep 17 00:00:00 2001 From: John Camp Date: Sun, 13 Nov 2016 12:36:55 -0500 Subject: Remove unused cmake variable --- ports/pdcurses/portfile.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/pdcurses/portfile.cmake b/ports/pdcurses/portfile.cmake index 8ba0f99ba..ab5a14e2e 100644 --- a/ports/pdcurses/portfile.cmake +++ b/ports/pdcurses/portfile.cmake @@ -17,7 +17,6 @@ vcpkg_extract_source_archive(${ARCHIVE}) set(PDC_NMAKE_CMD ${NMAKE} -f vcwin32.mak WIDE=Y UTF8=Y) set(PDC_NMAKE_CWD ${SOURCE_PATH}/win32) set(PDC_PDCLIB ${SOURCE_PATH}/win32/pdcurses) -set(PDC_OUTPUT bin) if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(PDC_NMAKE_CMD ${PDC_NMAKE_CMD} DLL=Y) -- cgit v1.2.3 From 10f140355596d6fc134bfb28bed257d6461866d3 Mon Sep 17 00:00:00 2001 From: John Camp Date: Tue, 15 Nov 2016 14:33:02 -0500 Subject: Adds PDBs and 64-bit builds to PDCurses --- ports/pdcurses/portfile.cmake | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ports/pdcurses/portfile.cmake b/ports/pdcurses/portfile.cmake index ab5a14e2e..658e4ed19 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,16 @@ 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 vcwin32.mak WIDE=Y UTF8=Y) set(PDC_NMAKE_CWD ${SOURCE_PATH}/win32) set(PDC_PDCLIB ${SOURCE_PATH}/win32/pdcurses) +file(READ ${SOURCE_PATH}/win32/vcwin32.mak PDC_MAK) +string(REPLACE "-Z7" "-ZI -Fdpdcurses.pdb" PDC_MAK ${PDC_MAK}) +string(REPLACE " -pdb:none" "" PDC_MAK ${PDC_MAK}) +string(REPLACE "/MACHINE:IX86 " "" PDC_MAK ${PDC_MAK}) +file(WRITE ${SOURCE_PATH}/win32/vcwin32.mak ${PDC_MAK}) + if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(PDC_NMAKE_CMD ${PDC_NMAKE_CMD} DLL=Y) endif() -- cgit v1.2.3 From 51b98484d751aabf48842dbdd92158ebb1b740d1 Mon Sep 17 00:00:00 2001 From: John Camp Date: Tue, 15 Nov 2016 14:50:38 -0500 Subject: Write to and use separate .mak file Allows future changes to not be affected by cached buildtree --- ports/pdcurses/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/pdcurses/portfile.cmake b/ports/pdcurses/portfile.cmake index 658e4ed19..93cc146f7 100644 --- a/ports/pdcurses/portfile.cmake +++ b/ports/pdcurses/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive(${ARCHIVE}) -set(PDC_NMAKE_CMD ${NMAKE} /A -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) @@ -18,7 +18,7 @@ file(READ ${SOURCE_PATH}/win32/vcwin32.mak PDC_MAK) string(REPLACE "-Z7" "-ZI -Fdpdcurses.pdb" PDC_MAK ${PDC_MAK}) string(REPLACE " -pdb:none" "" PDC_MAK ${PDC_MAK}) string(REPLACE "/MACHINE:IX86 " "" PDC_MAK ${PDC_MAK}) -file(WRITE ${SOURCE_PATH}/win32/vcwin32.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) -- cgit v1.2.3 From 46761d7e340eca3302a4b66137463f3902a8a30a Mon Sep 17 00:00:00 2001 From: John Camp Date: Tue, 15 Nov 2016 19:50:29 -0500 Subject: Return to C7 debugging output --- ports/pdcurses/portfile.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/pdcurses/portfile.cmake b/ports/pdcurses/portfile.cmake index 93cc146f7..4c43e68d2 100644 --- a/ports/pdcurses/portfile.cmake +++ b/ports/pdcurses/portfile.cmake @@ -15,7 +15,6 @@ set(PDC_NMAKE_CWD ${SOURCE_PATH}/win32) set(PDC_PDCLIB ${SOURCE_PATH}/win32/pdcurses) file(READ ${SOURCE_PATH}/win32/vcwin32.mak PDC_MAK) -string(REPLACE "-Z7" "-ZI -Fdpdcurses.pdb" PDC_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}) -- cgit v1.2.3