Mirrors/bimg
1
0
Fork 0
mirror of https://github.com/bkaradzic/bimg.git synced 2026-02-17 12:42:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed assert macros, and improved error handling.

Browse Source
This commit is contained in:
Бранимир Караџић
2021-10-25 18:59:22 -07:00
parent 6693de0e50
commit c4941995d3
8 changed files with 85 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/bimg.lua
View File

@@ -7,7 +7,6 @@ project "bimg"
kind "StaticLib"
includedirs {
path.join(BX_DIR, "include"),
path.join(BIMG_DIR, "include"),
path.join(BIMG_DIR, "3rdparty/astc-codec"),
path.join(BIMG_DIR, "3rdparty/astc-codec/include"),
@@ -36,6 +35,8 @@ project "bimg"
path.join(BIMG_DIR, "3rdparty/tinyexr/deps/miniz/miniz.*"),
}
using_bx()
configuration { "linux-*" }
buildoptions {
"-fPIC",

3
scripts/bimg_decode.lua
View File

@@ -7,7 +7,6 @@ project "bimg_decode"
kind "StaticLib"
includedirs {
path.join(BX_DIR, "include"),
path.join(BIMG_DIR, "include"),
path.join(BIMG_DIR, "3rdparty"),
path.join(BIMG_DIR, "3rdparty/tinyexr/deps/miniz"),
@@ -18,6 +17,8 @@ project "bimg_decode"
path.join(BIMG_DIR, "src/image_decode.*"),
}
using_bx()
configuration { "linux-*" }
buildoptions {
"-fPIC",

3
scripts/bimg_encode.lua
View File

@@ -7,7 +7,6 @@ project "bimg_encode"
kind "StaticLib"
includedirs {
path.join(BX_DIR, "include"),
path.join(BIMG_DIR, "include"),
path.join(BIMG_DIR, "3rdparty"),
path.join(BIMG_DIR, "3rdparty/nvtt"),
@@ -38,6 +37,8 @@ project "bimg_encode"
path.join(BIMG_DIR, "3rdparty/iqa/source/**.c"),
}
using_bx()
configuration { "linux-*" }
buildoptions {
"-fPIC",

4
scripts/genie.lua
View File

@@ -37,7 +37,6 @@ solution "bimg"
end
language "C++"
startproject "example-00-helloworld"
MODULE_DIR = path.getabsolute("..")
BIMG_DIR = path.getabsolute("..")
@@ -64,12 +63,11 @@ function copyLib()
end
group "libs"
dofile(path.join(BX_DIR, "scripts/bx.lua"))
dofile "bimg.lua"
dofile "bimg_decode.lua"
dofile "bimg_encode.lua"
dofile(path.join(BX_DIR, "scripts/bx.lua"))
if _OPTIONS["with-tools"] then
group "tools"
dofile "texturec.lua"

4
scripts/texturec.lua
View File

@@ -7,7 +7,6 @@ project "texturec"
kind "ConsoleApp"
includedirs {
path.join(BX_DIR, "include"),
path.join(BIMG_DIR, "include"),
}
@@ -20,9 +19,10 @@ project "texturec"
"bimg_decode",
"bimg_encode",
"bimg",
"bx",
}
using_bx()
configuration { "mingw-*" }
targetextension ".exe"