ref: 8ff5ce588667377cf3f47be9d0ed12345fd7c505
parent: 525493d760480101ef548ac5d1ffbf1561b4bbb0
parent: e9405d3baf0642a1b52c02b69eb0b8783f3263d8
author: DMHSW <6974902+gek169@users.noreply.github.com>
date: Mon Jul 19 14:45:06 EDT 2021
Merge pull request #6 from starseeker/main Move gif files out of toplevel directory.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,10 @@
LANGUAGES C
)
+set(CMAKE_C_STANDARD 99)
+set(CMAKE_C_STANDARD_REQUIRED ON)
+set(CMAKE_C_EXTENSIONS OFF)
+
# Set relative output directory paths, if not already defined
if (NOT BIN_DIR)
set(BIN_DIR bin)
--- a/README.md
+++ b/README.md
@@ -79,47 +79,47 @@
Without Polygon Stipple:
-![GIF Video of demo](capture.gif)
+![GIF Video of demo](doc/capture.gif)
With Polygon Stipple:
-![GIF Video of demo](capture2.gif)
+![GIF Video of demo](doc/capture2.gif)
Hello World test:
-![model loading demo](helloworld.gif)
+![model loading demo](doc/helloworld.gif)
Texturing Test:
-![Screenshot of Texture test](texture_test.png)
+![Screenshot of Texture test](doc/texture_test.png)
Model loading tests:
-![model loading demo](model2_lit.gif)
+![model loading demo](doc/model2_lit.gif)
-![model loading demo](model_lit.gif)
+![model loading demo](doc/model_lit.gif)
Without lighting:
-![model loading demo](model2.gif)
+![model loading demo](doc/model2.gif)
-![model loading demo](model.gif)
+![model loading demo](doc/model.gif)
This is a demo of the NO_DRAW_COLOR feature. Notice that the object appears to have a hole in it.
-![model loading demo](model_hole.gif)
+![model loading demo](doc/model_hole.gif)
Blending:
-![model loading demo](blend.gif)
+![model loading demo](doc/blend.gif)
Specular:
-![GIF Video of demo](specular.gif)
+![GIF Video of demo](doc/specular.gif)
OpenIMGUI standard demo:
-![OpenIMGUI](menu.gif)
+![OpenIMGUI](doc/menu.gif)
TinyGL 0.8 (c) 1997-2021 Fabrice Bellard, C-Chads, Gek (see License, it's free software)
--- a/SDL_Examples/CMakeLists.txt
+++ b/SDL_Examples/CMakeLists.txt
@@ -16,6 +16,9 @@
add_executable(${DEMO_NAME} ${DEMO}.c)
target_link_libraries(${DEMO_NAME} ${TINYGL_LIB} ${M_LIBRARY} ${SDL_LIBRARY})
target_include_directories(${DEMO_NAME} PUBLIC ${SDL_INCLUDE_DIR})
+ if(NOT MSVC)
+ target_compile_options(${DEMO_NAME} PRIVATE -O3 -DNDEBUG -pedantic -march=native -Wall)
+ endif(NOT MSVC)
endforeach()
set(TINYGL_RESOURCES
binary files a/blend.gif /dev/null differ
binary files a/capture.gif /dev/null differ
binary files a/capture2.gif /dev/null differ
binary files /dev/null b/doc/blend.gif differ
binary files /dev/null b/doc/capture.gif differ
binary files /dev/null b/doc/capture2.gif differ
binary files /dev/null b/doc/helloworld.gif differ
binary files /dev/null b/doc/menu.gif differ
binary files /dev/null b/doc/model.gif differ
binary files /dev/null b/doc/model2.gif differ
binary files /dev/null b/doc/model2_lit.gif differ
binary files /dev/null b/doc/model_hole.gif differ
binary files /dev/null b/doc/model_lit.gif differ
binary files /dev/null b/doc/specular.gif differ
binary files /dev/null b/doc/texture_test.png differ
binary files a/helloworld.gif /dev/null differ
binary files a/menu.gif /dev/null differ
binary files a/model.gif /dev/null differ
binary files a/model2.gif /dev/null differ
binary files a/model2_lit.gif /dev/null differ
binary files a/model_hole.gif /dev/null differ
binary files a/model_lit.gif /dev/null differ
binary files a/specular.gif /dev/null differ
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -36,7 +36,7 @@
LIBRARY DESTINATION ${LIB_DIR}
ARCHIVE DESTINATION ${LIB_DIR})
if(NOT MSVC)
- target_compile_options(tinygl PRIVATE "-Wall")
+ target_compile_options(tinygl PRIVATE -O3 -DNDEBUG -pedantic -march=native -Wall)
endif(NOT MSVC)
endif(TINYGL_BUILD_STATIC)
@@ -47,6 +47,9 @@
RUNTIME DESTINATION ${BIN_DIR}
LIBRARY DESTINATION ${LIB_DIR}
ARCHIVE DESTINATION ${LIB_DIR})
+ if(NOT MSVC)
+ target_compile_options(tinygl-static PRIVATE -O3 -DNDEBUG -pedantic -march=native -Wall)
+ endif(NOT MSVC)
endif(TINYGL_BUILD_STATIC)
# Local Variables:
binary files a/texture_test.png /dev/null differ