From 2140d8ee3f4c1c05216fbdcee2f4f2ca1e2bd03c Mon Sep 17 00:00:00 2001 From: scawful Date: Fri, 9 Aug 2024 17:28:25 -0400 Subject: [PATCH] housekeeping --- CMakeLists.txt | 5 +++-- src/py/CMakeLists.txt | 2 -- src/py/yaze_py.cc | 4 ++-- src/test/rom_test.cc | 10 ++++++---- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 48a2e894..2415e1d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ set(YAZE_BUILD_PYTHON ON) set(YAZE_BUILD_CLIB ON) set(YAZE_INSTALL_CLIB OFF) set(YAZE_BUILD_TESTS OFF) -set(YAZE_BUILD_EXTENSIONS OFF) +set(YAZE_BUILD_EXTENSIONS ON) # C++ Standard and CMake Specifications set(CMAKE_CXX_STANDARD 20) @@ -21,7 +21,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) set(BUILD_SHARED_LIBS OFF) -set(CMAKE_FIND_FRAMEWORK LAST) +set(CMAKE_FIND_FRAMEWORK LAST) +set(CMAKE_SHARED_MODULE_PREFIX "") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dlinux -Dstricmp=strcasecmp") if (MACOS) set(CMAKE_INSTALL_PREFIX /usr/local) diff --git a/src/py/CMakeLists.txt b/src/py/CMakeLists.txt index aac01041..7d3a0bcb 100644 --- a/src/py/CMakeLists.txt +++ b/src/py/CMakeLists.txt @@ -2,8 +2,6 @@ find_package(PythonLibs 3.8 REQUIRED) cmake_policy(SET CMP0167 NEW) find_package(Boost COMPONENTS python3 REQUIRED) -set(CMAKE_SHARED_MODULE_PREFIX "") - # target x86_64 for module add_library( yaze_py MODULE diff --git a/src/py/yaze_py.cc b/src/py/yaze_py.cc index 15ba81ac..e022fa89 100644 --- a/src/py/yaze_py.cc +++ b/src/py/yaze_py.cc @@ -7,7 +7,7 @@ BOOST_PYTHON_MODULE(yaze) { using namespace boost::python; - class_("rom") + class_("z3_rom") .def_readonly("filename", &z3_rom::filename) .def_readonly("data", &z3_rom::data) .def_readonly("size", &z3_rom::size) @@ -23,7 +23,7 @@ BOOST_PYTHON_MODULE(yaze) { .def_readonly("size", &snes_palette::size) .def_readonly("colors", &snes_palette::colors); - class_("sprite_action") + class_("z3_sprite_action") .def_readonly("name", &sprite_action::name) .def_readonly("id", &sprite_action::id); diff --git a/src/test/rom_test.cc b/src/test/rom_test.cc index e2d34360..f64f936d 100644 --- a/src/test/rom_test.cc +++ b/src/test/rom_test.cc @@ -3,8 +3,10 @@ #include #include -namespace yaze { -namespace app { +namespace yaze_test { +namespace rom_test { + +using yaze::app::Rom; class RomTest : public ::testing::Test { protected: @@ -16,5 +18,5 @@ TEST_F(RomTest, RomTest) { EXPECT_EQ(rom_.data(), nullptr); } -} // namespace app -} // namespace yaze \ No newline at end of file +} // namespace rom_test +} // namespace yaze_test \ No newline at end of file