UnrealXR/raylib-go
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename rlib to rreslib

Browse source
This commit is contained in:
Milan Nikolic 2017-12-05 16:38:08 +01:00
parent 020ab54435
commit 275bcd3efc
7 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
raylib/rres.go
View file

@ -8,7 +8,7 @@ import (
"unsafe"
"github.com/gen2brain/raylib-go/rres"
"github.com/gen2brain/raylib-go/rres/rlib"
"github.com/gen2brain/raylib-go/rres/rreslib"
)
// LoadResource - Load resource from file by id
@ -57,13 +57,13 @@ func LoadResource(reader io.ReadSeeker, rresID int, key []byte) (data rres.Data)
reader.Read(b)
// Decompress data
data.Data, err = rlib.Decompress(b, int(infoHeader.CompType))
data.Data, err = rreslib.Decompress(b, int(infoHeader.CompType))
if err != nil {
TraceLog(LogWarning, "[ID %d] %v", infoHeader.ID, err)
}
// Decrypt data
data.Data, err = rlib.Decrypt(key, data.Data, int(infoHeader.CryptoType))
data.Data, err = rreslib.Decrypt(key, data.Data, int(infoHeader.CryptoType))
if err != nil {
TraceLog(LogWarning, "[ID %d] %v", infoHeader.ID, err)
}

6
rres/cmd/rrem/main.go
View file

@ -30,7 +30,7 @@ import (
"github.com/moutend/go-wav"
"github.com/gen2brain/raylib-go/rres"
"github.com/gen2brain/raylib-go/rres/rlib"
"github.com/gen2brain/raylib-go/rres/rreslib"
)
func init() {
@ -156,7 +156,7 @@ func main() {
}
// Encryption
data, err = rlib.Encrypt([]byte(*key), data, int(infoHeader.CryptoType))
data, err = rreslib.Encrypt([]byte(*key), data, int(infoHeader.CryptoType))
if err != nil {
fmt.Printf("%v\n", err)
}
@ -164,7 +164,7 @@ func main() {
infoHeader.UncompSize = uint32(len(data))
// Compression
data, err = rlib.Compress(data, int(infoHeader.CompType))
data, err = rreslib.Compress(data, int(infoHeader.CompType))
if err != nil {
fmt.Printf("%v\n", err)
}

4
rres/rlib/cgo/Makefile
View file

@ -1,4 +0,0 @@
all: build
build:
go build -buildmode=c-archive -o rlib.a

4
rres/rreslib/cgo/Makefile Normal file
View file

@ -0,0 +1,4 @@
all: build
build:
go build -buildmode=c-archive -o rreslib.a

8
rres/rlib/cgo/make.bash → rres/rreslib/cgo/make.bash
View file

@ -5,14 +5,14 @@ MINGW="/usr/i686-w64-mingw32"
RPI="/usr/armv6j-hardfloat-linux-gnueabi"
ANDROID="/opt/android-toolchain-arm7"
CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -buildmode=c-archive -o release/linux/rlib.a -ldflags "-s -w"
CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -buildmode=c-archive -o release/linux/rreslib.a -ldflags "-s -w"
CC="i686-w64-mingw32-gcc" CXX="i686-w64-mingw32-g++" \
CGO_ENABLED=1 GOOS=windows GOARCH=386 go build -buildmode=c-archive -o release/win32/rlib.a -ldflags "-s -w"
CGO_ENABLED=1 GOOS=windows GOARCH=386 go build -buildmode=c-archive -o release/win32/rreslib.a -ldflags "-s -w"
CC="armv6j-hardfloat-linux-gnueabi-gcc" CXX="armv6j-hardfloat-linux-gnueabi-g++" \
CGO_ENABLED=1 GOOS=linux GOARCH=arm go build -buildmode=c-archive -o release/rpi/rlib.a -ldflags "-s -w"
CGO_ENABLED=1 GOOS=linux GOARCH=arm go build -buildmode=c-archive -o release/rpi/rreslib.a -ldflags "-s -w"
PATH="$PATH:$ANDROID/bin" \
CC="arm-linux-androideabi-gcc" CXX="arm-linux-androideabi-g++" \
CGO_ENABLED=1 GOOS=android GOARCH=arm go build -buildmode=c-shared -o release/android/armeabi-v7a/rlib.so -ldflags "-s -w"
CGO_ENABLED=1 GOOS=android GOARCH=arm go build -buildmode=c-shared -o release/android/armeabi-v7a/rreslib.so -ldflags "-s -w"

10
rres/rlib/cgo/rlib.go → rres/rreslib/cgo/rreslib.go
View file

@ -5,14 +5,14 @@ import "C"
import (
"unsafe"
"github.com/gen2brain/raylib-go/rres/rlib"
"github.com/gen2brain/raylib-go/rres/rreslib"
)
//export Compress
func Compress(compType C.int, data *C.uchar, uncompSize C.ulong, outCompSize *C.ulong) *C.uchar {
d := C.GoBytes(unsafe.Pointer(data), C.int(uncompSize))
c, err := rlib.Compress(d, int(compType))
c, err := rreslib.Compress(d, int(compType))
if err != nil {
return nil
}
@ -25,7 +25,7 @@ func Compress(compType C.int, data *C.uchar, uncompSize C.ulong, outCompSize *C.
func Decompress(compType C.int, data *C.uchar, uncompSize C.ulong, compSize C.ulong) *C.uchar {
d := C.GoBytes(unsafe.Pointer(data), C.int(compSize))
c, err := rlib.Decompress(d, int(compType))
c, err := rreslib.Decompress(d, int(compType))
if err != nil {
return nil
}
@ -42,7 +42,7 @@ func Encrypt(cryptoType C.int, key *C.char, data *C.uchar, dataSize C.ulong, out
k := []byte(C.GoString(key))
d := C.GoBytes(unsafe.Pointer(data), C.int(dataSize))
c, err := rlib.Encrypt(k, d, int(cryptoType))
c, err := rreslib.Encrypt(k, d, int(cryptoType))
if err != nil {
return nil
}
@ -56,7 +56,7 @@ func Decrypt(cryptoType C.int, key *C.char, data *C.uchar, dataSize C.ulong) *C.
k := []byte(C.GoString(key))
d := C.GoBytes(unsafe.Pointer(data), C.int(dataSize))
c, err := rlib.Decrypt(k, d, int(cryptoType))
c, err := rreslib.Decrypt(k, d, int(cryptoType))
if err != nil {
return nil
}

4
rres/rlib/rlib.go → rres/rreslib/rreslib.go
View file

@ -1,5 +1,5 @@
// Package rlib provides Encrypt/Decrypt and Compress/Uncompress functions
package rlib
// Package rreslib provides Encrypt/Decrypt and Compress/Uncompress functions
package rreslib
import (
"bytes"