Skip to content

Commit b8ff228

Browse files
Update: fuck VS
1 parent dea69c3 commit b8ff228

File tree

5 files changed

+19
-17
lines changed

5 files changed

+19
-17
lines changed

CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@ if(MSVC)
88
set(TARGET_COMPILE_OPTIONS
99
/W4
1010
)
11-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/build)
12-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_SOURCE_DIR}/build)
13-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_SOURCE_DIR}/build)
1411
else()
1512
set(TARGET_COMPILE_OPTIONS
1613
-Wall -Wextra -pedantic
1714
)
1815
endif()
1916

17+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
18+
2019
if(WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
2120
# see https://github.com/ntut-open-source-club/practical-tools-for-simple-design/issues/22
2221
set(CMAKE_RC_FLAGS="-C 1252")
@@ -213,6 +212,9 @@ target_link_libraries(AudioTest
213212
PTSD
214213
GTest::gtest_main
215214
)
215+
216+
target_compile_definitions(AudioTest PRIVATE ASSETS_DIR="${PTSD_ASSETS_DIR}")
217+
216218
target_include_directories(AudioTest SYSTEM PRIVATE
217219
${INCLUDE_DIR}
218220
${DEPENDENCY_INCLUDE_DIRS}

example/src/App.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ void App::Start() {
1111
LOG_TRACE("Start");
1212

1313
m_Giraffe->SetDrawable(
14-
std::make_shared<Util::Image>("../assets/sprites/giraffe.png"));
14+
std::make_shared<Util::Image>(ASSETS_DIR"/sprites/giraffe.png"));
1515
m_Giraffe->SetZIndex(5);
1616
m_Giraffe->Start();
1717

example/src/Cat.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
Cat::Cat()
77
: m_Animation(std::make_shared<Util::Animation>(
88
std::vector<std::string>{
9-
"../assets/sprites/cat/cat-0.bmp",
10-
"../assets/sprites/cat/cat-1.bmp",
11-
"../assets/sprites/cat/cat-2.bmp",
12-
"../assets/sprites/cat/cat-3.bmp",
13-
"../assets/sprites/cat/cat-4.bmp",
14-
"../assets/sprites/cat/cat-5.bmp",
15-
"../assets/sprites/cat/cat-6.bmp",
16-
"../assets/sprites/cat/cat-7.bmp",
9+
ASSETS_DIR"/sprites/cat/cat-0.bmp",
10+
ASSETS_DIR"/sprites/cat/cat-1.bmp",
11+
ASSETS_DIR"/sprites/cat/cat-2.bmp",
12+
ASSETS_DIR"/sprites/cat/cat-3.bmp",
13+
ASSETS_DIR"/sprites/cat/cat-4.bmp",
14+
ASSETS_DIR"/sprites/cat/cat-5.bmp",
15+
ASSETS_DIR"/sprites/cat/cat-6.bmp",
16+
ASSETS_DIR"/sprites/cat/cat-7.bmp",
1717
},
1818
true, 50, true, 1000)) {
1919
m_Transform.translation = {-200, 200};

example/src/Giraffe.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
void Giraffe::Start() {
1111
m_GiraffeText =
12-
std::make_shared<GiraffeText>("../assets/fonts/Inter.ttf", 50);
12+
std::make_shared<GiraffeText>(ASSETS_DIR"/fonts/Inter.ttf", 50);
1313
m_GiraffeText->SetZIndex(this->GetZIndex() - 1);
1414
m_GiraffeText->Start();
1515
this->AddChild(m_GiraffeText);

test/Interactive/Audio.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class AudioTest : public ::testing::Test {
6262
};
6363

6464
TEST_F(AudioTest, BGM_TEST) {
65-
auto bgm = Util::BGM("../assets/audio/testbgm.mp3");
65+
auto bgm = Util::BGM(ASSETS_DIR"/audio/testbgm.mp3");
6666

6767
bgm.Play();
6868
EXCEPT_INPUT_YES("Do you hear the bgm?");
@@ -87,7 +87,7 @@ TEST_F(AudioTest, BGM_TEST) {
8787
}
8888

8989
TEST_F(AudioTest, SFX_TEST) {
90-
auto sfx = Util::SFX("../assets/audio/Click.wav");
90+
auto sfx = Util::SFX(ASSETS_DIR"/audio/Click.wav");
9191

9292
sfx.Play();
9393
EXCEPT_INPUT_YES("Do you hear the sfx?");
@@ -102,8 +102,8 @@ TEST_F(AudioTest, SFX_TEST) {
102102
}
103103

104104
TEST_F(AudioTest, BGM_SFX_TEST) {
105-
auto bgm = Util::BGM("../assets/audio/testbgm.mp3");
106-
auto sfx = Util::SFX("../assets/audio/Click.wav");
105+
auto bgm = Util::BGM(ASSETS_DIR"/audio/testbgm.mp3");
106+
auto sfx = Util::SFX(ASSETS_DIR"/audio/Click.wav");
107107

108108
bgm.SetVolume(100);
109109
sfx.SetVolume(100);

0 commit comments

Comments
 (0)