diff --git a/DevJournal.txt b/DevJournal.txt index 4cf852b..4786b7d 100644 --- a/DevJournal.txt +++ b/DevJournal.txt @@ -959,3 +959,7 @@ A small refactoring in main.cpp (replaced big if/else branch statement with swit 7/28/2017 Update github repository. + +5/9/2022 +I have upgraded to MINGW 8.1.0 + diff --git a/makefile.mingw b/makefile.mingw index b3d5148..a4403c5 100644 --- a/makefile.mingw +++ b/makefile.mingw @@ -1,8 +1,13 @@ # Project: VM65 # Makefile created by Dev-C++ 5.11 # and modified for standalone MINGW compiler installation. +# NOTE: +# Set SDLDIR and MINGWDIR in your compilation environment, +# and then +# set PATH=%MINGWDIR%\mingw64\bin;%SDLDIR%\lib\x64;%PATH% -#SDLBASE = "C:\src\SDL" +#SDLDIR = "D:\src\SDL" +#MINGWDIR = "C:\mingw-w64\x86_64-8.1.0" SDLBASE = $(SDLDIR) CPP = g++.exe -D__DEBUG__ CC = gcc.exe -D__DEBUG__ @@ -11,10 +16,10 @@ OBJ = main.o VMachine.o MKCpu.o Memory.o Display.o GraphDisp.o MemMapDev.o OBJ2 = bin2hex.o LINKOBJ = main.o VMachine.o MKCpu.o Memory.o Display.o GraphDisp.o MemMapDev.o MKGenException.o ConsoleIO.o MassStorage.o LINKOBJ2 = bin2hex.o -LIBS = -L"C:\mingw-w64\x86_64-5.3.0\mingw64\x86_64-w64-mingw32/lib" -L"C:\mingw-w64\x86_64-5.3.0\mingw64\x86_64-w64-mingw32/lib" -static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lpthread -Wl,-Bdynamic -lmingw32 +LIBS = -L"$(MINGWDIR)\mingw64\x86_64-w64-mingw32/lib" -L"$(MINGWDIR)\mingw64\x86_64-w64-mingw32/lib" -static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lpthread -Wl,-Bdynamic -lmingw32 SDLLIBS = -L"$(SDLBASE)\x86_64-w64-mingw32/lib" -lSDL2main -lSDL2 -INCS = -I"C:\mingw-w64\x86_64-5.3.0\mingw64/include" -I"C:\mingw-w64\x86_64-5.3.0\mingw64\x86_64-w64-mingw32/include" -I"C:\mingw-w64\x86_64-5.3.0\mingw64\lib\gcc\x86_64-w64-mingw32\5.3.0/include" -CXXINCS = -I"C:\mingw-w64\x86_64-5.3.0\mingw64/include" -I"C:\mingw-w64\x86_64-5.3.0\mingw64\x86_64-w64-mingw32/include" -I"C:\mingw-w64\x86_64-5.3.0\mingw64\lib\gcc\x86_64-w64-mingw32\5.3.0/include" +INCS = -I"$(MINGWDIR)\mingw64/include" -I"$(MINGWDIR)\mingw64\x86_64-w64-mingw32/include" -I"$(MINGWDIR)\mingw64\lib\gcc\x86_64-w64-mingw32\5.3.0/include" +CXXINCS = -I"$(MINGWDIR)\mingw64/include" -I"$(MINGWDIR)\mingw64\x86_64-w64-mingw32/include" -I"$(MINGWDIR)\mingw64\lib\gcc\x86_64-w64-mingw32\5.3.0/include" BIN = vm65.exe BIN2 = bin2hex.exe CXXFLAGS = $(CXXINCS) -std=c++11 -Wall -Wextra -pedantic -g3 diff --git a/mingw-w64.bat b/mingw-w64.bat new file mode 100644 index 0000000..dd11706 --- /dev/null +++ b/mingw-w64.bat @@ -0,0 +1,9 @@ +echo off +set MINGWDIR=C:\mingw-w64\x86_64-8.1.0 +set SDLDIR=D:\src\SDL +set PATH=%MINGWDIR%\mingw64\bin;%SDLDIR%\lib\x64;%PATH% +rem echo %PATH% +rem cd "C:\mingw-w64\x86_64-8.1.0\mingw64\bin" +D: +cd "D:\src\githubwrk\vm6502" +"C:\Windows\system32\cmd.exe"