Merge branch 'main' into update-compile-ci

README.md

@@ -23,6 +23,7 @@ Top contributors:
 
 -   [Puneeth Y @puneeth072003](https://github.com/puneeth072003)
 -   [Rodolfo Cabral Neves @roddas](https://github.com/roddas)
+-   [Diamond Rivero @diamant3](https://github.com/diamant3)
 -   [Joss Sparkes @remakingeden](https://github.com/remakingeden)
 
 

c/Makefile

@@ -1,5 +1,4 @@
 CC = gcc
-CFLAGS = -Wall -Wextra
 SRC = main.c
 OUT = main
 CPPCHECK = cppcheck

cplus/Makefile

@@ -1,5 +1,4 @@
 CXX = g++
-CXXFLAGS = -Wall -Wextra
 SRC = main.cpp
 OUT = main
 CPPCHECK = cppcheck

quickbuild.sh

@@ -4,11 +4,11 @@ echo "Please run this on Mac OS-X with GCC support for 'arm64-apple-macos12' and
 
 echo "Compiling C"
 echo "Compiling C for Intel Macos-X"
-(cd c && make CFLAGS+='-target x86_64-apple-macos12' OUT='wrongsecrets-c')
-(cd c/advanced && make CFLAGS+='-target x86_64-apple-macos12' OUT='wrongsecrets-advanced-c')
+(cd c && make CFLAGS+='-target x86_64-apple-macos12' OUT='../wrongsecrets-c')
+(cd c/advanced && make CFLAGS+='-target x86_64-apple-macos12 ' OUT='../../wrongsecrets-advanced-c')
 echo "Compiling C for ARM Macos-X"
-(cd c && make CFLAGS+='-target arm64-apple-macos12' OUT='wrongsecrets-c-arm')
-(cd c/advanced && make CFLAGS+='-target arm64-apple-macos12' OUT='wrongsecrets-advanced-c-arm')
+(cd c && make CFLAGS+='-target arm64-apple-macos12' OUT='../wrongsecrets-c-arm')
+(cd c/advanced && make CFLAGS+='-target arm64-apple-macos12' OUT='../../wrongsecrets-advanced-c-arm')
 echo "Compiling C for ARM-linux, based on https://github.com/dockcross/dockcross"
 echo "prerequired: git clone https://github.com/dockcross/dockcross.git"
 echo "prerequired: cd dockcross"
@@ -59,9 +59,9 @@ strip -S wrongsecrets-advanced-c-linux-musl-arm-stripped
 
 echo "Compiling C++"
 echo "Compiling C++ for Intel Macos-X"
-(cd cplus && make CXXFLAGS+='-target x86_64-apple-macos12' OUT='wrongsecrets-cplus')
+(cd cplus && make CXXFLAGS+='-target x86_64-apple-macos12' OUT='../wrongsecrets-cplus')
 echo "Compiling C++ for ARM Macos-X"
-(cd cplus && make CXXFLAGS+='-target arm64-apple-macos12' OUT='wrongsecrets-cplus-arm')
+(cd cplus && make CXXFLAGS+='-target arm64-apple-macos12' OUT='../wrongsecrets-cplus-arm')
 echo "Compiling C++ for ARM, based on https://github.com/dockcross/dockcross"
 ./dockcross-linux-arm64-lts bash -c '$CC cplus/main.cpp -lstdc++ -o wrongsecrets-cplus-linux-arm'
 echo "Compiling C++ for linux"