corinthia-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [1/2] incubator-corinthia git commit: made reservation for downloaded external libraries. CMakeList.txt assumes the external libraries are in "external/lib" and "external/include" README files have been added to show exactly what we expect in the 2 subdi
Date Sun, 21 Dec 2014 09:28:54 GMT
Repository: incubator-corinthia
Updated Branches:
  refs/heads/master eac26b67c -> 8d3e8e311


made reservation for downloaded external libraries.
CMakeList.txt assumes the external libraries are in "external/lib" and "external/include"
README files have been added to show exactly what we expect in the 2 subdirs.


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

Branch: refs/heads/master
Commit: 1844ba3560db8acf1e255faa16337a794472cfa8
Parents: 58f9d38
Author: jani <jani@apache.org>
Authored: Sat Dec 20 23:22:17 2014 +0100
Committer: jani <jani@apache.org>
Committed: Sat Dec 20 23:22:17 2014 +0100

----------------------------------------------------------------------
 CMakeLists.txt              | 14 ++-----
 external/README.txt         | 15 ++++++++
 external/include/README.txt | 81 ++++++++++++++++++++++++++++++++++++++++
 external/include/unistd.h   |  3 ++
 external/lib/README.txt     | 10 +++++
 5 files changed, 112 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/1844ba35/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef639ba..1d3e1c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,18 +24,10 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
     set(INCLUDE_DIRS
-        ${PROJECT_SOURCE_DIR}/libs/zlib/include
-        ${PROJECT_SOURCE_DIR}/libs/iconv/include
-        ${PROJECT_SOURCE_DIR}/libs/libxml2/include
-        ${PROJECT_SOURCE_DIR}/libs/SDL2/include
-        ${PROJECT_SOURCE_DIR}/libs/SDL2_image/include)
+        ${PROJECT_SOURCE_DIR}/external/include)
     set(LIB_DIRS
-        ${PROJECT_SOURCE_DIR}/libs/zlib/lib
-        ${PROJECT_SOURCE_DIR}/libs/iconv/lib
-        ${PROJECT_SOURCE_DIR}/libs/libxml2/lib
-        ${PROJECT_SOURCE_DIR}/libs/SDL2/lib/x86
-        ${PROJECT_SOURCE_DIR}/libs/SDL2_image/lib/x86)
-    set(LIBS ${LIBS} libxml2 zdll iconv SDL2 SDL2_image)
+        ${PROJECT_SOURCE_DIR}/external/lib)
+    set(LIBS ${LIBS} libxml2 zlib libiconv 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/1844ba35/external/README.txt
----------------------------------------------------------------------
diff --git a/external/README.txt b/external/README.txt
new file mode 100644
index 0000000..fa95d9a
--- /dev/null
+++ b/external/README.txt
@@ -0,0 +1,15 @@
+Download external developer libraries to here, and you dont need to modify CMakeList.txt
+
+in order to compile on windows you need:
+
+Zlib developer files from http://gnuwin32.sourceforge.net/packages/zlib.htm
+Iconv developer files from http://gnuwin32.sourceforge.net/packages/libiconv.htm
+libxml2 developer files from ftp://ftp.zlatkovic.com/libxml/64bit/
+SDL2 developer files from https://www.libsdl.org/download-2.0.php
+SDL2_image developer files from https://www.libsdl.org/projects/SDL_image/
+
+you might also need:
+unistd.h from http://sourceforge.net/p/mingw/mingw-org-wsl/ci/master/tree/include/
+
+
+We are working on reducing these dependencies.

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/1844ba35/external/include/README.txt
----------------------------------------------------------------------
diff --git a/external/include/README.txt b/external/include/README.txt
new file mode 100644
index 0000000..83b370f
--- /dev/null
+++ b/external/include/README.txt
@@ -0,0 +1,81 @@
+put the downloaded external header files here.
+
+The content should be:
+   zlib.h
+   zconf.h
+
+   SDL.h
+   SDL_main.h
+   SDL_image.h
+   SDL_stdinc.h
+   SDL_config.h
+   SDL_platform.h
+   SDL_assert.h
+   SDL_atomic.h
+   SDL_audio.h
+   SDL_error.h
+   SDL_endian.h
+   SDL_mutex.h
+   SDL_thread.h
+   SDL_rwops.h
+   SDL_clipboard.h
+   SDL_cpuinfo.h
+   SDL_events.h
+   SDL_video.h
+   SDL_pixels.h
+   SDL_rect.h
+   SDL_surface.h
+   SDL_blendmode.h
+   SDL_keyboard.h
+   SDL_mouse.h
+   SDL_joystick.h
+   SDL_gamecontroller.h
+   SDL_quit.h
+   SDL_gesture.h
+   SDL_touch.h
+   SDL_keycode.h
+   SDL_scancode.h
+   SDL_filesystem.h
+   SDL_haptic.h
+   SDL_hints.h
+   SDL_loadso.h
+   SDL_log.h
+   SDL_messagebox.h
+   SDL_power.h
+   SDL_render.h
+   SDL_system.h
+   SDL_timer.h
+   SDL_version.h
+   begin_code.h
+   close_code.h
+ 
+   libxml/tree.h
+   libxml/xmlwriter.h
+   libxml/xmlversion.h
+   libxml/xmlexports.h
+   libxml/xmlstring.h
+   libxml/xmlregexp.h
+   libxml/dict.h
+   libxml/xmlmemory.h
+   libxml/thread.h
+   libxml/globals.h
+   libxml/parser.h
+   libxml/hash.h
+   libxml/valid.h
+   libxml/xmlerror.h
+   libxml/list.h
+   libxml/xmlautomata.h
+   libxml/entities.h
+   libxml/encoding.h
+   libxml/xmlIO.h
+   libxml/SAX.h
+   libxml/SAX2.h
+   libxml/xlink.h
+
+   iconv.h
+
+
+
+
+
+

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/1844ba35/external/include/unistd.h
----------------------------------------------------------------------
diff --git a/external/include/unistd.h b/external/include/unistd.h
new file mode 100644
index 0000000..5f82577
--- /dev/null
+++ b/external/include/unistd.h
@@ -0,0 +1,3 @@
+/**
+ Dummy file to satisfy zconf.h includes
+ **/

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/1844ba35/external/lib/README.txt
----------------------------------------------------------------------
diff --git a/external/lib/README.txt b/external/lib/README.txt
new file mode 100644
index 0000000..d20f6ad
--- /dev/null
+++ b/external/lib/README.txt
@@ -0,0 +1,10 @@
+Put the downloaded external libraries here.
+
+The content should be:
+   libxml2.lib
+   zlib.h
+   libiconv.lib
+   SDL2.lib
+   SDL2_image.lib
+
+


Mime
View raw message