diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2016-12-02 11:48:09 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2016-12-02 11:48:09 -0800 |
| commit | 68a3cad1b85a73edd6632d3e8151465a712caac0 (patch) | |
| tree | fcc7fbe61a03a2a2785d1718eb128ea80dabe314 | |
| parent | 25b6ef7a9d4ad73ae6123be715a7904c101f31fc (diff) | |
| parent | bdbf98a7305eb3518f687c7084308c8a4f285d24 (diff) | |
| download | vcpkg-68a3cad1b85a73edd6632d3e8151465a712caac0.tar.gz vcpkg-68a3cad1b85a73edd6632d3e8151465a712caac0.zip | |
Merge branch 'phsucharee-master'
| -rw-r--r-- | ports/jxrlib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ports/jxrlib/CONTROL | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ports/jxrlib/CMakeLists.txt b/ports/jxrlib/CMakeLists.txt index d9ac84fb6..17f16bea4 100644 --- a/ports/jxrlib/CMakeLists.txt +++ b/ports/jxrlib/CMakeLists.txt @@ -62,7 +62,7 @@ JXR_MAKE_OBJ(ENC) add_library(jpegxr ${OBJ_ENC} ${OBJ_DEC} ${OBJ_SYS}) set_property(TARGET jpegxr - PROPERTY COMPILE_DEFINITIONS __ANSI__ DISABLE_PERF_MEASUREMENT ${DEF_ENDIAN} + PROPERTY COMPILE_DEFINITIONS DISABLE_PERF_MEASUREMENT ${DEF_ENDIAN} ) set_property(TARGET jpegxr PROPERTY LINK_INTERFACE_LIBRARIES "") install(TARGETS jpegxr @@ -80,7 +80,7 @@ JXR_MAKE_OBJ(TEST) add_library(jxrglue ${OBJ_GLUE} ${OBJ_TEST}) set_property(TARGET jxrglue - PROPERTY COMPILE_DEFINITIONS __ANSI__ DISABLE_PERF_MEASUREMENT ${DEF_ENDIAN} + PROPERTY COMPILE_DEFINITIONS DISABLE_PERF_MEASUREMENT ${DEF_ENDIAN} ) set_property(TARGET jxrglue PROPERTY LINK_INTERFACE_LIBRARIES "") install(TARGETS jxrglue diff --git a/ports/jxrlib/CONTROL b/ports/jxrlib/CONTROL index 7c3d5d603..062850e06 100644 --- a/ports/jxrlib/CONTROL +++ b/ports/jxrlib/CONTROL @@ -1,3 +1,3 @@ Source: jxrlib -Version: 1.1-1 +Version: 1.1-2 Description: Open source implementation of the jpegxr image format standard. |