diff options
| author | Stanislav Ershov <digital.stream.of.mind@gmail.com> | 2018-06-02 02:26:55 +0300 |
|---|---|---|
| committer | Stanislav Ershov <digital.stream.of.mind@gmail.com> | 2018-06-02 02:39:29 +0300 |
| commit | 6e204b2be7091f4b0653674dcefa53648f2618ec (patch) | |
| tree | d5ad39fe1394ac581ec1c64abeb8b49c9a886036 | |
| parent | 3fc54807cb9b0bf242f8a2e7d1035bdbbd591aac (diff) | |
| download | vcpkg-6e204b2be7091f4b0653674dcefa53648f2618ec.tar.gz vcpkg-6e204b2be7091f4b0653674dcefa53648f2618ec.zip | |
Update PDCurses to 3.6
| -rw-r--r-- | ports/pdcurses/CONTROL | 2 | ||||
| -rw-r--r-- | ports/pdcurses/portfile.cmake | 24 |
2 files changed, 7 insertions, 19 deletions
diff --git a/ports/pdcurses/CONTROL b/ports/pdcurses/CONTROL index befa5c2fc..29cbff29b 100644 --- a/ports/pdcurses/CONTROL +++ b/ports/pdcurses/CONTROL @@ -1,3 +1,3 @@ Source: pdcurses -Version: 3.4-1 +Version: 3.6 Description: Public Domain Curses - a curses library for environments that don't fit the termcap/terminfo model. diff --git a/ports/pdcurses/portfile.cmake b/ports/pdcurses/portfile.cmake index f9db020b9..8581b5583 100644 --- a/ports/pdcurses/portfile.cmake +++ b/ports/pdcurses/portfile.cmake @@ -9,8 +9,8 @@ find_program(NMAKE nmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wmcbrine/PDCurses - REF PDCurses_3_4 - SHA512 a05065c2e43771bf769f25f229b6058c4dc6add65d993f2e304e98bded8a8af88e674638c7385383451fddc45cf3bd8c9a95febffc7abcbcce0e6384e4f397b3 + REF 3.6 + SHA512 1ed34e7eb791c9e00aae60878339e79f6b3af086c45d88d2b59d9b2b4020481ff5a5c21e078e59ae24f2de3b4d412f0240f21a50eb743f7e172c832a7e17ed5e HEAD_REF master ) @@ -24,23 +24,11 @@ file(COPY ${SOURCES} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") -file(READ ${SOURCE_PATH}/win32/vcwin32.mak PDC_MAK_ORIG) -string(REPLACE " -pdb:none" "" PDC_MAK_ORIG ${PDC_MAK_ORIG}) - -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - string(REPLACE "/MACHINE:IX86 " "/MACHINE:X64 " PDC_MAK_X64 ${PDC_MAK_ORIG}) - file(WRITE ${SOURCE_PATH}/win32/vcpkg_x64.mak ${PDC_MAK_X64}) - set(PDC_NMAKE_CMD ${NMAKE} /A -f vcpkg_x64.mak WIDE=Y UTF8=Y) -elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - string(REPLACE "/MACHINE:IX86 " "/MACHINE:X86 " PDC_MAK_X86 ${PDC_MAK_ORIG}) - file(WRITE ${SOURCE_PATH}/win32/vcpkg_x86.mak ${PDC_MAK_X86}) - set(PDC_NMAKE_CMD ${NMAKE} /A -f vcpkg_x86.mak WIDE=Y UTF8=Y) -else() - message(FATAL_ERROR "Unsupported target architecture: ${VCPKG_TARGET_ARCHITECTURE}") -endif() +set(PDC_NMAKE_CMD ${NMAKE} /A -f ${SOURCE_PATH}/wincon/Makefile.vc WIDE=Y UTF8=Y) + -set(PDC_NMAKE_CWD ${SOURCE_PATH}/win32) -set(PDC_PDCLIB ${SOURCE_PATH}/win32/pdcurses) +set(PDC_NMAKE_CWD ${SOURCE_PATH}/wincon) +set(PDC_PDCLIB ${SOURCE_PATH}/wincon/pdcurses) if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(PDC_NMAKE_CMD ${PDC_NMAKE_CMD} DLL=Y) |