diff options
| -rw-r--r-- | .gitignore | 24 | ||||
| -rw-r--r-- | CMakeLists.txt | 16 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | src/audio.cpp (renamed from audio.cpp) | 2 | ||||
| -rw-r--r-- | src/audio.h (renamed from audio.h) | 0 | ||||
| -rw-r--r-- | src/gui.cpp (renamed from gui.cpp) | 1 | ||||
| -rw-r--r-- | src/gui.h (renamed from gui.h) | 2 | ||||
| -rw-r--r-- | src/main.cpp (renamed from main.cpp) | 2 | ||||
| -rw-r--r-- | src/sequence.h (renamed from sequence.h) | 0 |
9 files changed, 34 insertions, 19 deletions
@@ -1,10 +1,16 @@ -.vscode -fmseq +CMakeLists.txt.user +CMakeCache.txt +CMakeFiles/ +CMakeScripts/ +Testing/ +cmake_install.cmake +install_manifest.txt +compile_commands.json +CTestTestfile.cmake +_deps/ + +Makefile +out/ +.vs/ -# Visual Studio garbage -Debug/ -*.sln -*.vcxproj -*.vcxproj.filters -*.vcxproj.user -*.pdb
\ No newline at end of file +fmseq diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..f9c8fa9 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,16 @@ +cmake_minimum_required(VERSION 3.5) +set(CMAKE_CXX_STANDARD 17) + +project(fmseq) + +find_package(SDL2 REQUIRED) +include_directories(${SDL2_INCLUDE_DIRS}) + +set(SOURCES + src/audio.cpp + src/main.cpp + src/gui.cpp +) + +add_executable(fmseq ${SOURCES}) +target_link_libraries(fmseq ${SDL2_LIBRARIES})
\ No newline at end of file diff --git a/Makefile b/Makefile deleted file mode 100644 index 4cfed7a..0000000 --- a/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -SRC=main.cpp\ - audio.cpp\ - gui.cpp - -fmseq: ${SRC} - g++ ${SRC} -lSDL2 -o fmseq
\ No newline at end of file diff --git a/audio.cpp b/src/audio.cpp index 712dddc..db915e1 100644 --- a/audio.cpp +++ b/src/audio.cpp @@ -3,7 +3,7 @@ #define _USE_MATH_DEFINES #include <cmath> #include <iostream> -#include <SDL2/SDL.h> +#include <SDL.h> #include "sequence.h" @@ -1,6 +1,5 @@ #include "gui.h" -#include <SDL2/SDL.h> #include "sequence.h" void Slider::Draw(SDL_Renderer* renderer) @@ -1,6 +1,6 @@ #pragma once -#include <SDL2/SDL.h> +#include <SDL.h> #include <vector> #include "sequence.h" @@ -1,4 +1,4 @@ -#include <SDL2/SDL.h> +#include <SDL.h> #include <iostream> #include "audio.h" diff --git a/sequence.h b/src/sequence.h index decd9fd..decd9fd 100644 --- a/sequence.h +++ b/src/sequence.h |