summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--CMakeLists.txt10
-rwxr-xr-xcompile.sh3
-rwxr-xr-xrun.sh2
-rwxr-xr-xtest.sh2
5 files changed, 10 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index e0e61c9..445a194 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,7 @@ CMakeFiles
*.cmake
install_manifest.txt
output/
-cppbot
-cppbot_test
+bin/
*.sdf
*.suo
Debug/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97c6647..2a84f19 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,15 +1,17 @@
cmake_minimum_required(VERSION 3.2.2)
-project(cppbot)
+project(Spacebot)
set(CMAKE_CXX_FLAGS "-std=c++11")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
include_directories(${PROJECT_SOURCE_DIR}/include)
file(GLOB_RECURSE SRC_FILES RELATIVE ${PROJECT_SOURCE_DIR} src/*.cpp)
file(GLOB_RECURSE MAIN_FILES RELATIVE ${PROJECT_SOURCE_DIR} main/*.cpp)
-add_executable(cppbot ${SRC_FILES} ${MAIN_FILES})
+add_executable(spacebot ${SRC_FILES} ${MAIN_FILES})
enable_testing()
file(GLOB_RECURSE TEST_FILES RELATIVE ${PROJECT_SOURCE_DIR} test/*.cpp)
-add_executable(cppbot_test ${SRC_FILES} ${TEST_FILES})
-add_test(Tests cppbot_test)
+add_executable(spacebot_test ${SRC_FILES} ${TEST_FILES})
+add_test(Tests bin/spacebot_test)
diff --git a/compile.sh b/compile.sh
index c89b8f8..a073c19 100755
--- a/compile.sh
+++ b/compile.sh
@@ -1,4 +1,3 @@
#!/bin/sh
-cmake .
-make
+cmake . && make
diff --git a/run.sh b/run.sh
index 2ba12bf..1d4a835 100755
--- a/run.sh
+++ b/run.sh
@@ -1,3 +1,3 @@
#!/bin/sh
-./cppbot $1
+./bin/spacebot $1
diff --git a/test.sh b/test.sh
index 88ce626..d491ba6 100755
--- a/test.sh
+++ b/test.sh
@@ -1,3 +1,3 @@
#!/bin/sh
-make && valgrind ./cppbot_test
+make && valgrind ./bin/spacebot_test