diff --git a/BSDmakefile b/BSDmakefile index c80bb535..da19f099 100644 --- a/BSDmakefile +++ b/BSDmakefile @@ -3,7 +3,7 @@ SRCDIR= ${.CURDIR} ALLDIRS!= find ${SRCDIR} -type d -not -path "./.git*" # Packages ROOTPKG= ${SRCDIR:S/${GOPATH}\/src\///} -PACKAGES= sdl sdl_image sdl_mixer sdl_ttf +PACKAGES= sdl img mix ttf # Some cleanups CLEANUP= *.cache *.core *~ *.orig diff --git a/GNUmakefile b/GNUmakefile index 4f051588..71d07d94 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -3,7 +3,7 @@ SRCDIR= ${CURDIR} ALLDIRS!= find ${SRCDIR} -type d -not -path "./.git*" # Packages ROOTPKG= $(subst ${GOPATH}/src/,,${SRCDIR}) -PACKAGES= sdl sdl_image sdl_mixer sdl_ttf +PACKAGES= sdl img mix ttf # Some cleanups CLEANUP= *.cache *.core *~ *.orig diff --git a/README.md b/README.md index 00616723..52c64851 100644 --- a/README.md +++ b/README.md @@ -52,9 +52,9 @@ Installation ============ To get the bindings, type: `go get -v github.com/veandco/go-sdl2/sdl` -`go get -v github.com/veandco/go-sdl2/sdl_mixer` -`go get -v github.com/veandco/go-sdl2/sdl_image` -`go get -v github.com/veandco/go-sdl2/sdl_ttf` +`go get -v github.com/veandco/go-sdl2/mix` +`go get -v github.com/veandco/go-sdl2/img` +`go get -v github.com/veandco/go-sdl2/ttf` or type this if you use Bash terminal: `go get -v github.com/veandco/go-sdl2/sdl{,_mixer,_image,_ttf}` diff --git a/examples/audio_mp3/audio_mp3.go b/examples/audio_mp3/audio_mp3.go index 99f3d312..85dcd25a 100644 --- a/examples/audio_mp3/audio_mp3.go +++ b/examples/audio_mp3/audio_mp3.go @@ -4,7 +4,7 @@ import ( "log" "github.com/veandco/go-sdl2/sdl" - "github.com/veandco/go-sdl2/sdl_mixer" + "github.com/veandco/go-sdl2/mix" ) func main() { diff --git a/examples/gfx/gfx.go b/examples/gfx/gfx.go index b261db05..f0b79b23 100644 --- a/examples/gfx/gfx.go +++ b/examples/gfx/gfx.go @@ -5,7 +5,7 @@ import ( "os" "github.com/veandco/go-sdl2/sdl" - "github.com/veandco/go-sdl2/sdl_gfx" + "github.com/veandco/go-sdl2/gfx" ) var winTitle string = "SDL2 GFX" diff --git a/examples/text/text.go b/examples/text/text.go index 13bb7568..2e9de1df 100644 --- a/examples/text/text.go +++ b/examples/text/text.go @@ -5,7 +5,7 @@ import ( "os" "github.com/veandco/go-sdl2/sdl" - "github.com/veandco/go-sdl2/sdl_ttf" + "github.com/veandco/go-sdl2/ttf" ) var winTitle string = "Text" diff --git a/examples/texture_png/texture_png.go b/examples/texture_png/texture_png.go index 05137550..6f6822e0 100644 --- a/examples/texture_png/texture_png.go +++ b/examples/texture_png/texture_png.go @@ -5,7 +5,7 @@ package main import ( "fmt" "github.com/veandco/go-sdl2/sdl" - "github.com/veandco/go-sdl2/sdl_image" + "github.com/veandco/go-sdl2/img" "os" ) diff --git a/sdl_gfx/sdl_gfx.go b/gfx/sdl_gfx.go similarity index 100% rename from sdl_gfx/sdl_gfx.go rename to gfx/sdl_gfx.go diff --git a/sdl_gfx/sdl_gfx_wrapper.h b/gfx/sdl_gfx_wrapper.h similarity index 100% rename from sdl_gfx/sdl_gfx_wrapper.h rename to gfx/sdl_gfx_wrapper.h diff --git a/sdl_image/sdl_image.go b/img/sdl_image.go similarity index 100% rename from sdl_image/sdl_image.go rename to img/sdl_image.go diff --git a/sdl_image/sdl_image_test.go b/img/sdl_image_test.go similarity index 100% rename from sdl_image/sdl_image_test.go rename to img/sdl_image_test.go diff --git a/sdl_image/sdl_image_wrapper.h b/img/sdl_image_wrapper.h similarity index 100% rename from sdl_image/sdl_image_wrapper.h rename to img/sdl_image_wrapper.h diff --git a/make.bat b/make.bat index 948b55b4..baf7622f 100644 --- a/make.bat +++ b/make.bat @@ -8,7 +8,7 @@ REM @SET ALLDIRS!= find ${SRCDIR} -type d -not -path "./.hg*" REM Packages SET ROOTPKG=github.com/veandco/go-sdl2 -SET PACKAGES=sdl sdl_image sdl_mixer sdl_ttf +SET PACKAGES=sdl img mix ttf SET GO=go diff --git a/sdl_mixer/midi.go b/mix/midi.go similarity index 100% rename from sdl_mixer/midi.go rename to mix/midi.go diff --git a/sdl_mixer/sdl_mixer.go b/mix/sdl_mixer.go similarity index 100% rename from sdl_mixer/sdl_mixer.go rename to mix/sdl_mixer.go diff --git a/sdl_mixer/sdl_mixer_wrapper.h b/mix/sdl_mixer_wrapper.h similarity index 100% rename from sdl_mixer/sdl_mixer_wrapper.h rename to mix/sdl_mixer_wrapper.h diff --git a/sdl_ttf/sdl_ttf.go b/ttf/sdl_ttf.go similarity index 100% rename from sdl_ttf/sdl_ttf.go rename to ttf/sdl_ttf.go diff --git a/sdl_ttf/sdl_ttf_test.go b/ttf/sdl_ttf_test.go similarity index 100% rename from sdl_ttf/sdl_ttf_test.go rename to ttf/sdl_ttf_test.go diff --git a/sdl_ttf/sdl_ttf_wrapper.h b/ttf/sdl_ttf_wrapper.h similarity index 100% rename from sdl_ttf/sdl_ttf_wrapper.h rename to ttf/sdl_ttf_wrapper.h