Skip to content

Commit 9dd50f9

Browse files
bkaradzicbkaradzic
committed
Cleanup.
1 parent 16f5562 commit 9dd50f9

File tree

2 files changed

+20
-70
lines changed

2 files changed

+20
-70
lines changed

‎.github/workflows/main.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
{ config: debug, binsuffix: Debug },
106106
{ config: release, binsuffix: Release },
107107
]
108-
name: linux-${{ matrix.config }}64
108+
name: linux-gcc-${{ matrix.config }}64
109109
runs-on: ubuntu-22.04
110110
steps:
111111
- name: Checkout bgfx
@@ -126,7 +126,7 @@ jobs:
126126
run: |
127127
sudo apt install libgl-dev
128128
cd bgfx
129-
make -j$(nproc) linux-${{ matrix.config }}64
129+
make -j$(nproc) linux-gcc-${{ matrix.config }}64
130130
- name: Check
131131
run: |
132132
cd bgfx

‎makefile‎

Lines changed: 18 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ clean: ## Clean all intermediate files.
3838
projgen: ## Generate project files for all configurations.
3939
$(GENIE) --with-tools --with-combined-examples --with-shared-lib vs2019
4040
$(GENIE) --with-tools --with-combined-examples --with-shared-lib --gcc=mingw-gcc gmake
41+
$(GENIE) --with-tools --with-combined-examples --with-shared-lib --gcc=mingw-clang gmake
4142
$(GENIE) --with-tools --with-combined-examples --with-shared-lib --gcc=linux-gcc gmake
43+
$(GENIE) --with-tools --with-combined-examples --with-shared-lib --gcc=linux-clang gmake
4244
$(GENIE) --with-tools --with-combined-examples --with-shared-lib --gcc=osx-x64 gmake
4345
$(GENIE) --with-tools --with-combined-examples --with-shared-lib --gcc=osx-arm64 gmake
4446
$(GENIE) --with-tools --with-combined-examples --with-shared-lib --xcode=osx xcode9
@@ -95,13 +97,21 @@ wasm-release: .build/projects/gmake-wasm ## Build - Emscripten Release
9597
$(MAKE) -R -C .build/projects/gmake-wasm config=release
9698
wasm: wasm-debug wasm-release ## Build - Emscripten Debug and Release
9799

98-
.build/projects/gmake-linux:
100+
.build/projects/gmake-linux-gcc:
99101
$(GENIE) --with-tools --with-combined-examples --with-shared-lib --gcc=linux-gcc gmake
100-
linux-debug64: .build/projects/gmake-linux ## Build - Linux x64 Debug
101-
$(MAKE) -R -C .build/projects/gmake-linux config=debug64
102-
linux-release64: .build/projects/gmake-linux ## Build - Linux x64 Release
103-
$(MAKE) -R -C .build/projects/gmake-linux config=release64
104-
linux: linux-debug64 linux-release64 ## Build - Linux x86/x64 Debug and Release
102+
linux-gcc-debug64: .build/projects/gmake-linux-gcc ## Build - Linux GCC x64 Debug
103+
$(MAKE) -R -C .build/projects/gmake-linux-gcc config=debug64
104+
linux-gcc-release64: .build/projects/gmake-linux-gcc ## Build - Linux GCC x64 Release
105+
$(MAKE) -R -C .build/projects/gmake-linux-gcc config=release64
106+
linux-gcc: linux-gcc-debug64 linux-gcc-release64 ## Build - Linux GCC x86/x64 Debug and Release
107+
108+
.build/projects/gmake-linux-clang:
109+
$(GENIE) --with-tools --with-combined-examples --with-shared-lib --gcc=linux-clang gmake
110+
linux-clang-debug64: .build/projects/gmake-linux-clang ## Build - Linux Clang x64 Debug
111+
$(MAKE) -R -C .build/projects/gmake-linux-gcc config=debug64
112+
linux-clang-release64: .build/projects/gmake-linux-clang ## Build - Linux Clang x64 Release
113+
$(MAKE) -R -C .build/projects/gmake-linux-clang config=release64
114+
linux-clang: linux-clang-debug64 linux-clang-release64 ## Build - Linux Clang x86/x64 Debug and Release
105115

106116
.build/projects/gmake-mingw-gcc:
107117
$(GENIE) --with-tools --with-combined-examples --with-shared-lib --os=windows --gcc=mingw-gcc gmake
@@ -184,28 +194,6 @@ rpi-release: .build/projects/gmake-rpi ## Build - RasberryPi Release
184194
$(MAKE) -R -C .build/projects/gmake-rpi config=release
185195
rpi: rpi-debug rpi-release ## Build - RasberryPi Debug and Release
186196

187-
build-darwin: osx-x64
188-
189-
build-linux: linux-debug64 linux-release64
190-
191-
build-windows: mingw-gcc
192-
193-
build: build-$(OS)
194-
195-
rebuild-shaders:
196-
$(MAKE) -R -C examples rebuild
197-
198-
assets: # Build assets.
199-
$(NINJA) -C scripts
200-
201-
analyze:
202-
cppcheck src/
203-
cppcheck examples/
204-
205-
docs:
206-
doxygen scripts/bgfx.doxygen
207-
markdown README.md > .build/docs/readme.html
208-
209197
###
210198

211199
SILENT ?= @
@@ -214,8 +202,8 @@ UNAME := $(shell uname)
214202
ifeq ($(UNAME),$(filter $(UNAME),Linux Darwin))
215203
ifeq ($(UNAME),$(filter $(UNAME),Darwin))
216204
OS=darwin
217-
BUILD_PROJECT_DIR=gmake-osx-x64
218-
BUILD_OUTPUT_DIR=osx-x64
205+
BUILD_PROJECT_DIR=gmake-osx-arm64
206+
BUILD_OUTPUT_DIR=osx-arm64
219207
BUILD_TOOLS_CONFIG=release
220208
BUILD_TOOLS_SUFFIX=Release
221209
EXE=
@@ -260,41 +248,3 @@ tools: geometryc geometryv shaderc texturec texturev ## Build tools.
260248

261249
clean-tools: ## Clean tools projects.
262250
-$(SILENT) rm -r .build/projects/$(BUILD_PROJECT_DIR)
263-
264-
dist-windows: .build/projects/gmake-mingw-gcc
265-
$(SILENT) $(MAKE) -C .build/projects/gmake-mingw-gcc config=release64 -j 6 geometryc
266-
$(SILENT) cp .build/win64_mingw-gcc/bin/geometrycRelease.exe tools/bin/windows/geometryc.exe
267-
$(SILENT) $(MAKE) -C .build/projects/gmake-mingw-gcc config=release64 -j 6 geometryv
268-
$(SILENT) cp .build/win64_mingw-gcc/bin/geometryvRelease.exe tools/bin/windows/geometryv.exe
269-
$(SILENT) $(MAKE) -C .build/projects/gmake-mingw-gcc config=release64 -j 6 shaderc
270-
$(SILENT) cp .build/win64_mingw-gcc/bin/shadercRelease.exe tools/bin/windows/shaderc.exe
271-
$(SILENT) $(MAKE) -C .build/projects/gmake-mingw-gcc config=release64 -j 6 texturec
272-
$(SILENT) cp .build/win64_mingw-gcc/bin/texturecRelease.exe tools/bin/windows/texturec.exe
273-
$(SILENT) $(MAKE) -C .build/projects/gmake-mingw-gcc config=release64 -j 6 texturev
274-
$(SILENT) cp .build/win64_mingw-gcc/bin/texturevRelease.exe tools/bin/windows/texturev.exe
275-
276-
dist-linux: .build/projects/gmake-linux
277-
$(SILENT) $(MAKE) -C .build/projects/gmake-linux config=release64 -j 6 geometryc
278-
$(SILENT) cp .build/linux64_gcc/bin/geometrycRelease tools/bin/linux/geometryc
279-
$(SILENT) $(MAKE) -C .build/projects/gmake-linux config=release64 -j 6 geometryv
280-
$(SILENT) cp .build/linux64_gcc/bin/geometryvRelease tools/bin/linux/geometryv
281-
$(SILENT) $(MAKE) -C .build/projects/gmake-linux config=release64 -j 6 shaderc
282-
$(SILENT) cp .build/linux64_gcc/bin/shadercRelease tools/bin/linux/shaderc
283-
$(SILENT) $(MAKE) -C .build/projects/gmake-linux config=release64 -j 6 texturec
284-
$(SILENT) cp .build/linux64_gcc/bin/texturecRelease tools/bin/linux/texturec
285-
$(SILENT) $(MAKE) -C .build/projects/gmake-linux config=release64 -j 6 texturev
286-
$(SILENT) cp .build/linux64_gcc/bin/texturevRelease tools/bin/linux/texturev
287-
288-
dist-darwin: .build/projects/gmake-osx-x64
289-
$(SILENT) $(MAKE) -C .build/projects/gmake-osx-x64 config=release -j 6 geometryc
290-
$(SILENT) cp .build/osx-x64/bin/geometrycRelease tools/bin/darwin/geometryc
291-
$(SILENT) $(MAKE) -C .build/projects/gmake-osx-x64 config=release -j 6 geometryv
292-
$(SILENT) cp .build/osx-x64/bin/geometryvRelease tools/bin/darwin/geometryv
293-
$(SILENT) $(MAKE) -C .build/projects/gmake-osx-x64 config=release -j 6 shaderc
294-
$(SILENT) cp .build/osx-x64/bin/shadercRelease tools/bin/darwin/shaderc
295-
$(SILENT) $(MAKE) -C .build/projects/gmake-osx-x64 config=release -j 6 texturec
296-
$(SILENT) cp .build/osx-x64/bin/texturecRelease tools/bin/darwin/texturec
297-
$(SILENT) $(MAKE) -C .build/projects/gmake-osx-x64 config=release -j 6 texturev
298-
$(SILENT) cp .build/osx-x64/bin/texturevRelease tools/bin/darwin/texturev
299-
300-
dist: clean dist-windows dist-linux dist-darwin

0 commit comments

Comments
 (0)