Add -D_3DS flags where necessary

This commit is contained in:
Thomas Edvalson
2016-06-23 16:24:24 -04:00
parent 845369632d
commit bfb17bec47
3 changed files with 3 additions and 1 deletions
+1
View File
@@ -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 "")
+2
View File
@@ -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)
-1
View File
@@ -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")