From 770329990491205e30ab13c3d3c3fae94671c96c Mon Sep 17 00:00:00 2001 From: FactorialN Date: Sun, 29 Oct 2023 16:12:56 -0700 Subject: [PATCH] fixed some version problems --- .gitignore | 2 +- CMakeLists.txt | 2 +- Makefile | 233 ------------------------------------------------- 3 files changed, 2 insertions(+), 235 deletions(-) delete mode 100644 Makefile diff --git a/.gitignore b/.gitignore index a007fea..07ed706 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -build/* +build/* \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 4dca8bd..f0c5624 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ include_directories( add_executable(fischl - # Header filesc + # Header files lib/fischl.cpp lib/main.cpp diff --git a/Makefile b/Makefile deleted file mode 100644 index 9d1e6f0..0000000 --- a/Makefile +++ /dev/null @@ -1,233 +0,0 @@ -# CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.27 - -# 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: - -#============================================================================= -# Special targets provided by cmake. - -# 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 = /opt/homebrew/Cellar/cmake/3.27.7/bin/cmake - -# The command to remove a file. -RM = /opt/homebrew/Cellar/cmake/3.27.7/bin/cmake -E rm -f - -# Escaping for special characters. -EQUALS = = - -# The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /Users/factorialn/Projects/iloveos - -# The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /Users/factorialn/Projects/iloveos - -#============================================================================= -# Targets provided globally by CMake. - -# Special rule for the target test -test: - @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Running tests..." - /opt/homebrew/Cellar/cmake/3.27.7/bin/ctest --force-new-ctest-process $(ARGS) -.PHONY : test - -# Special rule for the target test -test/fast: test -.PHONY : test/fast - -# Special rule for the target edit_cache -edit_cache: - @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Running CMake cache editor..." - /opt/homebrew/Cellar/cmake/3.27.7/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..." - /opt/homebrew/Cellar/cmake/3.27.7/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 /Users/factorialn/Projects/iloveos/CMakeFiles /Users/factorialn/Projects/iloveos//CMakeFiles/progress.marks - $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 all - $(CMAKE_COMMAND) -E cmake_progress_start /Users/factorialn/Projects/iloveos/CMakeFiles 0 -.PHONY : all - -# The main clean target -clean: - $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 clean -.PHONY : clean - -# 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 fischl - -# Build rule for target. -fischl: cmake_check_build_system - $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 fischl -.PHONY : fischl - -# fast build rule for target. -fischl/fast: - $(MAKE) $(MAKESILENT) -f CMakeFiles/fischl.dir/build.make CMakeFiles/fischl.dir/build -.PHONY : fischl/fast - -#============================================================================= -# Target rules for targets named run_tests - -# Build rule for target. -run_tests: cmake_check_build_system - $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 run_tests -.PHONY : run_tests - -# fast build rule for target. -run_tests/fast: - $(MAKE) $(MAKESILENT) -f test/CMakeFiles/run_tests.dir/build.make test/CMakeFiles/run_tests.dir/build -.PHONY : run_tests/fast - -lib/fischl.o: lib/fischl.cpp.o -.PHONY : lib/fischl.o - -# target to build an object file -lib/fischl.cpp.o: - $(MAKE) $(MAKESILENT) -f CMakeFiles/fischl.dir/build.make CMakeFiles/fischl.dir/lib/fischl.cpp.o -.PHONY : lib/fischl.cpp.o - -lib/fischl.i: lib/fischl.cpp.i -.PHONY : lib/fischl.i - -# target to preprocess a source file -lib/fischl.cpp.i: - $(MAKE) $(MAKESILENT) -f CMakeFiles/fischl.dir/build.make CMakeFiles/fischl.dir/lib/fischl.cpp.i -.PHONY : lib/fischl.cpp.i - -lib/fischl.s: lib/fischl.cpp.s -.PHONY : lib/fischl.s - -# target to generate assembly for a file -lib/fischl.cpp.s: - $(MAKE) $(MAKESILENT) -f CMakeFiles/fischl.dir/build.make CMakeFiles/fischl.dir/lib/fischl.cpp.s -.PHONY : lib/fischl.cpp.s - -lib/main.o: lib/main.cpp.o -.PHONY : lib/main.o - -# target to build an object file -lib/main.cpp.o: - $(MAKE) $(MAKESILENT) -f CMakeFiles/fischl.dir/build.make CMakeFiles/fischl.dir/lib/main.cpp.o -.PHONY : lib/main.cpp.o - -lib/main.i: lib/main.cpp.i -.PHONY : lib/main.i - -# target to preprocess a source file -lib/main.cpp.i: - $(MAKE) $(MAKESILENT) -f CMakeFiles/fischl.dir/build.make CMakeFiles/fischl.dir/lib/main.cpp.i -.PHONY : lib/main.cpp.i - -lib/main.s: lib/main.cpp.s -.PHONY : lib/main.s - -# target to generate assembly for a file -lib/main.cpp.s: - $(MAKE) $(MAKESILENT) -f CMakeFiles/fischl.dir/build.make CMakeFiles/fischl.dir/lib/main.cpp.s -.PHONY : lib/main.cpp.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 "... test" - @echo "... fischl" - @echo "... run_tests" - @echo "... lib/fischl.o" - @echo "... lib/fischl.i" - @echo "... lib/fischl.s" - @echo "... lib/main.o" - @echo "... lib/main.i" - @echo "... lib/main.s" -.PHONY : help - - - -#============================================================================= -# 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 -