Apple apple apple

CMakeLists.txt

@@ -33,7 +33,7 @@ if ( WIN32 )
 endif ()
 
 if ( APPLE )
-  set ( MACOS_SDLMAIN_M_PATH "${CMAKE_SOURCE_DIR}/src/SDL/SDLMain.m" CACHE STRING "Path to SDLMain.m file" )
+  set ( MACOS_SDLMAIN_M_PATH "${CMAKE_SOURCE_DIR}/src/apple/SDLMain.m" CACHE STRING "Path to SDLMain.m file" )
   option ( CREATE_BUNDLE "Create a Mac OS application bundle" ON )
   if ( NOT EXISTS "${MACOS_SDLMAIN_M_PATH}" )
     message ( FATAL_ERROR "On Mac OS, SDLMain.m is required. Please set the MACOS_SDLMAIN_M_PATH variable" )

cmake/modules/PostprocessBundle.cmake

@@ -19,6 +19,7 @@ if(CMAKE_GENERATOR)
 			POST_BUILD
 			COMMAND ${CMAKE_COMMAND} -DBUNDLE_PATH="${path}"
 				-P "${POSTPROCESS_BUNDLE_MODULE_LOCATION}"
+				VERBATIM
 		)
 	endfunction()
 	return()

src/CMakeLists.txt

@@ -381,14 +381,12 @@ if ( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES
   if ( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" )
     # add warning flags recognized by g++ but not by clang
     add_definitions (
-      -Wno-address                    # opengl
       -Wno-missing-field-initializers # xbrz
       )
   elseif ( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
     # add warning flags recognized by clang but not by g++
     add_definitions (
       -Wno-overloaded-virtual         # overloads with different parameters
-      -Wno-pointer-bool-conversion    # opengl
       -Wno-shift-negative-value       # opl
       )
   endif ()
@@ -499,11 +497,13 @@ foreach ( binpath ${bin_data_dirs} )
   if ( APPLE AND CREATE_BUNDLE )
     add_custom_command ( TARGET openxcom
       POST_BUILD
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/${binpath} ${bundle_path}/Contents/Resources/${binpath} )
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/${binpath} ${bundle_path}/Contents/Resources/${binpath}
+	  VERBATIM )
   else ()
     add_custom_command ( TARGET openxcom
       POST_BUILD
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/${binpath} ${EXECUTABLE_OUTPUT_PATH}/${binpath} )
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/${binpath} ${EXECUTABLE_OUTPUT_PATH}/${binpath}
+	  VERBATIM )
   endif ()
   install ( DIRECTORY ${CMAKE_SOURCE_DIR}/bin/${binpath} DESTINATION ${data_install_dir} )
 endforeach()
@@ -518,7 +518,8 @@ if ( WIN32 )
   foreach ( dll ${Windows_dll} )
     add_custom_command ( TARGET openxcom
       POST_BUILD
-      COMMAND ${CMAKE_COMMAND} -E copy ${dll} ${EXECUTABLE_OUTPUT_PATH} )
+      COMMAND ${CMAKE_COMMAND} -E copy ${dll} ${EXECUTABLE_OUTPUT_PATH}
+	  VERBATIM )
     install ( FILES ${dll} DESTINATION bin)
   endforeach()
 endif ()

src/Engine/OpenGL.cpp

@@ -424,21 +424,21 @@ void OpenGL::init(int w, int h)
 	glUniform1i = (PFNGLUNIFORM1IPROC)glGetProcAddress("glUniform1i");
 	glUniform2fv = (PFNGLUNIFORM2FVPROC)glGetProcAddress("glUniform2fv");
 	glUniform4fv = (PFNGLUNIFORM4FVPROC)glGetProcAddress("glUniform4fv");
+
+	shader_support = glCreateProgram && glDeleteProgram && glUseProgram && glCreateShader
+	&& glDeleteShader && glShaderSource && glCompileShader && glAttachShader
+	&& glDetachShader && glLinkProgram && glGetUniformLocation && glIsProgram && glIsShader
+	&& glUniform1i && glUniform2fv && glUniform4fv && glGetAttachedShaders
+	&& glGetShaderiv && glGetShaderInfoLog && glGetProgramiv && glGetProgramInfoLog;
+#else
+	shader_support = true;
 #endif
 	glXGetCurrentDisplay = (void* (APIENTRYP)())glGetProcAddress("glXGetCurrentDisplay");
 	glXGetCurrentDrawable = (Uint32 (APIENTRYP)())glGetProcAddress("glXGetCurrentDrawable");
 	glXSwapIntervalEXT = (void (APIENTRYP)(void*, Uint32, int))glGetProcAddress("glXSwapIntervalEXT");
 
 	wglSwapIntervalEXT = (Uint32 (APIENTRYP)(int))glGetProcAddress("wglSwapIntervalEXT");
 
-
-
-	shader_support = glCreateProgram && glDeleteProgram && glUseProgram && glCreateShader
-	&& glDeleteShader && glShaderSource && glCompileShader && glAttachShader
-	&& glDetachShader && glLinkProgram && glGetUniformLocation && glIsProgram && glIsShader
-	&& glUniform1i && glUniform2fv && glUniform4fv && glGetAttachedShaders
-	&& glGetShaderiv && glGetShaderInfoLog && glGetProgramiv && glGetProgramInfoLog;
-
 	if (shader_support)
 	{
 		if (glprogram) {