aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkrismattheus <kris.mattheus@visionbms.com>2018-12-19 15:32:03 +0100
committerkrismattheus <kris.mattheus@visionbms.com>2018-12-19 15:32:03 +0100
commit2cad8b53dd8bc6968de516aea97882219092e52f (patch)
tree41c0094608c0fa659dbaea93faa2c3c27cf8592c
parentd40eb181742082f25c1de6a829552174ae0350d7 (diff)
downloadvcpkg-2cad8b53dd8bc6968de516aea97882219092e52f.tar.gz
vcpkg-2cad8b53dd8bc6968de516aea97882219092e52f.zip
[pthreads] add version resource and fix problem with PTW32_ARCH when compiling resource.
Signed-off-by: krismattheus <kris.mattheus@visionbms.com>
-rw-r--r--ports/pthreads/CMakeLists.txt4
-rw-r--r--ports/pthreads/CONTROL2
2 files changed, 3 insertions, 3 deletions
diff --git a/ports/pthreads/CMakeLists.txt b/ports/pthreads/CMakeLists.txt
index 7ae6bcc34..70317b460 100644
--- a/ports/pthreads/CMakeLists.txt
+++ b/ports/pthreads/CMakeLists.txt
@@ -28,6 +28,7 @@ set(PTHREAD_SHARED_SOURCES
sync.c
tsd.c
attr.C
+ version.rc
)
set(PTHREAD_STATIC_SOURCES
autostatic.c
@@ -169,8 +170,7 @@ set(PTHREAD_STATIC_SOURCES
-option(PTW32_ARCH "x32")
-add_definitions(-DPTW32_ARCH=${PTW32_ARCH} -DPTW32_RC_MSC -DHAVE_PTW32_CONFIG_H -D_TIMESPEC_DEFINED)
+add_definitions(-DPTW32_ARCH="${PTW32_ARCH}" -DPTW32_RC_MSC -DHAVE_PTW32_CONFIG_H -D_TIMESPEC_DEFINED)
if(BUILD_SHARED_LIBS)
set(PTHREAD_SOURCES ${PTHREAD_SHARED_SOURCES})
diff --git a/ports/pthreads/CONTROL b/ports/pthreads/CONTROL
index ab02fb415..53b710f2a 100644
--- a/ports/pthreads/CONTROL
+++ b/ports/pthreads/CONTROL
@@ -1,3 +1,3 @@
Source: pthreads
-Version: 2.9.1-2
+Version: 2.9.1-3
Description: pthreads for windows