Merge branch 'master' of github.com:FrancescoRigoni/Lib65816

This commit is contained in:
Francesco Rigoni 2018-03-04 21:32:00 +01:00
commit c128c1cc82
2 changed files with 4 additions and 3 deletions

View File

@ -25,8 +25,6 @@ else ()
set (CMAKE_CXX_STANDARD 14)
endif ()
# Add all include directories
include_directories(include/ ${SIMPLE_LOGGER_SRC})
# Add paths for linker
link_directories(${SIMPLE_LOGGER_BIN})
@ -37,3 +35,4 @@ file(GLOB sources_65816 src/*.cpp src/opcodes/*.cpp)
add_library(65816 ${sources_65816})
add_dependencies(65816 simple-logger)
target_link_libraries(65816 simpleLogger)
target_include_directories(65816 PRIVATE ${PROJECT_SOURCE_DIR}/include ${SIMPLE_LOGGER_SRC})

View File

@ -17,7 +17,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "Cpu65816.hpp"
#include <Cpu65816.hpp>
#include <OpCode.hpp>
#include <SystemBusDevice.hpp>
#define LOG_TAG "Addressing"