diff --git a/CMakeLists.txt b/CMakeLists.txt index 4166583..0be2d28 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,19 +1,18 @@ # version -cmake_minimum_required(VERSION 3.9) - +cmake_minimum_required(VERSION 2.4) project(crumpet-engine) -set(crumpet-engine_VERSION_MAJOR 1) -set(crumpet-engine_VERSION_MINOR 0) -set(EXEName crumpet-engine.o) +set(EXEName crumpet-engine) set(BuildDIR ./bin) set(SrcDIR ./src) -set(IncludeDIR ${SrcDIR}/include) +set(IncludeDIR ./include) find_package(SDL2 REQUIRED) -include_directories(${SLD_INCLUDE_DIRS}) -include_directories(${IncludeDIR}) +include_directories(${BuildDIR}/${EXEName} ${SLD_INCLUDE_DIR}) +include_directories(${BuildDIR}/${EXEName} ${IncludeDIR}) -add_executable(${BuildDIR}/${EXEName} ${SrcDIR}/main.cpp) +file(GLOB_RECURSE SourceFiles ${SrcDIR}/*.cpp) + +add_executable(${BuildDIR}/${EXEName} ${SourceFiles}) target_link_libraries(${BuildDIR}/${EXEName} ${SDL2_LIBRARIES}) diff --git a/Makefile b/Makefile index 0833e51..e15e16f 100644 --- a/Makefile +++ b/Makefile @@ -111,44 +111,47 @@ depend: .PHONY : depend #============================================================================= -# Target rules for targets named ./bin/crumpet-engine.o +# Target rules for targets named ./bin/crumpet-engine # Build rule for target. -./bin/crumpet-engine.o: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 ./bin/crumpet-engine.o -.PHONY : ./bin/crumpet-engine.o +./bin/crumpet-engine: cmake_check_build_system + $(MAKE) -f CMakeFiles/Makefile2 ./bin/crumpet-engine +.PHONY : ./bin/crumpet-engine # fast build rule for target. -./bin/crumpet-engine.o/fast: - $(MAKE) -f CMakeFiles/./bin/crumpet-engine.o.dir/build.make CMakeFiles/./bin/crumpet-engine.o.dir/build -.PHONY : ./bin/crumpet-engine.o/fast - -src/main.o: src/main.cpp.o - -.PHONY : src/main.o +./bin/crumpet-engine/fast: + $(MAKE) -f CMakeFiles/./bin/crumpet-engine.dir/build.make CMakeFiles/./bin/crumpet-engine.dir/build +.PHONY : ./bin/crumpet-engine/fast # target to build an object file -src/main.cpp.o: - $(MAKE) -f CMakeFiles/./bin/crumpet-engine.o.dir/build.make CMakeFiles/./bin/crumpet-engine.o.dir/src/main.cpp.o -.PHONY : src/main.cpp.o - -src/main.i: src/main.cpp.i - -.PHONY : src/main.i +src/header.o: + $(MAKE) -f CMakeFiles/./bin/crumpet-engine.dir/build.make CMakeFiles/./bin/crumpet-engine.dir/src/header.o +.PHONY : src/header.o # target to preprocess a source file -src/main.cpp.i: - $(MAKE) -f CMakeFiles/./bin/crumpet-engine.o.dir/build.make CMakeFiles/./bin/crumpet-engine.o.dir/src/main.cpp.i -.PHONY : src/main.cpp.i - -src/main.s: src/main.cpp.s - -.PHONY : src/main.s +src/header.i: + $(MAKE) -f CMakeFiles/./bin/crumpet-engine.dir/build.make CMakeFiles/./bin/crumpet-engine.dir/src/header.i +.PHONY : src/header.i # target to generate assembly for a file -src/main.cpp.s: - $(MAKE) -f CMakeFiles/./bin/crumpet-engine.o.dir/build.make CMakeFiles/./bin/crumpet-engine.o.dir/src/main.cpp.s -.PHONY : src/main.cpp.s +src/header.s: + $(MAKE) -f CMakeFiles/./bin/crumpet-engine.dir/build.make CMakeFiles/./bin/crumpet-engine.dir/src/header.s +.PHONY : src/header.s + +# target to build an object file +src/main.o: + $(MAKE) -f CMakeFiles/./bin/crumpet-engine.dir/build.make CMakeFiles/./bin/crumpet-engine.dir/src/main.o +.PHONY : src/main.o + +# target to preprocess a source file +src/main.i: + $(MAKE) -f CMakeFiles/./bin/crumpet-engine.dir/build.make CMakeFiles/./bin/crumpet-engine.dir/src/main.i +.PHONY : src/main.i + +# target to generate assembly for a file +src/main.s: + $(MAKE) -f CMakeFiles/./bin/crumpet-engine.dir/build.make CMakeFiles/./bin/crumpet-engine.dir/src/main.s +.PHONY : src/main.s # Help Target help: @@ -157,8 +160,11 @@ help: @echo "... clean" @echo "... depend" @echo "... rebuild_cache" - @echo "... ./bin/crumpet-engine.o" + @echo "... ./bin/crumpet-engine" @echo "... edit_cache" + @echo "... src/header.o" + @echo "... src/header.i" + @echo "... src/header.s" @echo "... src/main.o" @echo "... src/main.i" @echo "... src/main.s" diff --git a/bin/crumpet-engine b/bin/crumpet-engine new file mode 100755 index 0000000..14400e2 Binary files /dev/null and b/bin/crumpet-engine differ diff --git a/bin/crumpet-engine.o b/bin/crumpet-engine.o deleted file mode 100755 index 8435ebd..0000000 Binary files a/bin/crumpet-engine.o and /dev/null differ diff --git a/bin/resources/charicter.png b/bin/resources/charicter.png new file mode 100644 index 0000000..b0fe401 Binary files /dev/null and b/bin/resources/charicter.png differ diff --git a/bin/resources/explosion.png b/bin/resources/explosion.png new file mode 100644 index 0000000..4d1b3a3 Binary files /dev/null and b/bin/resources/explosion.png differ diff --git a/bin/resources/mario.png b/bin/resources/mario.png new file mode 100644 index 0000000..85758d2 Binary files /dev/null and b/bin/resources/mario.png differ diff --git a/bin/resources/sans-undertale-spritesheet.png b/bin/resources/sans-undertale-spritesheet.png new file mode 100644 index 0000000..b416556 Binary files /dev/null and b/bin/resources/sans-undertale-spritesheet.png differ diff --git a/bin/resources/woman-spritesheet.png b/bin/resources/woman-spritesheet.png new file mode 100644 index 0000000..de7b252 Binary files /dev/null and b/bin/resources/woman-spritesheet.png differ diff --git a/src/include/include.h b/include/include.h similarity index 70% rename from src/include/include.h rename to include/include.h index 7aae9f8..a91e07c 100644 --- a/src/include/include.h +++ b/include/include.h @@ -2,7 +2,7 @@ class XD { public: - void write(char* i) { + static void write(char* i) { std::cout << i << std::endl; } }; diff --git a/src/header.cpp b/src/header.cpp new file mode 100644 index 0000000..4cdeaba --- /dev/null +++ b/src/header.cpp @@ -0,0 +1,6 @@ +#include "header.h" + +HelloWorld::HelloWorld() { + std::cout << "Hello, world!" << std::endl; +} + diff --git a/src/header.h b/src/header.h index 9673c62..0fd688b 100644 --- a/src/header.h +++ b/src/header.h @@ -1,6 +1,8 @@ #pragma once #include -inline static void HelloWorld() { - std::cout << "Hello, world" << std::endl; -} + +class HelloWorld { +public: + HelloWorld(); +}; diff --git a/src/main.cpp b/src/main.cpp index 1064092..e237781 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,9 +2,23 @@ #include #include "header.h" -int main(int argc, char** argv) { - XD waattttt; - waattttt.write("Hellllooooooo guys"); +#include "SDL2/SDL.h" - HelloWorld(); +int main(int argc, char** argv) { + XD().write("Epic"); + HelloWorld helloWorld; + + SDL_Window* window = NULL; + SDL_Surface* surface = NULL; + + if (SDL_Init(SDL_INIT_VIDEO) < 0) { + std::cout << "INIT FAILED" << std::endl; + } + + window = SDL_CreateWindow("crumpet-engine", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 500, 500, NULL); + SDL_Delay(1000); + SDL_FreeSurface(surface); + SDL_DestroyWindow(window); + window = NULL; + SDL_Quit(); }