Rename sdl_image folder and its friends to match package name

Signed-off-by: Lilis Iskandar <[email protected]>
veandco · Jun 9, 2017 · 23a51d8 · 23a51d8
1 parent fa5f69a
commit 23a51d8
Show file tree

Hide file tree

Showing 19 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → gfx/sdl_gfx.go b/sdl_gfx/sdl_gfx.go → gfx/sdl_gfx.go
diff --git a/sdl_gfx/sdl_gfx_wrapper.h → gfx/sdl_gfx_wrapper.h b/sdl_gfx/sdl_gfx_wrapper.h → gfx/sdl_gfx_wrapper.h
diff --git a/sdl_image/sdl_image.go → img/sdl_image.go b/sdl_image/sdl_image.go → img/sdl_image.go
diff --git a/sdl_image/sdl_image_test.go → img/sdl_image_test.go b/sdl_image/sdl_image_test.go → img/sdl_image_test.go
diff --git a/sdl_image/sdl_image_wrapper.h → img/sdl_image_wrapper.h b/sdl_image/sdl_image_wrapper.h → img/sdl_image_wrapper.h
diff --git 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 → mix/midi.go b/sdl_mixer/midi.go → mix/midi.go
diff --git a/sdl_mixer/sdl_mixer.go → mix/sdl_mixer.go b/sdl_mixer/sdl_mixer.go → mix/sdl_mixer.go
diff --git a/sdl_mixer/sdl_mixer_wrapper.h → mix/sdl_mixer_wrapper.h b/sdl_mixer/sdl_mixer_wrapper.h → mix/sdl_mixer_wrapper.h
diff --git a/sdl_ttf/sdl_ttf.go → ttf/sdl_ttf.go b/sdl_ttf/sdl_ttf.go → ttf/sdl_ttf.go
diff --git a/sdl_ttf/sdl_ttf_test.go → ttf/sdl_ttf_test.go b/sdl_ttf/sdl_ttf_test.go → ttf/sdl_ttf_test.go
diff --git a/sdl_ttf/sdl_ttf_wrapper.h → ttf/sdl_ttf_wrapper.h b/sdl_ttf/sdl_ttf_wrapper.h → ttf/sdl_ttf_wrapper.h