alice.mosphere.at / sdl-gpu
this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Reorganized project layout. Moved includes into include/ and source files into src/. Renamed some source files. Updated CMakeLists and Android.mk.

grimfang4@gmail.com 748ea7ea 15a1aba7

+82 -90
+28
Android.mk
··· 1 + LOCAL_PATH := $(call my-dir) 2 + 3 + include $(CLEAR_VARS) 4 + 5 + LOCAL_MODULE := SDL2_gpu 6 + 7 + SDL_GPU_DIR := ./ 8 + STB_IMAGE_DIR := $(SDL_GPU_DIR)/src/externals/stb_image 9 + 10 + LOCAL_CFLAGS := -I$(LOCAL_PATH)/../SDL/include -I$(LOCAL_PATH)/$(SDL_GPU_DIR)/include -I$(LOCAL_PATH)/$(STB_IMAGE_DIR) 11 + 12 + LOCAL_SRC_FILES := $(SDL_GPU_DIR)/SDL_gpu.c \ 13 + $(SDL_GPU_DIR)/SDL_gpu_matrix.c \ 14 + $(SDL_GPU_DIR)/SDL_gpu_renderer.c \ 15 + $(SDL_GPU_DIR)/SDL_gpu_shapes.c \ 16 + $(SDL_GPU_DIR)/renderer_GLES_1.c \ 17 + $(SDL_GPU_DIR)/renderer_GLES_2.c \ 18 + $(STB_IMAGE_DIR)/stb_image.c \ 19 + $(STB_IMAGE_DIR)/stb_image_write.c 20 + 21 + 22 + LOCAL_CFLAGS += -DSDL_GPU_DISABLE_OPENGL -DSTBI_FAILURE_USERMSG -O3 23 + #LOCAL_LDLIBS += -llog -lGLESv1_CM 24 + LOCAL_LDLIBS += -llog -lGLESv2 -lGLESv1_CM 25 + 26 + LOCAL_SHARED_LIBRARIES := SDL2 27 + 28 + include $(BUILD_SHARED_LIBRARY)
+6 -12
CMakeLists.txt
··· 27 27 option(SDL_gpu_DISABLE_GLES_2 "Disable OpenGLES 2.X renderer" OFF) 28 28 option(SDL_gpu_DISABLE_GLES_3 "Disable OpenGLES 3.X renderer" OFF) 29 29 30 - set(SDL_gpu_VERSION 0.9.0) 30 + set(SDL_gpu_VERSION 0.10.0) 31 31 32 32 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/scripts) 33 33 ··· 150 150 endif (NOT WIN32) 151 151 152 152 # Make local includes look in the right places 153 - include_directories(SDL_gpu) 154 - include_directories(SDL_gpu/GL_common) 155 - include_directories(SDL_gpu/OpenGL_1_BASE) 156 - include_directories(SDL_gpu/OpenGL_1) 157 - include_directories(SDL_gpu/OpenGL_2) 158 - include_directories(SDL_gpu/OpenGL_3) 159 - include_directories(SDL_gpu/GLES_1) 160 - include_directories(SDL_gpu/GLES_2) 153 + include_directories(include) 154 + include_directories(src) 161 155 162 156 if(NOT GLEW_FOUND) 163 - include_directories(SDL_gpu/externals/glew) 157 + include_directories(src/externals/glew) 164 158 endif(NOT GLEW_FOUND) 165 159 166 160 if(NOT STBI_FOUND) 167 - include_directories(SDL_gpu/externals/stb_image) 161 + include_directories(src/externals/stb_image) 168 162 add_definitions("-DSTBI_FAILURE_USERMSG") 169 163 endif(NOT STBI_FOUND) 170 164 ··· 172 166 add_definitions("-Wall -std=c99 -pedantic") 173 167 174 168 # Build the SDL_gpu library. 175 - add_subdirectory(SDL_gpu) 169 + add_subdirectory(src) 176 170 177 171 # Build the demos 178 172 if(SDL_gpu_BUILD_DEMOS)
+1 -1
Doxyfile
··· 648 648 # directories like "/usr/src/myproject". Separate the files or directories 649 649 # with spaces. 650 650 651 - INPUT = SDL_gpu 651 + INPUT = include src 652 652 653 653 # This tag can be used to specify the character encoding of the source files 654 654 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-28
SDL_gpu/Android.mk
··· 1 - LOCAL_PATH := $(call my-dir) 2 - 3 - include $(CLEAR_VARS) 4 - 5 - LOCAL_MODULE := SDL2_gpu 6 - 7 - SDL_GPU_DIR := ./ 8 - STB_IMAGE_DIR := $(SDL_GPU_DIR)/externals/stb_image 9 - 10 - LOCAL_CFLAGS := -I$(LOCAL_PATH)/../SDL/include -I$(LOCAL_PATH)/$(SDL_GPU_DIR) -I$(LOCAL_PATH)/$(RENDERER_DIR) -I$(LOCAL_PATH)/$(STB_IMAGE_DIR) 11 - 12 - LOCAL_SRC_FILES := $(SDL_GPU_DIR)/SDL_gpu.c \ 13 - $(SDL_GPU_DIR)/SDL_gpu_Renderer.c \ 14 - $(SDL_GPU_DIR)/SDL_gpuShapes.c \ 15 - $(SDL_GPU_DIR)/GL_common/SDL_gpu_GL_matrix.c \ 16 - $(SDL_GPU_DIR)/GLES_1/SDL_gpu_GLES_1.c \ 17 - $(SDL_GPU_DIR)/GLES_2/SDL_gpu_GLES_2.c \ 18 - $(STB_IMAGE_DIR)/stb_image.c \ 19 - $(STB_IMAGE_DIR)/stb_image_write.c 20 - 21 - 22 - LOCAL_CFLAGS += -DSDL_GPU_DISABLE_OPENGL -DSTBI_FAILURE_USERMSG -O3 23 - #LOCAL_LDLIBS += -llog -lGLESv1_CM 24 - LOCAL_LDLIBS += -llog -lGLESv2 -lGLESv1_CM 25 - 26 - LOCAL_SHARED_LIBRARIES := SDL2 27 - 28 - include $(BUILD_SHARED_LIBRARY)
+29 -34
SDL_gpu/CMakeLists.txt src/CMakeLists.txt
··· 1 1 set(SDL_gpu_SRCS 2 2 ${SDL_gpu_SRCS} 3 3 SDL_gpu.c 4 - SDL_gpuShapes.c 5 - SDL_gpu_Renderer.c 6 4 SDL_gpu_matrix.c 7 - OpenGL_1_BASE/SDL_gpu_OpenGL_1_BASE.c 8 - OpenGL_1/SDL_gpu_OpenGL_1.c 9 - OpenGL_2/SDL_gpu_OpenGL_2.c 10 - OpenGL_3/SDL_gpu_OpenGL_3.c 11 - GLES_1/SDL_gpu_GLES_1.c 12 - GLES_2/SDL_gpu_GLES_2.c 5 + SDL_gpu_renderer.c 6 + SDL_gpu_shapes.c 7 + renderer_OpenGL_1_BASE.c 8 + renderer_OpenGL_1.c 9 + renderer_OpenGL_2.c 10 + renderer_OpenGL_3.c 11 + renderer_GLES_1.c 12 + renderer_GLES_2.c 13 13 ) 14 14 15 15 set(SDL_gpu_HDRS 16 16 ${SDL_gpu_HDRS} 17 - SDL_gpu.h 18 - SDL_gpu_RendererImpl.h 19 - GL_common/SDL_gpu_GL_common.inl 20 - GL_common/SDL_gpuShapes_GL_common.inl 21 - OpenGL_1_BASE/SDL_gpu_OpenGL_1_BASE.h 22 - OpenGL_1/SDL_gpu_OpenGL_1.h 23 - OpenGL_2/SDL_gpu_OpenGL_2.h 24 - OpenGL_3/SDL_gpu_OpenGL_3.h 25 - GLES_1/SDL_gpu_GLES_1.h 26 - GLES_2/SDL_gpu_GLES_2.h 17 + ../include/SDL_gpu.h 18 + ../include/SDL_gpu_RendererImpl.h 19 + ../include/SDL_gpu_OpenGL_1_BASE.h 20 + ../include/SDL_gpu_OpenGL_1.h 21 + ../include/SDL_gpu_OpenGL_2.h 22 + ../include/SDL_gpu_OpenGL_3.h 23 + ../include/SDL_gpu_GLES_1.h 24 + ../include/SDL_gpu_GLES_2.h 25 + renderer_GL_common.inl 26 + renderer_shapes_GL_common.inl 27 27 ) 28 28 29 29 if(STBI_FOUND) ··· 44 44 45 45 46 46 set(SDL_gpu_install_HDRS 47 - SDL_gpu.h 48 - SDL_gpu_RendererImpl.h 49 - OpenGL_1_BASE/SDL_gpu_OpenGL_1_BASE.h 50 - OpenGL_1/SDL_gpu_OpenGL_1.h 51 - OpenGL_2/SDL_gpu_OpenGL_2.h 52 - OpenGL_3/SDL_gpu_OpenGL_3.h 53 - GLES_1/SDL_gpu_GLES_1.h 54 - GLES_2/SDL_gpu_GLES_2.h 47 + ../include/SDL_gpu.h 48 + ../include/SDL_gpu_RendererImpl.h 49 + ../include/SDL_gpu_OpenGL_1_BASE.h 50 + ../include/SDL_gpu_OpenGL_1.h 51 + ../include/SDL_gpu_OpenGL_2.h 52 + ../include/SDL_gpu_OpenGL_3.h 53 + ../include/SDL_gpu_GLES_1.h 54 + ../include/SDL_gpu_GLES_2.h 55 55 ) 56 56 57 - # Set the appropriate library name so SDL_gpu and SDL2_gpu can co-exist. 57 + # Set the appropriate library name for the version of SDL used 58 58 if ( SDL_gpu_USE_SDL1) 59 59 set (SDL_gpu_OUTPUT_NAME "SDL_gpu") 60 60 else ( SDL_gpu_USE_SDL1) ··· 75 75 set_target_properties(SDL_gpu_shared PROPERTIES LINKER_LANGUAGE C) 76 76 endif() 77 77 78 - # Build the static library (.a) 78 + # Build the static library (.a or .lib) 79 79 if(SDL_gpu_BUILD_STATIC) 80 80 add_library(SDL_gpu STATIC 81 81 ${SDL_gpu_HDRS} ··· 92 92 # These are used to create visual studio folders. 93 93 source_group(Common FILES ${SDL_gpu_SRCS} ${SDL_gpu_HDRS}) 94 94 95 - # Install the library 95 + # Install the headers and library 96 96 if(SDL_gpu_INSTALL) 97 - # install headers 98 97 install(FILES ${SDL_gpu_install_HDRS} DESTINATION include/SDL) 99 98 100 - # install libraries 101 99 if(SDL_gpu_BUILD_SHARED) 102 100 install(TARGETS SDL_gpu_shared EXPORT SDL_gpu-targets DESTINATION lib) 103 101 endif() ··· 105 103 install(TARGETS SDL_gpu EXPORT SDL_gpu-targets DESTINATION lib) 106 104 endif() 107 105 108 - # install build system hooks for third-party apps 109 - #install(EXPORT SDL_gpu-targets DESTINATION ./SDL_gpu) 110 - #install(FILES SDL_gpuConfig.cmake DESTINATION ./SDL_gpu) 111 106 endif(SDL_gpu_INSTALL)
+3 -2
SDL_gpu/GLES_1/SDL_gpu_GLES_1.c src/renderer_GLES_1.c
··· 18 18 #define SDL_GPU_DISABLE_SHADERS 19 19 #define SDL_GPU_APPLY_TRANSFORMS_TO_GL_STACK 20 20 #define SDL_GPU_NO_VAO 21 - #include "../GL_common/SDL_gpu_GL_common.inl" 22 - #include "../GL_common/SDL_gpuShapes_GL_common.inl" 21 + 22 + #include "renderer_GL_common.inl" 23 + #include "renderer_shapes_GL_common.inl" 23 24 24 25 25 26 GPU_Renderer* GPU_CreateRenderer_GLES_1(GPU_RendererID request)
SDL_gpu/GLES_1/SDL_gpu_GLES_1.h include/SDL_gpu_GLES_1.h
+3 -2
SDL_gpu/GLES_2/SDL_gpu_GLES_2.c src/renderer_GLES_2.c
··· 23 23 #define SDL_GPU_GLSL_VERSION 100 24 24 #define SDL_GPU_GLES_MAJOR_VERSION 2 25 25 #define SDL_GPU_NO_VAO 26 - #include "../GL_common/SDL_gpu_GL_common.inl" 27 - #include "../GL_common/SDL_gpuShapes_GL_common.inl" 26 + 27 + #include "renderer_GL_common.inl" 28 + #include "renderer_shapes_GL_common.inl" 28 29 29 30 30 31 GPU_Renderer* GPU_CreateRenderer_GLES_2(GPU_RendererID request)
SDL_gpu/GLES_2/SDL_gpu_GLES_2.h include/SDL_gpu_GLES_2.h
SDL_gpu/GL_common/SDL_gpuShapes_GL_common.inl src/renderer_shapes_GL_common.inl
SDL_gpu/GL_common/SDL_gpu_GL_common.inl src/renderer_GL_common.inl
+3 -2
SDL_gpu/OpenGL_1/SDL_gpu_OpenGL_1.c src/renderer_OpenGL_1.c
··· 20 20 #define SDL_GPU_GL_MAJOR_VERSION 1 21 21 #define SDL_GPU_APPLY_TRANSFORMS_TO_GL_STACK 22 22 #define SDL_GPU_NO_VAO 23 - #include "../GL_common/SDL_gpu_GL_common.inl" 24 - #include "../GL_common/SDL_gpuShapes_GL_common.inl" 23 + 24 + #include "renderer_GL_common.inl" 25 + #include "renderer_shapes_GL_common.inl" 25 26 26 27 27 28 GPU_Renderer* GPU_CreateRenderer_OpenGL_1(GPU_RendererID request)
SDL_gpu/OpenGL_1/SDL_gpu_OpenGL_1.h include/SDL_gpu_OpenGL_1.h
+3 -2
SDL_gpu/OpenGL_1_BASE/SDL_gpu_OpenGL_1_BASE.c src/renderer_OpenGL_1_BASE.c
··· 18 18 #define SDL_GPU_GL_MAJOR_VERSION 1 19 19 #define SDL_GPU_APPLY_TRANSFORMS_TO_GL_STACK 20 20 #define SDL_GPU_NO_VAO 21 - #include "../GL_common/SDL_gpu_GL_common.inl" 22 - #include "../GL_common/SDL_gpuShapes_GL_common.inl" 21 + 22 + #include "renderer_GL_common.inl" 23 + #include "renderer_shapes_GL_common.inl" 23 24 24 25 25 26 GPU_Renderer* GPU_CreateRenderer_OpenGL_1_BASE(GPU_RendererID request)
SDL_gpu/OpenGL_1_BASE/SDL_gpu_OpenGL_1_BASE.h include/SDL_gpu_OpenGL_1_BASE.h
+3 -2
SDL_gpu/OpenGL_2/SDL_gpu_OpenGL_2.c src/renderer_OpenGL_2.c
··· 18 18 #define SDL_GPU_GLSL_VERSION 120 19 19 #define SDL_GPU_GL_MAJOR_VERSION 2 20 20 #define SDL_GPU_NO_VAO 21 - #include "../GL_common/SDL_gpu_GL_common.inl" 22 - #include "../GL_common/SDL_gpuShapes_GL_common.inl" 21 + 22 + #include "renderer_GL_common.inl" 23 + #include "renderer_shapes_GL_common.inl" 23 24 24 25 25 26 GPU_Renderer* GPU_CreateRenderer_OpenGL_2(GPU_RendererID request)
SDL_gpu/OpenGL_2/SDL_gpu_OpenGL_2.h include/SDL_gpu_OpenGL_2.h
+3 -2
SDL_gpu/OpenGL_3/SDL_gpu_OpenGL_3.c src/renderer_OpenGL_3.c
··· 18 18 #define SDL_GPU_GL_TIER 3 19 19 #define SDL_GPU_GLSL_VERSION 130 20 20 #define SDL_GPU_GL_MAJOR_VERSION 3 21 - #include "../GL_common/SDL_gpu_GL_common.inl" 22 - #include "../GL_common/SDL_gpuShapes_GL_common.inl" 21 + 22 + #include "renderer_GL_common.inl" 23 + #include "renderer_shapes_GL_common.inl" 23 24 24 25 25 26 GPU_Renderer* GPU_CreateRenderer_OpenGL_3(GPU_RendererID request)
SDL_gpu/OpenGL_3/SDL_gpu_OpenGL_3.h include/SDL_gpu_OpenGL_3.h
SDL_gpu/SDL_gpu.c src/SDL_gpu.c
SDL_gpu/SDL_gpu.h include/SDL_gpu.h
-3
SDL_gpu/SDL_gpuConfig.cmake
··· 1 - get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) 2 - include(${SELF_DIR}/SDL_gpu-targets.cmake) 3 -
SDL_gpu/SDL_gpuShapes.c src/SDL_gpu_shapes.c
SDL_gpu/SDL_gpu_Renderer.c src/SDL_gpu_renderer.c
SDL_gpu/SDL_gpu_RendererImpl.h include/SDL_gpu_RendererImpl.h
SDL_gpu/SDL_gpu_matrix.c src/SDL_gpu_matrix.c
SDL_gpu/externals/glew/glew.c src/externals/glew/glew.c
SDL_gpu/externals/glew/glew.h src/externals/glew/glew.h
SDL_gpu/externals/glew/glxew.h src/externals/glew/glxew.h
SDL_gpu/externals/glew/wglew.h src/externals/glew/wglew.h
SDL_gpu/externals/stb_image/stb_image.c src/externals/stb_image/stb_image.c
SDL_gpu/externals/stb_image/stb_image.h src/externals/stb_image/stb_image.h
SDL_gpu/externals/stb_image/stb_image_write.c src/externals/stb_image/stb_image_write.c
SDL_gpu/externals/stb_image/stb_image_write.h src/externals/stb_image/stb_image_write.h
SDL_gpu/mainpage.dox src/mainpage.dox