From 98273f0152106dde09ab82f5f68332ca83582bb9 Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 16 Jul 2018 18:43:24 +0200 Subject: [PATCH] Reviewed compilation options --- examples/CMakeLists.txt | 4 ---- src/CMakeOptions.txt | 2 +- src/Makefile | 11 ++--------- src/config.h.in | 2 +- 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index fd65a74b..a71ec565 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -34,10 +34,6 @@ foreach(example_dir ${example_dirs}) endforeach() include(CheckIncludeFiles) -check_include_files(OVR_CAPI_GL.h HAVE_OCULUS_CAPI) -if(NOT HAVE_OCULUS_CAPI) - list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/others/oculus_rift.c) -endif() list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/others/standard_lighting.c) if(${PLATFORM} MATCHES "Android") diff --git a/src/CMakeOptions.txt b/src/CMakeOptions.txt index 4ed1a375..1a18039a 100644 --- a/src/CMakeOptions.txt +++ b/src/CMakeOptions.txt @@ -35,7 +35,7 @@ option(SUPPORT_GIF_RECORDING "Allow automatic gif recording of current screen pr option(SUPPORT_GESTURES_SYSTEM "Gestures module is included (gestures.h) to support gestures detection: tap, hold, swipe, drag" ON) option(SUPPORT_MOUSE_GESTURES "Mouse gestures are directly mapped like touches and processed by gestures system" ON) -# rlgl.c +# rlgl.h option(SUPPORT_VR_SIMULATOR "Support VR simulation functionality (stereo rendering)" ON) option(SUPPORT_DISTORTION_SHADER "Include stereo rendering distortion shader (shader_distortion.h)" ON) diff --git a/src/Makefile b/src/Makefile index ac9e7a1d..26233c95 100644 --- a/src/Makefile +++ b/src/Makefile @@ -411,7 +411,6 @@ endif # Define object required on compilation OBJS = core.o \ - rlgl.o \ shapes.o \ textures.o \ text.o \ @@ -524,23 +523,19 @@ endif # Compile all modules with their prerequisites # Compile core module -core.o : core.c raylib.h rlgl.h utils.h raymath.h gestures.h +core.o : core.c raylib.h rlgl.h utils.h raymath.h camera.h gestures.h $(CC) -c $< $(CFLAGS) $(INCLUDE_PATHS) -D$(PLATFORM) -D$(GRAPHICS) # Compile rglfw module rglfw.o : rglfw.c $(CC) $(GLFW_CFLAGS) -c $< $(CFLAGS) $(INCLUDE_PATHS) -D$(PLATFORM) -D$(GRAPHICS) -# Compile rlgl module -rlgl.o : rlgl.c rlgl.h raymath.h - $(CC) -c $< $(CFLAGS) $(INCLUDE_PATHS) -D$(PLATFORM) -D$(GRAPHICS) - # Compile shapes module shapes.o : shapes.c raylib.h rlgl.h $(CC) -c $< $(CFLAGS) $(INCLUDE_PATHS) -D$(PLATFORM) -D$(GRAPHICS) # Compile textures module -textures.o : textures.c rlgl.h utils.h +textures.o : textures.c raylib.h rlgl.h utils.h $(CC) -c $< $(CFLAGS) $(INCLUDE_PATHS) -D$(PLATFORM) -D$(GRAPHICS) # Compile text module @@ -610,7 +605,6 @@ ifeq ($(ROOT),root) cp --update raylib.h $(RAYLIB_H_INSTALL_PATH)/raylib.h cp --update raymath.h $(RAYLIB_H_INSTALL_PATH)/raymath.h cp --update rlgl.h $(RAYLIB_H_INSTALL_PATH)/rlgl.h - cp --update rlgl.c $(RAYLIB_H_INSTALL_PATH)/rlgl.c cp --update physac.h $(RAYLIB_H_INSTALL_PATH)/physac.h @echo "raylib development files installed/updated!" else @@ -639,7 +633,6 @@ ifeq ($(ROOT),root) rm --force --interactive --verbose $(RAYLIB_H_INSTALL_PATH)/raylib.h rm --force --interactive --verbose $(RAYLIB_H_INSTALL_PATH)/raymath.h rm --force --interactive --verbose $(RAYLIB_H_INSTALL_PATH)/rlgl.h - rm --force --interactive --verbose $(RAYLIB_H_INSTALL_PATH)/rlgl.c rm --force --interactive --verbose $(RAYLIB_H_INSTALL_PATH)/physac.h @echo "raylib development files removed!" else diff --git a/src/config.h.in b/src/config.h.in index d767560b..91f734b3 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -16,7 +16,7 @@ /* Allow automatic gif recording of current screen pressing CTRL+F12, defined in KeyCallback() */ #cmakedefine SUPPORT_GIF_RECORDING 1 -// rlgl.c +// rlgl.h /* Support VR simulation functionality (stereo rendering) */ #cmakedefine SUPPORT_VR_SIMULATOR 1 /* Include stereo rendering distortion shader (shader_distortion.h) */