diff --git a/cmake/template_arm/CMakeLists.txt b/cmake/template_arm/CMakeLists.txt index ea2eaa4..6bb51d7 100644 --- a/cmake/template_arm/CMakeLists.txt +++ b/cmake/template_arm/CMakeLists.txt @@ -27,6 +27,7 @@ file(GLOB_RECURSE ROMFS_FILES ${PROJECT_SOURCE_DIR}/res/romfs/*) add_executable(${PROJECT_NAME}.elf ${SOURCE_FILES} ${ARM_SOURCE_FILES}) target_link_libraries(${PROJECT_NAME}.elf ${CPP3DS_ARM_LIBS}) +set_target_properties(${PROJECT_NAME}.elf PROPERTIES COMPILE_DEFINITIONS "_3DS") set_target_properties(${PROJECT_NAME}.elf PROPERTIES COMPILE_FLAGS "${CPP3DS_ARM_FLAGS}") set_target_properties(${PROJECT_NAME}.elf PROPERTIES LINK_FLAGS "-specs=3dsx.specs -march=armv6k -mtune=mpcore -mfloat-abi=hard -gc-sections") SET(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "") diff --git a/src/cpp3ds/CMakeLists.txt b/src/cpp3ds/CMakeLists.txt index d19705e..546cd3c 100644 --- a/src/cpp3ds/CMakeLists.txt +++ b/src/cpp3ds/CMakeLists.txt @@ -10,6 +10,8 @@ include_directories( set(CMAKE_C_FLAGS "") set(CMAKE_CXX_FLAGS "-std=c++11") +add_definitions(-D_3DS) + add_subdirectory(Audio) add_subdirectory(Graphics) add_subdirectory(Network) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 352a8a0..cb90e7a 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -131,7 +131,6 @@ set_target_properties(cpp3ds-test PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} $ set_target_properties(cpp3ds-test PROPERTIES COMPILE_DEFINITIONS "EMULATION;TEST") add_executable(tests ${SRCTESTS} ${SRC} ${RESOURCE_OUTPUT}) -#add_dependencies(tests cpp3ds-test) target_link_libraries(tests ${GTEST_BOTH_LIBRARIES} sfml-graphics sfml-window sfml-system sfml-audio openal GLEW GL jpeg freetype vorbisenc vorbisfile vorbis ogg ssl crypto pthread) set_target_properties(tests PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} ${CPP3DS_TEST_FLAGS} -std=c++11") set_target_properties(tests PROPERTIES COMPILE_DEFINITIONS "EMULATION;TEST")