mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Branimir Karadžić 2016-04-30 11:08:56 -07:00
parent 6cba8d5665
commit 32a9594134
6 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
makefile
View File

@ -343,11 +343,13 @@ tools: geometryc shaderc texturec texturev ## Build tools.
dist-windows: .build/projects/gmake-mingw-gcc dist-windows: .build/projects/gmake-mingw-gcc
$(SILENT) $(MAKE) -C .build/projects/gmake-mingw-gcc config=release64 -j 6 geometryc $(SILENT) $(MAKE) -C .build/projects/gmake-mingw-gcc config=release64 -j 6 geometryc
$(SILENT) cp .build/win64_mingw-gcc/bin/geometrycRelease tools/bin/windows/geometryc.exe $(SILENT) cp .build/win64_mingw-gcc/bin/geometrycRelease.exe tools/bin/windows/geometryc.exe
$(SILENT) $(MAKE) -C .build/projects/gmake-mingw-gcc config=release64 -j 6 shaderc $(SILENT) $(MAKE) -C .build/projects/gmake-mingw-gcc config=release64 -j 6 shaderc
$(SILENT) cp .build/win64_mingw-gcc/bin/shadercRelease tools/bin/windows/shaderc.exe $(SILENT) cp .build/win64_mingw-gcc/bin/shadercRelease.exe tools/bin/windows/shaderc.exe
$(SILENT) $(MAKE) -C .build/projects/gmake-mingw-gcc config=release64 -j 6 texturec $(SILENT) $(MAKE) -C .build/projects/gmake-mingw-gcc config=release64 -j 6 texturec
$(SILENT) cp .build/win64_mingw-gcc/bin/texturecRelease tools/bin/windows/texturec.exe $(SILENT) cp .build/win64_mingw-gcc/bin/texturecRelease.exe tools/bin/windows/texturec.exe
$(SILENT) $(MAKE) -C .build/projects/gmake-mingw-gcc config=release64 -j 6 texturev
$(SILENT) cp .build/win64_mingw-gcc/bin/texturevRelease.exe tools/bin/windows/texturev.exe
dist-linux: .build/projects/gmake-linux dist-linux: .build/projects/gmake-linux
$(SILENT) $(MAKE) -C .build/projects/gmake-linux config=release64 -j 6 geometryc $(SILENT) $(MAKE) -C .build/projects/gmake-linux config=release64 -j 6 geometryc
@ -356,6 +358,8 @@ dist-linux: .build/projects/gmake-linux
$(SILENT) cp .build/linux64_gcc/bin/shadercRelease tools/bin/linux/shaderc $(SILENT) cp .build/linux64_gcc/bin/shadercRelease tools/bin/linux/shaderc
$(SILENT) $(MAKE) -C .build/projects/gmake-linux config=release64 -j 6 texturec $(SILENT) $(MAKE) -C .build/projects/gmake-linux config=release64 -j 6 texturec
$(SILENT) cp .build/linux64_gcc/bin/texturecRelease tools/bin/linux/texturec $(SILENT) cp .build/linux64_gcc/bin/texturecRelease tools/bin/linux/texturec
$(SILENT) $(MAKE) -C .build/projects/gmake-linux config=release64 -j 6 texturev
$(SILENT) cp .build/linux64_gcc/bin/texturevRelease tools/bin/linux/texturev
dist-darwin: .build/projects/gmake-osx dist-darwin: .build/projects/gmake-osx
$(SILENT) $(MAKE) -C .build/projects/gmake-osx config=release64 -j 6 geometryc $(SILENT) $(MAKE) -C .build/projects/gmake-osx config=release64 -j 6 geometryc
@ -364,5 +368,7 @@ dist-darwin: .build/projects/gmake-osx
$(SILENT) cp .build/osx64_clang/bin/shadercRelease tools/bin/darwin/shaderc $(SILENT) cp .build/osx64_clang/bin/shadercRelease tools/bin/darwin/shaderc
$(SILENT) $(MAKE) -C .build/projects/gmake-osx config=release64 -j 6 texturec $(SILENT) $(MAKE) -C .build/projects/gmake-osx config=release64 -j 6 texturec
$(SILENT) cp .build/osx64_clang/bin/texturecRelease tools/bin/darwin/texturec $(SILENT) cp .build/osx64_clang/bin/texturecRelease tools/bin/darwin/texturec
$(SILENT) $(MAKE) -C .build/projects/gmake-osx config=release64 -j 6 texturev
$(SILENT) cp .build/osx64_clang/bin/texturevRelease tools/bin/darwin/texturev
dist: clean dist-windows dist-linux dist-darwin dist: clean dist-windows dist-linux dist-darwin

5
scripts/geometryc.lua
View File

@ -25,9 +25,14 @@ project "geometryc"
path.join(BGFX_DIR, "examples/common/bounds.**"), path.join(BGFX_DIR, "examples/common/bounds.**"),
} }
configuration { "mingw-*" }
targetextension ".exe"
configuration { "osx" } configuration { "osx" }
links { links {
"Cocoa.framework", "Cocoa.framework",
} }
configuration {}
strip() strip()

3
scripts/shaderc.lua
View File

@ -36,6 +36,9 @@ project "shaderc"
"/wd4996" -- warning C4996: 'strdup': The POSIX name for this item is deprecated. Instead, use the ISO C++ conformant name: _strdup. "/wd4996" -- warning C4996: 'strdup': The POSIX name for this item is deprecated. Instead, use the ISO C++ conformant name: _strdup.
} }
configuration { "mingw-*" }
targetextension ".exe"
configuration { "mingw* or linux or osx" } configuration { "mingw* or linux or osx" }
buildoptions { buildoptions {
"-fno-strict-aliasing", -- glsl-optimizer has bugs if strict aliasing is used. "-fno-strict-aliasing", -- glsl-optimizer has bugs if strict aliasing is used.

7
scripts/texturec.lua
View File

@ -38,11 +38,12 @@ project "texturec"
path.join(BGFX_DIR, "tools/texturec/**.h"), path.join(BGFX_DIR, "tools/texturec/**.h"),
} }
links { configuration { "mingw-*" }
-- "bgfx", targetextension ".exe"
}
configuration { "osx" } configuration { "osx" }
links { links {
"Cocoa.framework", "Cocoa.framework",
} }
configuration {}

2
scripts/texturev.lua
View File

@ -120,7 +120,7 @@ project ("texturev")
"/DELAYLOAD:\"libGLESv2.dll\"", "/DELAYLOAD:\"libGLESv2.dll\"",
} }
configuration { "mingw*" } configuration { "mingw-*" }
targetextension ".exe" targetextension ".exe"
configuration { "vs20* or mingw*" } configuration { "vs20* or mingw*" }

2
tools/texturev/texturev.cpp
View File

@ -224,7 +224,7 @@ struct View
} }
std::string name = path; std::string name = path;
char ch = name.back(); char ch = name[name.size()-1];
name += '/' == ch || '\\' == ch ? "" : "/"; name += '/' == ch || '\\' == ch ? "" : "/";
name += item->d_name; name += item->d_name;
m_fileList.push_back(name); m_fileList.push_back(name);