rm-archive/PuzzleSolver
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed Merge Errors

Browse Source
This commit is contained in:
TabDragon 2017-12-20 23:15:17 +01:00
parent 9720613543
commit 0faadc8c25
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/CMakeLists.txt
View File

@ -10,7 +10,6 @@ set(SOURCE_FILES
functions/solve/classExtension.cpp functions/solve/classExtension.cpp
functions/solve/structure.cpp functions/solve/structure.cpp
functions/AbstractionLayers/AbstraktionLayer_Base.h functions/AbstractionLayers/AbstraktionLayer_Base.h
functions/AbstractionLayers/DestructionPower/DestructionPower.cpp
) )
add_executable(PuzzleSolver ${SOURCE_FILES}) add_executable(PuzzleSolver ${SOURCE_FILES})
include_directories(${OpenCV_INCLUDE_DIRS}) include_directories(${OpenCV_INCLUDE_DIRS})

1
Source/functions/AbstractionLayers/DestructionPower/DestructionPower.h
View File

@ -9,6 +9,7 @@
#define DESTRUCTION_COUNT 1 #define DESTRUCTION_COUNT 1
#include "../AbstraktionLayer_Base.h" #include "../AbstraktionLayer_Base.h"
#include "DestructionPower_Properties.h"
#include <vector> #include <vector>
#include <iostream> #include <iostream>
#include <bitset> #include <bitset>

3
Source/header.h
View File

@ -11,9 +11,6 @@
using namespace std; using namespace std;
#include "header/input.h"
/** /**
* IMPORTANT: Each new layer must be included there, to avoid compile errors * IMPORTANT: Each new layer must be included there, to avoid compile errors
*/ */