aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db>2014-06-22 20:46:48 +0000
committerdcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db>2014-06-22 20:46:48 +0000
commite8f8f7ed77442cd326e3dfb5de9e7d3ac1c3812b (patch)
treebf3b02fdf5fce6016c3bbfb537d05d5b2cac8a66
parent8801314afa614643d1d5120bf4dadd7e9964ed00 (diff)
Big oops. wrjpgcom on Windows was being built using the rdjpgcom source.
git-svn-id: svn://svn.code.sf.net/p/libjpeg-turbo/code/trunk@1325 632fc199-4ca6-4c93-a231-07263d6284db
-rw-r--r--CMakeLists.txt2
-rw-r--r--ChangeLog.txt2
2 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 307c495..42cb70a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -268,7 +268,7 @@ set_property(TARGET jpegtran-static PROPERTY COMPILE_FLAGS "-DUSE_SETMODE")
add_executable(rdjpgcom rdjpgcom.c)
-add_executable(wrjpgcom rdjpgcom.c)
+add_executable(wrjpgcom wrjpgcom.c)
#
diff --git a/ChangeLog.txt b/ChangeLog.txt
index e8b18af..b690133 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -77,6 +77,8 @@ set to JMSG_COPYRIGHT.
characters to be passed on the command line, which was causing it to generate
incorrect JPEG files.
+[12] Fixed a bug in the build system that was causing the Windows version of
+wrjpgcom to be built using the rdjpgcom code.
1.3.1