aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSan Jacobs2022-08-07 07:56:45 +0200
committerSan Jacobs2022-08-07 07:56:45 +0200
commitf850a8e5b64f7018f594b8aa36511caeab00d929 (patch)
treed2529e4376064630c7772c3a3a843cc71404ff14
parent969e4465100cc24748f9cd9797beee8e17385f5e (diff)
downloadsatscalc-f850a8e5b64f7018f594b8aa36511caeab00d929.tar.gz
satscalc-f850a8e5b64f7018f594b8aa36511caeab00d929.tar.bz2
satscalc-f850a8e5b64f7018f594b8aa36511caeab00d929.zip
Finally got this compiling on Windows
-rw-r--r--.gitignore2
-rw-r--r--makefile6
-rwxr-xr-xsrc/main.cpp2
3 files changed, 9 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 3ebf37b..a68f5c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ obj/*.o
a.out
a.exe
notes.txt
+a.pdb
+remedy.rdbg
diff --git a/makefile b/makefile
index a65dd4b..979b8c4 100644
--- a/makefile
+++ b/makefile
@@ -30,6 +30,12 @@ $(OBJECTS): obj/%.o : src/%.cpp
mkdir -p obj
$(CXX) -g $(INCLUDE) $(CVERSION) $(CFLAGS) -c $< -o $@
+windows:
+ zig c++ -target x86_64-windows-gnu src/*.cpp -std=c++17 -g -gcodeview
+
+windows32:
+ zig c++ -target i386-windows-gnu src/*.cpp -std=c++17 -g -gcodeview
+
clean:
rm obj/*.o
diff --git a/src/main.cpp b/src/main.cpp
index 732d67a..ac5c7e0 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -22,7 +22,7 @@ along with this program. If not, see https://www.gnu.org/licenses/
#include "time.h"
#include "test.h"
-#ifdef WIN32
+#if defined(WIN32) || defined(_WIN32) || defined(__WIN32) && !defined(__CYGWIN__)
#define CLEAR std::system("cls")
#else
#define CLEAR std::cout << "\033[2J\033[1;1H"