Return-Path: X-Original-To: apmail-corinthia-commits-archive@minotaur.apache.org Delivered-To: apmail-corinthia-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5B14A10728 for ; Fri, 13 Feb 2015 08:53:52 +0000 (UTC) Received: (qmail 40352 invoked by uid 500); 13 Feb 2015 08:53:52 -0000 Delivered-To: apmail-corinthia-commits-archive@corinthia.apache.org Received: (qmail 40334 invoked by uid 500); 13 Feb 2015 08:53:52 -0000 Mailing-List: contact commits-help@corinthia.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@corinthia.incubator.apache.org Delivered-To: mailing list commits@corinthia.incubator.apache.org Received: (qmail 40325 invoked by uid 99); 13 Feb 2015 08:53:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Feb 2015 08:53:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 13 Feb 2015 08:53:30 +0000 Received: (qmail 36414 invoked by uid 99); 13 Feb 2015 08:52:13 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Feb 2015 08:52:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3124BE08DB; Fri, 13 Feb 2015 08:52:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jani@apache.org To: commits@corinthia.incubator.apache.org Date: Fri, 13 Feb 2015 08:52:19 -0000 Message-Id: <1a1e79a6362447789115f5a647c1485f@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [07/38] incubator-corinthia git commit: Change location of external extractions X-Virus-Checked: Checked by ClamAV on apache.org Change location of external extractions The extract_downloads.bat script used folders within external/download for include, lib, and bin. The simplest correction was to change CMakeLists.txt to agree rather than make many more fixes to extract_downloads.bat. Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/f058c02a Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/f058c02a Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/f058c02a Branch: refs/heads/experimentZip Commit: f058c02a0100dc16f868745594788e96e1c84282 Parents: 2d96374 Author: Dennis Hamilton Authored: Fri Jan 9 14:43:30 2015 -0800 Committer: Dennis Hamilton Committed: Fri Jan 9 14:43:30 2015 -0800 ---------------------------------------------------------------------- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/f058c02a/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d1d41a..7eb3585 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,9 +42,9 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") set(INCLUDE_DIRS - ${PROJECT_SOURCE_DIR}/external/include) + ${PROJECT_SOURCE_DIR}/external/download/include) set(LIB_DIRS - ${PROJECT_SOURCE_DIR}/external/lib) + ${PROJECT_SOURCE_DIR}/external/download/lib) set(LIBS ${LIBS} libxml2 zdll iconv SDL2 SDL2_image) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4090 /wd4996") endif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")