From 1178779d8d2ff4368c0a2d6d2ca4270caf23c20e Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Wed, 29 Jun 2022 14:47:58 +0200 Subject: [PATCH] Chore: don't use cmake --- .gitignore | 1 - .vscode/extensions.json | 3 +- .vscode/settings.json | 1 - Implementierung/.gitignore | 6 +- Implementierung/.gitkeep | 0 Implementierung/CMakeLists.txt | 19 --- Implementierung/Makefile | 272 +++------------------------------ 7 files changed, 24 insertions(+), 278 deletions(-) delete mode 100644 .gitignore delete mode 100644 Implementierung/.gitkeep delete mode 100644 Implementierung/CMakeLists.txt diff --git a/.gitignore b/.gitignore deleted file mode 100644 index c795b05..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build \ No newline at end of file diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 420dda6..5a9a397 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,6 +1,5 @@ { "recommendations": [ - "ms-vscode.cpptools", - "twxs.cmake" + "ms-vscode.cpptools" ] } \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index fc00b84..f97fffe 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -5,5 +5,4 @@ "helper.h": "c" }, "editor.formatOnSave": true, - "cmake.sourceDirectory": "${workspaceFolder}/Implementierung" } diff --git a/Implementierung/.gitignore b/Implementierung/.gitignore index a8b5368..91f3d4d 100644 --- a/Implementierung/.gitignore +++ b/Implementierung/.gitignore @@ -1,4 +1,2 @@ -cmake_install.cmake -CMakeCache.txt -md2 -CMakeFiles \ No newline at end of file +build +md2 \ No newline at end of file diff --git a/Implementierung/.gitkeep b/Implementierung/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/Implementierung/CMakeLists.txt b/Implementierung/CMakeLists.txt deleted file mode 100644 index e312b0e..0000000 --- a/Implementierung/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 3.0.0) - -# here we specify that the project is C language only, so the default -# C compiler on the system will be used -project(md2 C) -add_executable(md2 "") - -set(SOURCE_FILES - src/main.c - src/helper.c - src/io.c - src/md2.c -) - -target_sources(md2 PRIVATE ${SOURCE_FILES}) - -target_include_directories(md2 PUBLIC - lib -) \ No newline at end of file diff --git a/Implementierung/Makefile b/Implementierung/Makefile index 76e6023..9283a29 100644 --- a/Implementierung/Makefile +++ b/Implementierung/Makefile @@ -1,262 +1,32 @@ -# CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.23 -# Default target executed when no arguments are given to make. -default_target: all -.PHONY : default_target -# Allow only one "make -f Makefile2" at a time, but pass parallelism. -.NOTPARALLEL: +SRC = src/main.c src/helper.c src/io.c src/md2.c +OBJ = ${subst src,build,${SRC:.c=.o}} +CC = gcc +CFLAGS = -Ilib +LDFLAGS = -#============================================================================= -# Special targets provided by cmake. +all: md2 -# Disable implicit rules so canonical targets will work. -.SUFFIXES: - -# Disable VCS-based implicit rules. -% : %,v - -# Disable VCS-based implicit rules. -% : RCS/% - -# Disable VCS-based implicit rules. -% : RCS/%,v - -# Disable VCS-based implicit rules. -% : SCCS/s.% - -# Disable VCS-based implicit rules. -% : s.% - -.SUFFIXES: .hpux_make_needs_suffix_list - -# Command-line flag to silence nested $(MAKE). -$(VERBOSE)MAKESILENT = -s - -#Suppress display of executed commands. -$(VERBOSE).SILENT: - -# A target that is always out of date. -cmake_force: -.PHONY : cmake_force - -#============================================================================= -# Set environment variables for the build. - -# The shell in which to execute make rules. -SHELL = /bin/sh - -# The CMake executable. -CMAKE_COMMAND = /usr/bin/cmake - -# The command to remove a file. -RM = /usr/bin/cmake -E rm -f - -# Escaping for special characters. -EQUALS = = - -# The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /home/dorian/Documents/git/UNI/era/team199/Implementierung - -# The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /home/dorian/Documents/git/UNI/era/team199/Implementierung - -#============================================================================= -# Targets provided globally by CMake. - -# Special rule for the target edit_cache -edit_cache: - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..." - /usr/bin/ccmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) -.PHONY : edit_cache - -# Special rule for the target edit_cache -edit_cache/fast: edit_cache -.PHONY : edit_cache/fast - -# Special rule for the target rebuild_cache -rebuild_cache: - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..." - /usr/bin/cmake --regenerate-during-build -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) -.PHONY : rebuild_cache - -# Special rule for the target rebuild_cache -rebuild_cache/fast: rebuild_cache -.PHONY : rebuild_cache/fast - -# The main all target -all: cmake_check_build_system - $(CMAKE_COMMAND) -E cmake_progress_start /home/dorian/Documents/git/UNI/era/team199/Implementierung/CMakeFiles /home/dorian/Documents/git/UNI/era/team199/Implementierung//CMakeFiles/progress.marks - $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 all - $(CMAKE_COMMAND) -E cmake_progress_start /home/dorian/Documents/git/UNI/era/team199/Implementierung/CMakeFiles 0 -.PHONY : all - -# The main clean target clean: - $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 clean -.PHONY : clean + rm -f md2 $(OBJ) -# The main clean target -clean/fast: clean -.PHONY : clean/fast - -# Prepare targets for installation. -preinstall: all - $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 preinstall -.PHONY : preinstall - -# Prepare targets for installation. -preinstall/fast: - $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 preinstall -.PHONY : preinstall/fast - -# clear depends -depend: - $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 -.PHONY : depend - -#============================================================================= -# Target rules for targets named md2 - -# Build rule for target. -md2: cmake_check_build_system - $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 md2 -.PHONY : md2 - -# fast build rule for target. -md2/fast: - $(MAKE) $(MAKESILENT) -f CMakeFiles/md2.dir/build.make CMakeFiles/md2.dir/build -.PHONY : md2/fast - -src/helper.o: src/helper.c.o -.PHONY : src/helper.o - -# target to build an object file -src/helper.c.o: - $(MAKE) $(MAKESILENT) -f CMakeFiles/md2.dir/build.make CMakeFiles/md2.dir/src/helper.c.o -.PHONY : src/helper.c.o - -src/helper.i: src/helper.c.i -.PHONY : src/helper.i - -# target to preprocess a source file -src/helper.c.i: - $(MAKE) $(MAKESILENT) -f CMakeFiles/md2.dir/build.make CMakeFiles/md2.dir/src/helper.c.i -.PHONY : src/helper.c.i - -src/helper.s: src/helper.c.s -.PHONY : src/helper.s - -# target to generate assembly for a file -src/helper.c.s: - $(MAKE) $(MAKESILENT) -f CMakeFiles/md2.dir/build.make CMakeFiles/md2.dir/src/helper.c.s -.PHONY : src/helper.c.s - -src/io.o: src/io.c.o -.PHONY : src/io.o - -# target to build an object file -src/io.c.o: - $(MAKE) $(MAKESILENT) -f CMakeFiles/md2.dir/build.make CMakeFiles/md2.dir/src/io.c.o -.PHONY : src/io.c.o - -src/io.i: src/io.c.i -.PHONY : src/io.i - -# target to preprocess a source file -src/io.c.i: - $(MAKE) $(MAKESILENT) -f CMakeFiles/md2.dir/build.make CMakeFiles/md2.dir/src/io.c.i -.PHONY : src/io.c.i - -src/io.s: src/io.c.s -.PHONY : src/io.s - -# target to generate assembly for a file -src/io.c.s: - $(MAKE) $(MAKESILENT) -f CMakeFiles/md2.dir/build.make CMakeFiles/md2.dir/src/io.c.s -.PHONY : src/io.c.s - -src/main.o: src/main.c.o -.PHONY : src/main.o - -# target to build an object file -src/main.c.o: - $(MAKE) $(MAKESILENT) -f CMakeFiles/md2.dir/build.make CMakeFiles/md2.dir/src/main.c.o -.PHONY : src/main.c.o - -src/main.i: src/main.c.i -.PHONY : src/main.i - -# target to preprocess a source file -src/main.c.i: - $(MAKE) $(MAKESILENT) -f CMakeFiles/md2.dir/build.make CMakeFiles/md2.dir/src/main.c.i -.PHONY : src/main.c.i - -src/main.s: src/main.c.s -.PHONY : src/main.s - -# target to generate assembly for a file -src/main.c.s: - $(MAKE) $(MAKESILENT) -f CMakeFiles/md2.dir/build.make CMakeFiles/md2.dir/src/main.c.s -.PHONY : src/main.c.s - -src/md2.o: src/md2.c.o -.PHONY : src/md2.o - -# target to build an object file -src/md2.c.o: - $(MAKE) $(MAKESILENT) -f CMakeFiles/md2.dir/build.make CMakeFiles/md2.dir/src/md2.c.o -.PHONY : src/md2.c.o - -src/md2.i: src/md2.c.i -.PHONY : src/md2.i - -# target to preprocess a source file -src/md2.c.i: - $(MAKE) $(MAKESILENT) -f CMakeFiles/md2.dir/build.make CMakeFiles/md2.dir/src/md2.c.i -.PHONY : src/md2.c.i - -src/md2.s: src/md2.c.s -.PHONY : src/md2.s - -# target to generate assembly for a file -src/md2.c.s: - $(MAKE) $(MAKESILENT) -f CMakeFiles/md2.dir/build.make CMakeFiles/md2.dir/src/md2.c.s -.PHONY : src/md2.c.s - -# Help Target help: - @echo "The following are some of the valid targets for this Makefile:" - @echo "... all (the default if no target is provided)" - @echo "... clean" - @echo "... depend" - @echo "... edit_cache" - @echo "... rebuild_cache" - @echo "... md2" - @echo "... src/helper.o" - @echo "... src/helper.i" - @echo "... src/helper.s" - @echo "... src/io.o" - @echo "... src/io.i" - @echo "... src/io.s" - @echo "... src/main.o" - @echo "... src/main.i" - @echo "... src/main.s" - @echo "... src/md2.o" - @echo "... src/md2.i" - @echo "... src/md2.s" -.PHONY : help + @echo === Project Build Help === + @echo + @echo Available targets: + @echo - all: build everything + @echo - clean: clean distfiles + @echo - help: show this help +build: + mkdir build +build/%.o: src/%.c + @mkdir -p build + ${CC} -c ${CFLAGS} -o $@ $< -#============================================================================= -# Special targets to cleanup operation of make. - -# Special rule to run CMake to check the build system integrity. -# No rule that depends on this can have commands that come from listfiles -# because they might be regenerated. -cmake_check_build_system: - $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 -.PHONY : cmake_check_build_system +md2: ${OBJ} + ${CC} -o $@ $(OBJ) ${LDFLAGS} +.PHONY: all clean help \ No newline at end of file