build: prevent fixing SDL2 header path (#354)

Makefile

@@ -62,7 +62,7 @@ else ifeq ($(UNAME),Darwin)
 
 # Mac
 LIBEXT=dylib
-CFLAGS += -m$(MARCH) -I /usr/local/opt/libjpeg-turbo/include -I /usr/local/opt/jpeg-turbo/include -I /usr/local/include -I /usr/local/opt/libvorbis/include -I /usr/local/opt/openal-soft/include -Dopenal_soft  -DGL_SILENCE_DEPRECATION
+CFLAGS += -m$(MARCH) -I /usr/local/include -I /usr/local/opt/libjpeg-turbo/include -I /usr/local/opt/jpeg-turbo/include -I /usr/local/opt/sdl2/include/SDL2 -I /usr/local/opt/libvorbis/include -I /usr/local/opt/openal-soft/include -Dopenal_soft  -DGL_SILENCE_DEPRECATION
 LFLAGS += -Wl,-export_dynamic -L/usr/local/lib
 
 ifdef OSX_SDK
@@ -151,14 +151,14 @@ uv: ${UV} libhl
 
 mysql: ${MYSQL} libhl
 	${CC} ${CFLAGS} -shared -o mysql.hdll ${MYSQL} ${LIBFLAGS} -L. -lhl
-	
+
 mesa:
 	(cd libs/mesa && make)
 
 release: release_version release_$(RELEASE_NAME)
 
 release_version:
-	$(eval HL_VER := `(hl --version)`-$(RELEASE_NAME))	
+	$(eval HL_VER := `(hl --version)`-$(RELEASE_NAME))
 	rm -rf hl-$(HL_VER)
 	mkdir hl-$(HL_VER)
 	mkdir hl-$(HL_VER)/include
@@ -174,15 +174,15 @@ HLPACK=dx
 else
 HLPACK=$(HLIB)
 endif
-	
+
 release_haxelib_package:
 	rm -rf $(HLIB)_release
 	mkdir $(HLIB)_release
 	(cd libs/$(HLIB) && cp -R $(HLPACK) *.h *.c* haxelib.json ../../$(HLIB)_release | true)
 	zip -r $(HLIB).zip $(HLIB)_release
 	haxelib submit $(HLIB).zip
-	rm -rf $(HLIB)_release	
-	
+	rm -rf $(HLIB)_release
+
 release_win:
 	(cd x64/ReleaseVS2013 && cp hl.exe libhl.dll *.hdll *.lib ../../hl-$(HL_VER))
 	cp c:/windows/system32/msvcr120.dll hl-$(HL_VER)

azure-pipelines.yml

@@ -36,18 +36,18 @@ stages:
       - template: other/azure-pipelines/build-windows.yml
         parameters:
           name: Windows64_CMake
-          vmImage: 'vs2015-win2012r2'
+          vmImage: 'vs2017-win2016'
           buildSystem: cmake
-          cmakeGenerator: 'Visual Studio 14 2015 Win64'
+          cmakeGenerator: 'Visual Studio 15 2017 Win64'
       - template: other/azure-pipelines/build-windows.yml
         parameters:
           name: Windows32_CMake
-          vmImage: 'vs2015-win2012r2'
+          vmImage: 'vs2017-win2016'
           buildSystem: cmake
-          cmakeGenerator: 'Visual Studio 14 2015'
+          cmakeGenerator: 'Visual Studio 15 2017'
 
       - template: other/azure-pipelines/build-windows.yml
         parameters:
           name: Windows_VS
-          vmImage: 'vs2015-win2012r2'
+          vmImage: 'vs2017-win2016'
           buildSystem: vs

libs/sdl/gl.c

@@ -2,12 +2,12 @@
 #include <hl.h>
 
 #if defined(HL_IOS) || defined (HL_TVOS)
-#	include <SDL2/SDL.h>
-#	include <SDL2/SDL_syswm.h>
+#	include <SDL.h>
+#	include <SDL_syswm.h>
 #	include <OpenGLES/ES3/gl.h>
 #	define HL_GLES
 #elif defined(HL_MAC)
-#	include <SDL2/SDL.h>
+#	include <SDL.h>
 #	include <OpenGL/gl3.h>
 #	define glBindImageTexture(...) hl_error("Not supported on OSX")
 #	define glDispatchCompute(...) hl_error("Not supported on OSX")

libs/sdl/sdl.c

@@ -2,9 +2,11 @@
 
 #include <hl.h>
 
-#if defined(_WIN32) || defined(__ANDROID__)
+#if defined(_WIN32) || defined(__ANDROID__) || defined(HL_IOS) || defined(HL_TVOS)
 #	include <SDL.h>
 #	include <SDL_syswm.h>
+#elif defined(HL_MAC)
+#	include <SDL.h>
 #else
 #	include <SDL2/SDL.h>
 #endif
@@ -12,7 +14,6 @@
 #if defined (HL_IOS) || defined(HL_TVOS)
 #	include <OpenGLES/ES3/gl.h>
 #	include <OpenGLES/ES3/glext.h>
-#	include <SDL2/SDL_syswm.h>
 #endif
 
 #ifndef SDL_MAJOR_VERSION

other/azure-pipelines/build-linux.yml

@@ -93,10 +93,10 @@ jobs:
           displayName: Test
         - script: make package
           displayName: Package
-        - task: PublishPipelineArtifact@0
+        - task: PublishPipelineArtifact@1
           inputs:
             artifactName: ${{ parameters.name }}Binaries
-            targetPath: bin/hashlink-1.10.0-Linux.tar.gz
+            targetPath: bin/hashlink-1.11.0-Linux.tar.gz
       - ${{ if eq(parameters.buildSystem, 'make') }}:
         - script: make
           displayName: Build

other/azure-pipelines/build-mac.yml

@@ -1,6 +1,6 @@
 parameters:
   name: 'BuildMac'
-  vmImage: 'macOS-10.13'
+  vmImage: 'macOS-10.14'
   buildSystem: 'cmake' # either 'cmake' or 'make'
   cmakeConfig: 'RelWithDebInfo'
 
@@ -37,10 +37,10 @@ jobs:
           displayName: Test
         - script: make package
           displayName: Package
-        - task: PublishPipelineArtifact@0
+        - task: PublishPipelineArtifact@1
           inputs:
             artifactName: ${{ parameters.name }}Binaries
-            targetPath: bin/hashlink-1.10.0-Darwin.tar.gz
+            targetPath: bin/hashlink-1.11.0-Darwin.tar.gz
       - ${{ if eq(parameters.buildSystem, 'make') }}:
         - script: make
           displayName: Build

other/azure-pipelines/build-windows.yml

@@ -15,7 +15,7 @@ jobs:
       ${{ if not(endsWith(parameters.cmakeGenerator, 'Win64')) }}:
         MARCH: 32
     steps:
-      - ${{ if eq(parameters.vmImage, 'vs2015-win2012r2') }}:
+      - ${{ if eq(parameters.vmImage, 'vs2017-win2016') }}:
         - powershell: |
             Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
             Write-Host "##vso[task.prependpath]C:\ProgramData\chocolatey\bin"
@@ -61,10 +61,10 @@ jobs:
           displayName: Test
         - script: cmake --build . --config ${{ parameters.cmakeConfig }} --target PACKAGE
           displayName: Package binaries
-        - task: PublishPipelineArtifact@0
+        - task: PublishPipelineArtifact@1
           inputs:
             artifactName: ${{ parameters.name }}Binaries
-            targetPath: bin/hashlink-1.10.0-win$(MARCH).zip
+            targetPath: bin/hashlink-1.11.0-win$(MARCH).zip
       - ${{ if eq(parameters.buildSystem, 'vs') }}:
         - task: MSBuild@1
           inputs:

other/cmake/FindSDL2.cmake

@@ -76,27 +76,18 @@ SET(SDL2_SEARCH_PATHS
 	${SDL2_PATH}
 )
 
-if (APPLE)
-	FIND_PATH(SDL2_INCLUDE_DIR SDL2/SDL.h
-		HINTS
-		$ENV{SDL2DIR}
-		PATH_SUFFIXES include/SDL2 include
-		PATHS ${SDL2_SEARCH_PATHS}
-	)
-else()
-	FIND_PATH(SDL2_INCLUDE_DIR SDL.h
-		HINTS
-		$ENV{SDL2DIR}
-		PATH_SUFFIXES include/SDL2 include
-		PATHS ${SDL2_SEARCH_PATHS}
-	)
-endif()
+FIND_PATH(SDL2_INCLUDE_DIR SDL.h
+	HINTS
+	$ENV{SDL2DIR}
+	PATH_SUFFIXES include/SDL2 include
+	PATHS ${SDL2_SEARCH_PATHS}
+)
 
-if(CMAKE_SIZEOF_VOID_P EQUAL 8) 
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
 	set(PATH_SUFFIXES lib64 lib/x64 lib)
-else() 
+else()
 	set(PATH_SUFFIXES lib/x86 lib)
-endif() 
+endif()
 
 FIND_LIBRARY(SDL2_LIBRARY_TEMP
 	NAMES SDL2