Build errors when defining GLM_ENABLE_EXPERIMENTAL #884 #883

2019-04-01 16:04:04 +02:00 · 2019-04-01 16:04:04 +02:00 · f846aa8334
commit f846aa8334
parent 658d8960d0
64 changed files with 79 additions and 63 deletions
--- a/glm/gtx/associated_min_max.hpp
+++ b/glm/gtx/associated_min_max.hpp
@ -19,7 +19,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_associated_min_max is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_associated_min_max extension included")
 #	endif
 #endif
--- a/glm/gtx/bit.hpp
+++ b/glm/gtx/bit.hpp
@ -18,7 +18,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_bit is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_bit extension included")
 #	endif
 #endif
--- a/glm/gtx/closest_point.hpp
+++ b/glm/gtx/closest_point.hpp
@ -18,7 +18,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_closest_point is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_closest_point extension included")
 #	endif
 #endif
--- a/glm/gtx/color_encoding.hpp
+++ b/glm/gtx/color_encoding.hpp
@ -20,7 +20,11 @@
 #include <limits>

 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
-#	pragma message("GLM: GLM_GTC_color_encoding extension included")
+#	ifndef GLM_ENABLE_EXPERIMENTAL
+#		pragma message("GLM: GLM_GTC_color_encoding is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
+#	else
+#		pragma message("GLM: GLM_GTC_color_encoding extension included")
+#	endif
 #endif

 namespace glm
--- a/glm/gtx/color_space.hpp
+++ b/glm/gtx/color_space.hpp
@ -18,7 +18,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_color_space is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_color_space extension included")
 #	endif
 #endif
--- a/glm/gtx/color_space_YCoCg.hpp
+++ b/glm/gtx/color_space_YCoCg.hpp
@ -18,7 +18,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_color_space_YCoCg is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_color_space_YCoCg extension included")
 #	endif
 #endif
--- a/glm/gtx/common.hpp
+++ b/glm/gtx/common.hpp
@ -21,7 +21,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_common is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_common extension included")
 #	endif
 #endif
--- a/glm/gtx/compatibility.hpp
+++ b/glm/gtx/compatibility.hpp
@ -19,7 +19,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_compatibility is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_compatibility extension included")
 #	endif
 #endif
--- a/glm/gtx/component_wise.hpp
+++ b/glm/gtx/component_wise.hpp
@ -21,7 +21,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_component_wise is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_component_wise extension included")
 #	endif
 #endif
--- a/glm/gtx/dual_quaternion.hpp
+++ b/glm/gtx/dual_quaternion.hpp
@ -23,7 +23,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_dual_quaternion is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_dual_quaternion extension included")
 #	endif
 #endif
--- a/glm/gtx/easing.hpp
+++ b/glm/gtx/easing.hpp
@ -24,7 +24,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_easing is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_easing extension included")
 #	endif
 #endif
--- a/glm/gtx/euler_angles.hpp
+++ b/glm/gtx/euler_angles.hpp
@ -21,7 +21,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_euler_angles is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_euler_angles extension included")
 #	endif
 #endif
--- a/glm/gtx/extend.hpp
+++ b/glm/gtx/extend.hpp
@ -18,7 +18,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_extend is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_extend extension included")
 #	endif
 #endif
--- a/glm/gtx/extended_min_max.hpp
+++ b/glm/gtx/extended_min_max.hpp
@ -18,7 +18,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_extented_min_max is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_extented_min_max extension included")
 #	endif
 #endif
--- a/glm/gtx/exterior_product.hpp
+++ b/glm/gtx/exterior_product.hpp
@ -18,7 +18,11 @@
 #include "../detail/qualifier.hpp"

 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
-#	pragma message("GLM: GLM_GTX_exterior_product extension included")
+#	ifndef GLM_ENABLE_EXPERIMENTAL
+#		pragma message("GLM: GLM_GTX_exterior_product is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
+#	else
+#		pragma message("GLM: GLM_GTX_exterior_product extension included")
+#	endif
 #endif

 namespace glm
--- a/glm/gtx/fast_exponential.hpp
+++ b/glm/gtx/fast_exponential.hpp
@ -19,7 +19,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_fast_exponential is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_fast_exponential extension included")
 #	endif
 #endif
--- a/glm/gtx/fast_square_root.hpp
+++ b/glm/gtx/fast_square_root.hpp
@ -22,7 +22,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_fast_square_root is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_fast_square_root extension included")
 #	endif
 #endif
--- a/glm/gtx/fast_trigonometry.hpp
+++ b/glm/gtx/fast_trigonometry.hpp
@ -18,7 +18,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_fast_trigonometry is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_fast_trigonometry extension included")
 #	endif
 #endif
--- a/glm/gtx/functions.hpp
+++ b/glm/gtx/functions.hpp
@ -19,7 +19,11 @@
 #include "../detail/type_vec2.hpp"

 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
-#	pragma message("GLM: GLM_GTX_functions extension included")
+#	ifndef GLM_ENABLE_EXPERIMENTAL
+#		pragma message("GLM: GLM_GTX_functions is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
+#	else
+#		pragma message("GLM: GLM_GTX_functions extension included")
+#	endif
 #endif

 namespace glm
--- a/glm/gtx/gradient_paint.hpp
+++ b/glm/gtx/gradient_paint.hpp
@ -20,7 +20,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_gradient_paint is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_gradient_paint extension included")
 #	endif
 #endif
--- a/glm/gtx/handed_coordinate_space.hpp
+++ b/glm/gtx/handed_coordinate_space.hpp
@ -18,7 +18,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_handed_coordinate_space is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_handed_coordinate_space extension included")
 #	endif
 #endif
--- a/glm/gtx/hash.hpp
+++ b/glm/gtx/hash.hpp
@ -15,7 +15,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_hash is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_hash extension included")
 #	endif
 #endif
--- a/glm/gtx/integer.hpp
+++ b/glm/gtx/integer.hpp
@ -19,7 +19,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_integer is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_integer extension included")
 #	endif
 #endif
--- a/glm/gtx/intersect.hpp
+++ b/glm/gtx/intersect.hpp
@ -24,7 +24,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_closest_point is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_closest_point extension included")
 #	endif
 #endif
--- a/glm/gtx/io.hpp
+++ b/glm/gtx/io.hpp
@ -26,7 +26,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_io is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_io extension included")
 #	endif
 #endif
--- a/glm/gtx/log_base.hpp
+++ b/glm/gtx/log_base.hpp
@ -18,7 +18,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_log_base is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_log_base extension included")
 #	endif
 #endif
--- a/glm/gtx/matrix_cross_product.hpp
+++ b/glm/gtx/matrix_cross_product.hpp
@ -19,7 +19,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_matrix_cross_product is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_matrix_cross_product extension included")
 #	endif
 #endif
--- a/glm/gtx/matrix_decompose.hpp
+++ b/glm/gtx/matrix_decompose.hpp
@ -23,7 +23,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_matrix_decompose is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_matrix_decompose extension included")
 #	endif
 #endif
--- a/glm/gtx/matrix_factorisation.hpp
+++ b/glm/gtx/matrix_factorisation.hpp
@ -18,7 +18,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_matrix_factorisation is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_matrix_factorisation extension included")
 #	endif
 #endif
--- a/glm/gtx/matrix_interpolation.hpp
+++ b/glm/gtx/matrix_interpolation.hpp
@ -19,7 +19,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_matrix_interpolation is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_matrix_interpolation extension included")
 #	endif
 #endif
--- a/glm/gtx/matrix_major_storage.hpp
+++ b/glm/gtx/matrix_major_storage.hpp
@ -19,7 +19,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_matrix_major_storage is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_matrix_major_storage extension included")
 #	endif
 #endif
--- a/glm/gtx/matrix_operation.hpp
+++ b/glm/gtx/matrix_operation.hpp
@ -18,7 +18,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_matrix_operation is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_matrix_operation extension included")
 #	endif
 #endif
--- a/glm/gtx/matrix_query.hpp
+++ b/glm/gtx/matrix_query.hpp
@ -21,7 +21,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_matrix_query is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_matrix_query extension included")
 #	endif
 #endif
--- a/glm/gtx/matrix_transform_2d.hpp
+++ b/glm/gtx/matrix_transform_2d.hpp
@ -20,7 +20,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_matrix_transform_2d is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_matrix_transform_2d extension included")
 #	endif
 #endif
--- a/glm/gtx/mixed_product.hpp
+++ b/glm/gtx/mixed_product.hpp
@ -18,7 +18,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_mixed_product is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_mixed_product extension included")
 #	endif
 #endif
--- a/glm/gtx/norm.hpp
+++ b/glm/gtx/norm.hpp
@ -20,7 +20,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_norm is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_norm extension included")
 #	endif
 #endif
--- a/glm/gtx/normal.hpp
+++ b/glm/gtx/normal.hpp
@ -19,7 +19,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_normal is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_normal extension included")
 #	endif
 #endif
--- a/glm/gtx/normalize_dot.hpp
+++ b/glm/gtx/normalize_dot.hpp
@ -19,7 +19,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_normalize_dot is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_normalize_dot extension included")
 #	endif
 #endif
--- a/glm/gtx/number_precision.hpp
+++ b/glm/gtx/number_precision.hpp
@ -21,7 +21,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_number_precision is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_number_precision extension included")
 #	endif
 #endif
--- a/glm/gtx/optimum_pow.hpp
+++ b/glm/gtx/optimum_pow.hpp
@ -18,7 +18,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_optimum_pow is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_optimum_pow extension included")
 #	endif
 #endif
--- a/glm/gtx/orthonormalize.hpp
+++ b/glm/gtx/orthonormalize.hpp
@ -21,7 +21,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_orthonormalize is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_orthonormalize extension included")
 #	endif
 #endif
--- a/glm/gtx/perpendicular.hpp
+++ b/glm/gtx/perpendicular.hpp
@ -20,7 +20,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_perpendicular is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_perpendicular extension included")
 #	endif
 #endif
--- a/glm/gtx/polar_coordinates.hpp
+++ b/glm/gtx/polar_coordinates.hpp
@ -18,7 +18,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_polar_coordinates is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_polar_coordinates extension included")
 #	endif
 #endif
--- a/glm/gtx/projection.hpp
+++ b/glm/gtx/projection.hpp
@ -18,7 +18,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_projection is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_projection extension included")
 #	endif
 #endif
--- a/glm/gtx/quaternion.hpp
+++ b/glm/gtx/quaternion.hpp
@ -23,7 +23,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_quaternion is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_quaternion extension included")
 #	endif
 #endif
--- a/glm/gtx/range.hpp
+++ b/glm/gtx/range.hpp
@ -18,7 +18,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_range is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_range extension included")
 #	endif
 #endif
--- a/glm/gtx/raw_data.hpp
+++ b/glm/gtx/raw_data.hpp
@ -19,7 +19,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_raw_data is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_raw_data extension included")
 #	endif
 #endif
--- a/glm/gtx/rotate_normalized_axis.hpp
+++ b/glm/gtx/rotate_normalized_axis.hpp
@ -22,7 +22,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_rotate_normalized_axis is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_rotate_normalized_axis extension included")
 #	endif
 #endif
--- a/glm/gtx/rotate_vector.hpp
+++ b/glm/gtx/rotate_vector.hpp
@ -22,7 +22,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_rotate_vector is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_rotate_vector extension included")
 #	endif
 #endif
--- a/glm/gtx/scalar_multiplication.hpp
+++ b/glm/gtx/scalar_multiplication.hpp
@ -19,7 +19,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_scalar_multiplication is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_scalar_multiplication extension included")
 #	endif
 #endif
--- a/glm/gtx/scalar_relational.hpp
+++ b/glm/gtx/scalar_relational.hpp
@ -18,7 +18,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_extend is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_extend extension included")
 #	endif
 #endif
--- a/glm/gtx/spline.hpp
+++ b/glm/gtx/spline.hpp
@ -19,7 +19,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_spline is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_spline extension included")
 #	endif
 #endif
--- a/glm/gtx/std_based_type.hpp
+++ b/glm/gtx/std_based_type.hpp
@ -20,7 +20,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_std_based_type is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_std_based_type extension included")
 #	endif
 #endif
--- a/glm/gtx/string_cast.hpp
+++ b/glm/gtx/string_cast.hpp
@ -27,7 +27,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_string_cast is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_string_cast extension included")
 #	endif
 #endif
--- a/glm/gtx/texture.hpp
+++ b/glm/gtx/texture.hpp
@ -20,7 +20,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_texture is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_texture extension included")
 #	endif
 #endif
--- a/glm/gtx/transform.hpp
+++ b/glm/gtx/transform.hpp
@ -22,7 +22,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_transform is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_transform extension included")
 #	endif
 #endif
--- a/glm/gtx/transform2.hpp
+++ b/glm/gtx/transform2.hpp
@ -20,7 +20,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_transform2 is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_transform2 extension included")
 #	endif
 #endif
--- a/glm/gtx/type_aligned.hpp
+++ b/glm/gtx/type_aligned.hpp
@ -20,7 +20,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_type_aligned is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_type_aligned extension included")
 #	endif
 #endif
--- a/glm/gtx/type_trait.hpp
+++ b/glm/gtx/type_trait.hpp
@ -15,7 +15,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_type_trait is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_type_trait extension included")
 #	endif
 #endif
--- a/glm/gtx/vec_swizzle.hpp
+++ b/glm/gtx/vec_swizzle.hpp
@ -17,7 +17,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_vec_swizzle is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_vec_swizzle extension included")
 #	endif
 #endif
--- a/glm/gtx/vector_angle.hpp
+++ b/glm/gtx/vector_angle.hpp
@ -23,7 +23,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_vector_angle is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_vector_angle extension included")
 #	endif
 #endif
--- a/glm/gtx/vector_query.hpp
+++ b/glm/gtx/vector_query.hpp
@ -20,7 +20,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_vector_query is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_vector_query extension included")
 #	endif
 #endif
--- a/glm/gtx/wrap.hpp
+++ b/glm/gtx/wrap.hpp
@ -19,7 +19,7 @@
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
 #		pragma message("GLM: GLM_GTX_wrap is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.")
-#	elif
+#	else
 #		pragma message("GLM: GLM_GTX_wrap extension included")
 #	endif
 #endif
--- a/readme.md
+++ b/readme.md
@ -52,6 +52,10 @@ glm::mat4 camera(float Translate, glm::vec2 const& Rotate)

 ## Release notes

+### [GLM 0.9.9.5](https://github.com/g-truc/glm/releases/tag/0.9.9.5) - 2019-04-01
+#### Fixes:
+- Build errors when defining GLM_ENABLE_EXPERIMENTAL #884 #883
+
 ### [GLM 0.9.9.4](https://github.com/g-truc/glm/releases/tag/0.9.9.4) - 2019-03-19
 #### Features:
 - Added mix implementation for matrices in EXT_matrix_common #842