From ad8a5a95b2524291ffd4aaaef17ef7c28b4ee3ab Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 6 Jun 2016 14:38:54 +0200 Subject: [PATCH] Move and update CMakeList --- CMakeLists.txt => src/CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename CMakeLists.txt => src/CMakeLists.txt (55%) diff --git a/CMakeLists.txt b/src/CMakeLists.txt similarity index 55% rename from CMakeLists.txt rename to src/CMakeLists.txt index eb0052d0..c094ad96 100644 --- a/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,30 +3,30 @@ project (raylib) SET(PLATFORM_TO_USE "PLATFORM_DESKTOP" CACHE STRING "Platform to compile for") SET_PROPERTY(CACHE PLATFORM_TO_USE PROPERTY STRINGS PLATFORM_DESKTOP PLATFORM_RPI PLATFORM_WEB) -set(CMAKE_C_FLAGS "-O1 -Wall -std=gnu99 -fgnu89-inline") +set(CMAKE_C_FLAGS "-O1 -Wall -std=gnu99 -fgnu89-inline -Wno-missing-braces") IF(${PLATFORM_TO_USE} MATCHES "PLATFORM_DESKTOP") add_definitions(-DPLATFORM_DESKTOP, -DGRAPHICS_API_OPENGL_33) - include_directories("." "src/" "external/openal_soft/include" "external/glfw3/include") + include_directories("." "external/" "external/openal_soft/include" "external/glfw3/include") ENDIF() IF(${PLATFORM_TO_USE} MATCHES "PLATFORM_RPI") add_definitions(-DPLATFORM_RPI, -GRAPHICS_API_OPENGL_ES2) - include_directories("." "/opt/vc/include" "/opt/vc/include/interface/vmcs_host/linux" "/opt/vc/include/interface/vcos/pthreads") + include_directories("." "external/" "/opt/vc/include" "/opt/vc/include/interface/vmcs_host/linux" "/opt/vc/include/interface/vcos/pthreads") ENDIF() IF(${PLATFORM_TO_USE} MATCHES "PLATFORM_WEB") add_definitions(-DPLATFORM_WEB, -GRAPHICS_API_OPENGL_ES2) - include_directories("." "src/" "external/openal_soft/include" "external/glfw3/include") + include_directories("." "external/" "external/openal_soft/include" "external/glfw3/include") ENDIF() -file(GLOB SOURCES "src/*.c") +file(GLOB SOURCES "*.c" "external/*.c") add_library(raylib STATIC ${SOURCES}) -install(TARGETS raylib DESTINATION lib/) \ No newline at end of file +install(TARGETS raylib DESTINATION ../lib/) \ No newline at end of file