You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@corinthia.apache.org by ja...@apache.org on 2015/08/09 20:59:43 UTC
[1/2] incubator-corinthia git commit: Removed iconv from CMake link
spec.
Repository: incubator-corinthia
Updated Branches:
refs/heads/master 4df29e8c6 -> 4248d6155
Removed iconv from CMake link spec.
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/c5c262d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/c5c262d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/c5c262d1
Branch: refs/heads/master
Commit: c5c262d1cfca82a45e6a52aba8b98f9c51909c25
Parents: 385501d
Author: jani <ja...@apache.org>
Authored: Sun Aug 9 20:58:58 2015 +0200
Committer: jani <ja...@apache.org>
Committed: Sun Aug 9 20:58:58 2015 +0200
----------------------------------------------------------------------
CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/c5c262d1/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9204de5..f4218bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,9 +47,9 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
set(LIB_DIRS ${CMAKE_BINARY_DIR}/target_lib)
set(CMAKE_C_FLAGS "/DWIN64 /D_WINDOWS /W3 /wd4090 /wd4996")
if(${CMAKE_GENERATOR_PLATFORM} MATCHES "x64")
- set(LIBS ${LIBS} libxml2_64 zlibwapi64 iconv64 SDL2_64 SDL2_image_64)
+ set(LIBS ${LIBS} libxml2_64 zlibwapi64 SDL2_64 SDL2_image_64)
else(${CMAKE_GENERATOR_PLATFORM} MATCHES "x64")
- set(LIBS ${LIBS} libxml2 zlibwapi iconv SDL2 SDL2_image)
+ set(LIBS ${LIBS} libxml2 zlibwapi SDL2 SDL2_image)
endif(${CMAKE_GENERATOR_PLATFORM} MATCHES "x64")
endif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
[2/2] incubator-corinthia git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-corinthia
Posted by ja...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-corinthia
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/4248d615
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/4248d615
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/4248d615
Branch: refs/heads/master
Commit: 4248d6155ac00de2d149ac62d2d241d292fa8e2b
Parents: c5c262d 4df29e8
Author: jani <ja...@apache.org>
Authored: Sun Aug 9 20:59:07 2015 +0200
Committer: jani <ja...@apache.org>
Committed: Sun Aug 9 20:59:07 2015 +0200
----------------------------------------------------------------------
.gitignore | 21 ++++++++-------------
iconv.txt | 29 -----------------------------
2 files changed, 8 insertions(+), 42 deletions(-)
----------------------------------------------------------------------