- Fix cgo directives (includes) for Win32 platform builds

- Add SDL_GetPlatform() test
newkincode · Apr 27, 2014 · 7416622 · 7416622
1 parent 08b3e48
commit 7416622
Show file tree

Hide file tree

Showing 33 changed files with 50 additions and 48 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 *.swp
+*~
 go-sdl2
diff --git a/sdl/misc.c b/sdl/misc.c
@@ -1,9 +1,5 @@
 #include "misc.h"
 
-#if (SDL_MAJOR_VERSION >= 2 && SDL_MINOR_VERSION >= 0 && SDL_PATCHLEVEL >= 1)
-#include <SDL2/SDL_filesystem.h>
-#endif
-
 int _SDL_GetSystemRAM()
 {
 #if (SDL_MAJOR_VERSION >= 2 && SDL_MINOR_VERSION >= 0 && SDL_PATCHLEVEL >= 1)

diff --git a/sdl/sdl.go b/sdl/sdl.go
@@ -1,7 +1,7 @@
 package sdl
 
-// #cgo !linux,freebsd LDFLAGS: -lSDL2
-// #cgo !windows pkg-config: sdl2
+// #cgo windows LDFLAGS: -lSDL2
+// #cgo linux freebsd pkg-config: sdl2
 // #include <SDL2/SDL.h>
 import "C"
 

diff --git a/sdl/sdl_audio.go b/sdl/sdl_audio.go
@@ -1,8 +1,6 @@
 package sdl
 
-/*
-#include <SDL2/SDL_audio.h>
-*/
+// #include <SDL2/SDL.h>
 import "C"
 import "unsafe"
 

diff --git a/sdl/sdl_blendmode.go b/sdl/sdl_blendmode.go
@@ -1,6 +1,6 @@
 package sdl
 
-// #include <SDL2/SDL_blendmode.h>
+// #include <SDL2/SDL.h>
 import "C"
 
 type BlendMode C.SDL_BlendMode

diff --git a/sdl/sdl_clipboard.go b/sdl/sdl_clipboard.go
@@ -1,7 +1,6 @@
 package sdl
 
-// #include <SDL2/SDL_stdinc.h>
-// #include <SDL2/SDL_clipboard.h>
+// #include <SDL2/SDL.h>
 import "C"
 import "unsafe"
 

diff --git a/sdl/sdl_cpuinfo.go b/sdl/sdl_cpuinfo.go
@@ -1,6 +1,6 @@
 package sdl
 
-// #include <SDL2/SDL_cpuinfo.h>
+// #include <SDL2/SDL.h>
 // #include "misc.h"
 import "C"
 

diff --git a/sdl/sdl_error.go b/sdl/sdl_error.go
@@ -1,6 +1,6 @@
 package sdl
 
-// #include <SDL2/SDL_error.h>
+// #include <SDL2/SDL.h>
 import "C"
 import "errors"
 

diff --git a/sdl/sdl_events.go b/sdl/sdl_events.go
@@ -1,6 +1,6 @@
 package sdl
 
-// #include <SDL2/SDL_events.h>
+// #include <SDL2/SDL.h>
 import "C"
 import "unsafe"
 import "reflect"

diff --git a/sdl/sdl_gesture.go b/sdl/sdl_gesture.go
@@ -1,6 +1,6 @@
 package sdl
 
-// #include <SDL2/SDL_gesture.h>
+// #include <SDL2/SDL.h>
 import "C"
 import "unsafe"
 

diff --git a/sdl/sdl_haptic.go b/sdl/sdl_haptic.go
@@ -1,6 +1,6 @@
 package sdl
 
-// #include <SDL2/SDL_haptic.h>
+// #include <SDL2/SDL.h>
 import "C"
 import "unsafe"
 

diff --git a/sdl/sdl_hints.go b/sdl/sdl_hints.go
@@ -1,6 +1,6 @@
 package sdl
 
-// #include <SDL2/SDL_hints.h>
+// #include <SDL2/SDL.h>
 import "C"
 import "unsafe"
 

diff --git a/sdl/sdl_joystick.go b/sdl/sdl_joystick.go
@@ -1,6 +1,6 @@
 package sdl
 
-// #include <SDL2/SDL_joystick.h>
+// #include <SDL2/SDL.h>
 import "C"
 import "unsafe"
 

diff --git a/sdl/sdl_keyboard.go b/sdl/sdl_keyboard.go
@@ -1,6 +1,6 @@
 package sdl
 
-// #include <SDL2/SDL_keyboard.h>
+// #include <SDL2/SDL.h>
 import "C"
 import "unsafe"
 import "reflect"

diff --git a/sdl/sdl_keycode.go b/sdl/sdl_keycode.go
@@ -1,6 +1,6 @@
 package sdl
 
-// #include <SDL2/SDL_keycode.h>
+// #include <SDL2/SDL.h>
 import "C"
 
 const K_SCANCODE_MASK = 1 << 30

diff --git a/sdl/sdl_loadso.go b/sdl/sdl_loadso.go
@@ -1,6 +1,6 @@
 package sdl
 
-// #include <SDL2/SDL_loadso.h>
+// #include <SDL2/SDL.h>
 import "C"
 import "unsafe"
 

diff --git a/sdl/sdl_log.go b/sdl/sdl_log.go
@@ -1,6 +1,6 @@
 package sdl
 
-// #include <SDL2/SDL_log.h>
+// #include <SDL2/SDL.h>
 import "C"
 // import "unsafe"
 

diff --git a/sdl/sdl_mouse.go b/sdl/sdl_mouse.go
@@ -1,8 +1,6 @@
 package sdl
 
-/*
-#include <SDL2/SDL_mouse.h>
-*/
+// #include <SDL2/SDL.h>
 import "C"
 import "unsafe"
 

diff --git a/sdl/sdl_pixels.go b/sdl/sdl_pixels.go
@@ -1,6 +1,5 @@
 package sdl
 
-// #cgo LDFLAGS: -lSDL2
 // #include <SDL2/SDL.h>
 import "C"
 

diff --git a/sdl/sdl_rect.go b/sdl/sdl_rect.go
@@ -1,6 +1,6 @@
 package sdl
 
-// #include <SDL2/SDL_rect.h>
+// #include <SDL2/SDL.h>
 import "C"
 import "unsafe"
 

diff --git a/sdl/sdl_render.go b/sdl/sdl_render.go
@@ -1,6 +1,6 @@
 package sdl
 
-// #include <SDL2/SDL_render.h>
+// #include <SDL2/SDL.h>
 import "C"
 import "unsafe"
 

diff --git a/sdl/sdl_rwops.go b/sdl/sdl_rwops.go
@@ -1,7 +1,7 @@
 package sdl
 
 /*
-#include <SDL2/SDL_rwops.h>
+#include <SDL2/SDL.h>
 static Sint64 RWsize(SDL_RWops *ctx)
 {
 	return ctx->size(ctx);

diff --git a/sdl/sdl_scancode.go b/sdl/sdl_scancode.go
@@ -1,6 +1,6 @@
 package sdl
 
-// #include <SDL2/SDL_scancode.h>
+// #include <SDL2/SDL.h>
 import "C"
 
 const (

diff --git a/sdl/sdl_surface.go b/sdl/sdl_surface.go
@@ -1,7 +1,7 @@
 package sdl
 
 /*
-#include <SDL2/SDL_surface.h>
+#include <SDL2/SDL.h>
 */
 import "C"
 import "unsafe"

diff --git a/sdl/sdl_syswm.go b/sdl/sdl_syswm.go
@@ -1,6 +1,5 @@
 package sdl
 
-// #cgo LDFLAGS: -lSDL2
 // #include <SDL2/SDL.h>
 // #include <SDL2/SDL_syswm.h>
 import "C"

diff --git a/sdl/sdl_test.go b/sdl/sdl_test.go
@@ -36,3 +36,14 @@ func TestInitQuit(t *testing.T) {
 	}
 	Quit()
 }
+
+func TestGetPlatform(t *testing.T) {
+	goos := runtime.GOOS
+	value := GetPlatform()
+	if ((goos == "linux" && value != "Linux") ||
+		(goos == "freebsd" && value != "FreeBSD") ||
+		(goos == "windows" && value != "Windows") ||
+		(goos == "darwin" && value != "Mac OS X")) {
+		t.Errorf("platform mismatch: '%s' != '%s'", goos, value)
+	}
+}
diff --git a/sdl/sdl_timer.go b/sdl/sdl_timer.go
@@ -1,6 +1,6 @@
 package sdl
 
-// #include <SDL2/SDL_timer.h>
+// #include <SDL2/SDL.h>
 import "C"
 
 func GetTicks() uint32 {

diff --git a/sdl/sdl_touch.go b/sdl/sdl_touch.go
@@ -1,6 +1,6 @@
 package sdl
 
-// #include <SDL2/SDL_touch.h>
+// #include <SDL2/SDL.h>
 import "C"
 import "unsafe"
 

diff --git a/sdl/sdl_version.go b/sdl/sdl_version.go
@@ -1,8 +1,6 @@
 package sdl
 
-/*
-#include <SDL2/SDL_version.h>
-*/
+// #include <SDL2/SDL.h>
 import "C"
 import "unsafe"
 

diff --git a/sdl/sdl_video.go b/sdl/sdl_video.go
@@ -1,6 +1,6 @@
 package sdl
 
-// #include <SDL2/SDL_video.h>
+// #include <SDL2/SDL.h>
 import "C"
 import "unsafe"
 

diff --git a/sdl_image/sdl_image.go b/sdl_image/sdl_image.go
@@ -1,8 +1,9 @@
 package img
 
-//#cgo !linux,freebsd LDFLAGS: -lSDL2 -lSDL2_image
-//#cgo !windows pkg-config: sdl2
-//#cgo !windows LDFLAGS: -lSDL2_image
+//#cgo linux freebsd pkg-config: sdl2
+//#cgo linux freebsd LDFLAGS: -lSDL2_image
+//#cgo windows LDFLAGS: -lSDL2 -lSDL2_image
+//#include <stdlib.h>
 //#include <SDL2/SDL_image.h>
 import "C"
 import "unsafe"

diff --git a/sdl_mixer/sdl_mixer.go b/sdl_mixer/sdl_mixer.go
@@ -1,8 +1,9 @@
 package mix
 
-//#cgo !linux,freebsd LDFLAGS: -lSDL2 -lSDL2_mixer
-//#cgo !windows pkg-config: sdl2
-//#cgo !windows LDFLAGS: -lSDL2_mixer
+//#cgo windows LDFLAGS: -lSDL2 -lSDL2_mixer
+//#cgo linux freebsd pkg-config: sdl2
+//#cgo linux freebsd LDFLAGS: -lSDL2_mixer
+//#include <stdlib.h>
 //#include <SDL2/SDL_mixer.h>
 //
 //extern void callPostMixFunction(void *udata, Uint8* stream, int length);

diff --git a/sdl_ttf/sdl_ttf.go b/sdl_ttf/sdl_ttf.go
@@ -1,8 +1,9 @@
 package ttf
 
-//#cgo !linux,freebsd LDFLAGS: -lSDL2 -lSDL2_ttf
-//#cgo !windows pkg-config: sdl2
-//#cgo !windows LDFLAGS: -lSDL2_ttf
+//#cgo windows LDFLAGS: -lSDL2 -lSDL2_ttf
+//#cgo linux freebsd pkg-config: sdl2
+//#cgo linux freebsd LDFLAGS: -lSDL2_ttf
+//#include <stdlib.h>
 //#include <SDL2/SDL_ttf.h>
 //void Do_TTF_SetError(const char *str) {
 //    TTF_SetError(str);
-Original file line number
+Diff line change
@@ -1,2 +1,3 @@
     *.swp
+    *~
     go-sdl2