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/01/01 11:10:34 UTC

[12/19] incubator-corinthia git commit: work

work


Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/15f8e7f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/15f8e7f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/15f8e7f3

Branch: refs/heads/RTC_platform
Commit: 15f8e7f375197f5f08ddd8b2d95bf059985e97a5
Parents: 826c423
Author: jani <ja...@apache.org>
Authored: Tue Dec 30 17:03:24 2014 +0100
Committer: jani <ja...@apache.org>
Committed: Tue Dec 30 17:03:24 2014 +0100

----------------------------------------------------------------------
 CMakeLists.txt                           |  2 +-
 DocFormats/core/tests/names/NamesTests.c | 27 ---------------------------
 2 files changed, 1 insertion(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/15f8e7f3/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 274f230..9d1d41a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
         ${PROJECT_SOURCE_DIR}/external/include)
     set(LIB_DIRS
         ${PROJECT_SOURCE_DIR}/external/lib)
-    set(LIBS ${LIBS} libxml2 zlib libiconv SDL2 SDL2_image)
+    set(LIBS ${LIBS} libxml2 zdll iconv SDL2 SDL2_image)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4090 /wd4996")
 endif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/15f8e7f3/DocFormats/core/tests/names/NamesTests.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/tests/names/NamesTests.c b/DocFormats/core/tests/names/NamesTests.c
deleted file mode 100644
index 2e94015..0000000
--- a/DocFormats/core/tests/names/NamesTests.c
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "DFUnitTest.h"
-#include <stddef.h>
-
-static void test_sample(void)
-{
-}
-
-TestGroup NamesTests = {
-    "core.lib", {
-        { "sample", PlainTest, test_sample },
-        { NULL, PlainTest, NULL }
-    }
-};