Compare commits
2 Commits
53446cfa1d
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| a53d1f87ee | |||
| 7b5c760974 |
12
Makefile
12
Makefile
@@ -15,16 +15,26 @@ else
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
.PHONY: pkg-gba
|
.PHONY: pkg-gba
|
||||||
pkg-gba: build
|
pkg-gba: build-pack build-gba-player
|
||||||
${BC_CMD_ENVRUN} ${BC_PY3} deps/nostalgia/util/scripts/pkg-gba.py project ${BC_VAR_PROJECT_NAME_CAP}
|
${BC_CMD_ENVRUN} ${BC_PY3} deps/nostalgia/util/scripts/pkg-gba.py project ${BC_VAR_PROJECT_NAME_CAP}
|
||||||
|
|
||||||
.PHONY: pkg-mac
|
.PHONY: pkg-mac
|
||||||
pkg-mac: install
|
pkg-mac: install
|
||||||
${BC_CMD_ENVRUN} ${BC_PY3} deps/nostalgia/util/scripts/pkg-dmg.py JasperStudio
|
${BC_CMD_ENVRUN} ${BC_PY3} deps/nostalgia/util/scripts/pkg-dmg.py JasperStudio
|
||||||
|
|
||||||
|
.PHONY: build-gba-player
|
||||||
|
build-gba-player:
|
||||||
|
cmake --build ./build/gba-*
|
||||||
|
|
||||||
.PHONY: build-player
|
.PHONY: build-player
|
||||||
build-player:
|
build-player:
|
||||||
${BC_CMD_CMAKE_BUILD} ${BC_VAR_BUILD_PATH} ${BC_VAR_PROJECT_NAME_CAP}
|
${BC_CMD_CMAKE_BUILD} ${BC_VAR_BUILD_PATH} ${BC_VAR_PROJECT_NAME_CAP}
|
||||||
|
|
||||||
|
.PHONY: build-pack
|
||||||
|
build-pack:
|
||||||
|
cmake --build ./build/${BC_VAR_CURRENT_BUILD} --target ${BC_VAR_PROJECT_NAME}-pack
|
||||||
|
|
||||||
|
|
||||||
.PHONY: run
|
.PHONY: run
|
||||||
run: build-player
|
run: build-player
|
||||||
${PROJECT_PLAYER} project
|
${PROJECT_PLAYER} project
|
||||||
|
|||||||
7
deps/nostalgia/deps/ox/src/ox/std/vector.hpp
vendored
7
deps/nostalgia/deps/ox/src/ox/std/vector.hpp
vendored
@@ -57,7 +57,14 @@ struct VectorAllocator {
|
|||||||
if (cap <= m_data.size() && count <= m_data.size()) {
|
if (cap <= m_data.size() && count <= m_data.size()) {
|
||||||
for (auto i = 0u; i < count; ++i) {
|
for (auto i = 0u; i < count; ++i) {
|
||||||
auto const srcItem = std::launder(reinterpret_cast<T*>(&src->m_data[i]));
|
auto const srcItem = std::launder(reinterpret_cast<T*>(&src->m_data[i]));
|
||||||
|
#if defined(__GNUC__) && __GNUC__ >= 12
|
||||||
|
#pragma GCC diagnostic push
|
||||||
|
#pragma GCC diagnostic ignored "-Wstringop-overflow="
|
||||||
|
#endif
|
||||||
new (&m_data[i]) T(std::move(*srcItem));
|
new (&m_data[i]) T(std::move(*srcItem));
|
||||||
|
#if defined(__GNUC__) && __GNUC__ >= 12
|
||||||
|
#pragma GCC diagnostic pop
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
if (count) {
|
if (count) {
|
||||||
*items = std::launder(reinterpret_cast<T*>(m_data.data()));
|
*items = std::launder(reinterpret_cast<T*>(m_data.data()));
|
||||||
|
|||||||
Reference in New Issue
Block a user