cmake

Author: nlichtenberg

CMakeLists.txt

@@ -3,18 +3,21 @@ project(KoRE)
 
 # For custom cmake modules.
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+LINK_DIRECTORIES(${CMAKE_SOURCE_DIR}/lib)
 
 include(GetOpenGLHeaders)
 
 if(WIN32 AND NOT EXISTS ${CMAKE_SOURCE_DIR}/ext)
   message("No ext dir. Will make one.")
-  execute_process(COMMAND ${PYTHON_VER} scripts/updateExt.py)
+  #execute_process(COMMAND ${PYTHON_VER} scripts/updateExt.py)
+  execute_process(COMMAND sh scripts/updateExt.msys)
 endif()
 
 check_gl_headers()
 
 set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/lib)
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin)
+set(CMAKE_LIBRARY_PATH ${CMAKE_SOURCE_DIR}/lib)
 
 if(CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_CXX_FLAGS "-std=c++0x")
@@ -40,6 +43,8 @@ if(WIN32)
   add_definitions(-DGLFW_INCLUDE_GL3)
 endif()
 
+set(CMAKE_LIBRARY_PATH  "${CMAKE_SOURCE_DIR}/lib")
+
 #if(MSVC)
 #  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ext/include)
 #  message("Hello MSVC")

demos/MainGLFW/CMakeLists.txt

@@ -2,8 +2,17 @@ file(GLOB_RECURSE SOURCES *.cpp)
 
 add_executable(MainGLFW ${SOURCES})
 
+#linking against a custom library
+target_link_libraries(MainGLFW D:/GitHub/KoRE/lib Assimp32d.dll)
+target_link_libraries(MainGLFW D:/GitHub/KoRE/lib assimp)
+target_link_libraries(MainGLFW D:/GitHub/KoRE/lib tinyxml.a)
+target_link_libraries(MainGLFW D:/GitHub/KoRE/lib glew32.a)
+target_link_libraries(MainGLFW D:/GitHub/KoRE/lib glfw.a)
+
+
 if(WIN32)
   set(EXT_LIBS ${CMAKE_SOURCE_DIR}/ext/lib)
+  set(CMAKE_LIBRARY_PATH ${CMAKE_SOURCE_DIR}/lib)
   if(MSVC)
     link_directories(${EXT_LIBS})
 	  set(KoRE_LIBS
@@ -17,15 +26,17 @@ if(WIN32)
 	else()
 	#MinGW
 		  set(KoRE_LIBS
-	    #${EXT_LIBS}/mingw/libglfw.a
+	    #${EXT_LIBS}/libglfw.a
 	    #${EXT_LIBS}/glew32.lib
-	    #${EXT_LIBS}/assimp_release-dll_win32/assimp.lib
+	    #${EXT_LIBS}/libglew32.a
+	    #${EXT_LIBS}/assimp_debug-dll_win32/assimp.lib
 	    #OpenGL32
 	    #glaux
 	    #glu32
 	    opengl32
 	    glfw
 	    glew32
+	    tinyxml
 	    KoRE 
 	    )
 

scripts/updateExt.msys

@@ -28,8 +28,8 @@ wget --no-check-certificate --directory-prefix=$downloadDir https://sourceforge.
 wget --no-check-certificate --directory-prefix=$downloadDir http://sourceforge.net/projects/glfw/files/glfw/2.7.7/glfw-2.7.7.tar.gz/
 wget --no-check-certificate --directory-prefix=$downloadDir http://sourceforge.net/projects/ogl-math/files/glm-0.9.4.1/glm-0.9.4.1.zip/
 wget --no-check-certificate --directory-prefix=$downloadDir http://sourceforge.net/projects/assimp/files/assimp-3.0/assimp--3.0.1270-full.zip/
-
-
+wget --no-check-certificate --directory-prefix=$downloadDir http://sourceforge.net/projects/tinyxml/files/latest/
+wget --no-check-certificate --directory-prefix=$downloadDir www.opengl.org/registry/api/gl3.h
 # Unpack files
 for D in $(find $downloadDir -mindepth 1 -maxdepth 1 -type f) ; do
 	if [[ $D == *.tgz || $D == *.gz ]]; 
@@ -46,6 +46,13 @@ done
 # remove archives
 #rm $downloadDir/glew-1.9.0.tgz
 
+# build tinyxml
+cd $downloadDir/tinyxml_2_6_2/tinyxml
+printf "Building TinyXML \n"
+ming32-make
+ar rc libtinyxml.a tinyxml.o tinyxmlparser.o tinyxmlerror.o
+cd ../../../..
+
 # build glew
 cd $downloadDir/glew-1.9.0
 printf "Building GLEW \n"