Daniele Bartolini 10 лет назад
Родитель
Сommit
2bec287130
2 измененных файлов с 14 добавлено и 12 удалено
  1. 1 0
      .travis.yml
  2. 13 12
      genie/openal.lua

+ 1 - 0
.travis.yml

@@ -6,6 +6,7 @@ compiler:
 before_install:
   - sudo apt-get -qq update
   - sudo apt-get install -y libpulse-dev
+  - sudo apt-get install -y libxrandr-dev
 
 before_script:
   - git submodule init

+ 13 - 12
genie/openal.lua

@@ -43,6 +43,7 @@ project "openal"
 			"HAVE_DIRENT_H",
 		}
 		buildoptions {
+			"-std=c99",
 			"-Winline",
 			"-fPIC",
 			"-fvisibility=hidden",
@@ -74,6 +75,18 @@ project "openal"
 			"OpenSLES",
 		}
 
+	configuration { "linux-*" }
+		defines {
+			"HAVE_ALIGNED_ALLOC",
+			"HAVE_POSIX_MEMALIGN",
+			"HAVE_PULSEAUDIO",
+			"HAVE_CPUID_H",
+			"HAVE_PTHREAD_MUTEX_TIMEDLOCK",
+		}
+		files {
+			AL_DIR .. "Alc/backends/pulseaudio.c",
+		}
+
 	configuration { "vs*" }
 		defines {
 			"HAVE__ALIGNED_MALLOC",
@@ -110,18 +123,6 @@ project "openal"
 			"winmm",
 		}
 
-	configuration { "linux-*" }
-		defines {
-			"HAVE_ALIGNED_ALLOC",
-			"HAVE_POSIX_MEMALIGN",
-			"HAVE_PULSEAUDIO",
-			"HAVE_CPUID_H",
-			"HAVE_PTHREAD_MUTEX_TIMEDLOCK",
-		}
-		files {
-			AL_DIR .. "Alc/backends/pulseaudio.c",
-		}
-
 	configuration {}
 
 	includedirs {