Merge networkfusion fork

.gitignore

@@ -13,3 +13,7 @@
 ## Temporary files
 *.tmp
 *~
+*.VC.db*
+*properties.json
+/.vs
+/.vscode

Makefile

@@ -1,38 +1,61 @@
+#
+# Copyright (c) 2017 The Altra64 project contributors
+# See LICENSE file in the project root for full license information.
+#
+
 ROOTDIR = $(N64_INST)
 GCCN64PREFIX = $(ROOTDIR)/bin/mips64-elf-
 CHKSUM64PATH = $(ROOTDIR)/bin/chksum64
 MKDFSPATH = $(ROOTDIR)/bin/mkdfs
-HEADERPATH = $(ROOTDIR)/lib
 N64TOOL = $(ROOTDIR)/bin/n64tool
-HEADERNAME = header
 
+HEADERNAME = header.ed64
+HEADERTITLE = "EverDrive OS"
+
+SRCDIR = ./src
+INCDIR = ./inc
+RESDIR = ./res
+OBJDIR = ./obj
+BINDIR = ./bin
+TOOLSDIR = ./tools
 
 LINK_FLAGS = -O1 -L$(ROOTDIR)/lib -L$(ROOTDIR)/mips64-elf/lib -ldragon -lmikmod -lmad -lyaml -lc -lm -ldragonsys -lnosys $(LIBS) -Tn64ld.x
-PROG_NAME = menu
-CFLAGS = -std=gnu99 -march=vr4300 -mtune=vr4300 -O1 -I$(ROOTDIR)/include -I$(ROOTDIR)/mips64-elf/include -lpthread -lrt -D_REENTRANT -DUSE_TRUETYPE
+PROG_NAME = OS64
+CFLAGS = -std=gnu99 -march=vr4300 -mtune=vr4300 -O1 -I$(INCDIR) -I$(ROOTDIR)/include -I$(ROOTDIR)/mips64-elf/include -lpthread -lrt -D_REENTRANT -DUSE_TRUETYPE $(SET_DEBUG)
 ASFLAGS = -mtune=vr4300 -march=vr4300
 CC = $(GCCN64PREFIX)gcc
 AS = $(GCCN64PREFIX)as
 LD = $(GCCN64PREFIX)ld
 OBJCOPY = $(GCCN64PREFIX)objcopy
-OBJS = $(PROG_NAME).o everdrive.o fat.o disk.o mem.o sys.o ini.o strlib.o utils.o sram.o stb_image.o chksum64.o mp3.o
+
+SOURCES := $(wildcard $(SRCDIR)/*.c)
+OBJECTS = $(SOURCES:$(SRCDIR)/%.c=$(OBJDIR)/%.o)
+
+$(PROG_NAME).v64: $ $(PROG_NAME).elf $(PROG_NAME).dfs
+	$(OBJCOPY) $(BINDIR)/$(PROG_NAME).elf $(BINDIR)/$(PROG_NAME).bin -O binary
+	rm -f $(BINDIR)/$(PROG_NAME).v64
+	$(N64TOOL) -l 4M -t $(HEADERTITLE) -h $(RESDIR)/$(HEADERNAME) -o $(BINDIR)/$(PROG_NAME).v64 $(BINDIR)/$(PROG_NAME).bin -s 1M $(BINDIR)/$(PROG_NAME).dfs
+	$(CHKSUM64PATH) $(BINDIR)/$(PROG_NAME).v64
 
-$(PROG_NAME).v64: $(PROG_NAME).elf test.dfs
-	$(OBJCOPY) $(PROG_NAME).elf $(PROG_NAME).bin -O binary
-	rm -f OS64.v64
-	$(N64TOOL) -l 4M -t "EverDrive OS" -h ./header.ed64 -o OS64.v64 $(PROG_NAME).bin -s 1M test.dfs
-	$(CHKSUM64PATH) OS64.v64
+$(PROG_NAME).elf : $(OBJECTS)
+	@mkdir -p $(BINDIR)
+	$(LD) -o $(BINDIR)/$(PROG_NAME).elf $(OBJECTS) $(LINK_FLAGS)
 
-$(PROG_NAME).elf : $(OBJS)
-	$(LD) -o $(PROG_NAME).elf $(OBJS) $(LINK_FLAGS)
+$(OBJECTS): $(OBJDIR)/%.o : $(SRCDIR)/%.c
+	@mkdir -p $(OBJDIR)
+	$(CC) $(CFLAGS) -c $< -o $@
 
 copy: $(PROG_NAME).v64
-	sh upload.sh
+	sh $(TOOLSDIR)/upload.sh
 
-test.dfs:
-	$(MKDFSPATH) test.dfs ./filesystem/
+$(PROG_NAME).dfs:
+	$(MKDFSPATH) $(BINDIR)/$(PROG_NAME).dfs $(RESDIR)/filesystem/
 
 all: $(PROG_NAME).v64
 
+debug: $(PROG_NAME).v64
+
+debug: SET_DEBUG=-DDEBUG
+
 clean:
-	rm -f *.v64 *.elf *.o *.bin *.dfs
+	rm -f $(BINDIR)/*.v64 $(BINDIR)/*.elf $(OBJDIR)/*.o $(BINDIR)/*.bin $(BINDIR)/*.dfs

README.md

@@ -1,139 +1,80 @@
-# alt64
+# NOTE: THIS REPO WILL SOON BE ARCHIVED.
+Please see [N64FlashcartMenu](https://github.com/Polprzewodnikowy/N64FlashcartMenu) for a more modern codebase.
 
-Alternative Everdrive64 menu
-
-    Kuroneko!
+# Altra64
 
-           :\     /;               _
-          ;  \___/  ;             ; ;
-         ,:-"'   `"-:.            / ;
-    _   /,---.   ,---.\   _     _; /
-    _:>((  |  ) (  |  ))<:_ ,-""_,"
-        \`````   `````/""""",-""
-         '-.._ v _..-'      )
-           / ___   ____,..  \
-          / /   | |   | ( \. \
-    ctr  / /    | |    | |  \ \
-         `"     `"     `"    `"
-
-    nyannyannyannyannyannyannyannyannyannyannyannyannyannyannyannyannyan
+Alternative Everdrive64 menu
 
 
-`alt64` is an open source menu for [Everdrive64](http://krikzz.com/). It was
+`Altra64` is an open source menu for [Everdrive64](http://krikzz.com/) and is based on a fork of alt64 which was
 originally written by saturnu, and released on the
 [Everdrive64 forum](http://krikzz.com/forum/index.php?topic=816.0).
 
 ## Building
 
-If you want to build the menu, you need an n64 toolchain. We'll use the
-toolchain recommended by libdragon, with some updated versions.
+If you want to build the menu, you need an n64 toolchain. When using windows 10 or Ubuntu, installation is totally automated through a script.
 
-### Dependencies
-
-* [libdragon](https://github.com/parasyte/libdragon)
-* [libmikmod-n64](https://github.com/parasyte/libmikmod-n64)
-* [libmad-n64](https://github.com/parasyte/libmad-n64)
+### Dependencies (installed automatically)
+* Windows 10 (Aniversary Update or above) / Ubuntu 16.04 (or above)
+* [libdragon](https://github.com/DragonMinded/libdragon)
+* [libmikmod (with n64 driver)](https://github.com/networkfusion/libmikmod)
+* [libmad-n64](https://github.com/networkfusion/libmad-n64)
 * [libyaml](http://pyyaml.org/wiki/LibYAML)
 
 ### Build the Toolchain
 
 *You may skip this step if it's already installed.*
 
-Clone the `libdragon` repo and create a directory for the build.
-
-```bash
-$ git clone https://github.com/parasyte/libdragon.git
-$ mkdir libdragon/build_gcc
-$ cp libdragon/tools/build libdragon/build_gcc
-$ cd libdragon/build_gcc
-```
-
-Modify the `build` script to set your installation path. Here is the default:
+Clone this `Altra64` repo to a directory of your choice.
 
-```bash
-# EDIT THIS LINE TO CHANGE YOUR INSTALL PATH!
-export INSTALL_PATH=/usr/local/mips64-elf
-```
+On Windows 10:
+* Ensure that ["Windows Subsystem For Linux (Ubuntu)"](https://msdn.microsoft.com/en-gb/commandline/wsl/install_guide) is installed.
+* browse to the tools directory and double click on ```setup-wsfl.cmd```.
 
-Build it! This can take an hour or more.
+On Ubuntu, browse to the tools directory and run the command ```$ chmod +x ./setup-linux.sh;source ./setup-linux.sh```
 
-```bash
-$ ./build
-```
 
-### Configure your Environment
+### Build `Altra64`
 
-Add the following environment variable to your `~/.bash_profile` or `~/.bashrc`
-Be sure to use the same path that you configured in the build script!
+To build the Rom
 
-```bash
-export N64_INST=/usr/local/mips64-elf
+from the projects root directory,
+On Windows 10 run 
 ```
-
-### Build `libdragon`
-
-Make sure you are in the `libdragon` top-level directory, and make sure `libpng`
-is installed:
-
-```bash
-$ make && make install
-$ make tools && make tools-install
+> build
+```
+on linux
 ```
-
-### Build `libmikmod`
-
-Clone `libmikmod-n64` and build:
-
-```bash
-$ git clone https://github.com/parasyte/libmikmod-n64.git
-$ cd libmikmod-n64
 $ make
-$ make install
 ```
+If it all worked, you will find `OS64.v64` in the `Altra64` bin directory.
 
-### Build `libmad-n64`
-
-Clone `libmad-n64` and build, be sure to set the path according to your
-toolchain installation path:
+### Debug Build `Altra64`
+To build the debug version of the Rom
 
-```bash
-$ git clone https://github.com/parasyte/libmad-n64.git
-$ cd libmad-n64
-$ export PATH=$PATH:$(N64_INST)/bin
-$ CFLAGS="-march=vr4300 -mtune=vr4300 -mno-extern-sdata" \
-  LDFLAGS="-L$(N64_INST)/lib" LIBS="-lc -lnosys" \
-  ./configure --host=mips64-elf --disable-shared \
-  --prefix=$(N64_INST) --enable-speed --enable-fpm=mips
-$ make
-$ make install
+from the projects root directory,
+On Windows 10 run 
 ```
-
-### Build `libyaml`
-
-Download libyaml 0.1.6 and build, be sure to set the path according to your
-toolchain installation path:
-
-```bash
-$ hg clone https://bitbucket.org/xi/libyaml
-$ cd libyaml
-$ hg update 0.1.6
-$ ./bootstrap
-$ export PATH=$PATH:$(N64_INST)/bin
-$ CFLAGS="-std=gnu99 -march=vr4300 -mtune=vr4300" \
-  LDFLAGS="-L$(N64_INST)/lib -Tn64ld.x" \
-  LIBS="-ldragon -lc -ldragonsys -lnosys" \
-  ./configure --host=mips64-elf --prefix=$(N64_INST)
-$ make
-$ make install
+> build debug
 ```
+on linux
+```
+$ make debug
+```
+If it all worked, you will find `OS64.v64` in the `Altra64` bin directory.
 
-### Build `alt64`
 
-Finally, we can clone `alt64` and build it!
+### Clean `Altra64`
+Finally, we can clean the build objects from the project
 
-```bash
-$ git clone https://github.com/parasyte/alt64.git
-$ make
+from the projects root directory,
+On Windows 10 run 
+```
+> build clean
+```
+on linux
+```
+$ make clean
 ```
 
-If it all worked, you will find `OS64.v64` in the `alt64` top-level directory.
+Enjoy!

build.cmd

@@ -0,0 +1,23 @@
+::
+:: Copyright (c) 2017 The Altra64 project contributors
+:: See LICENSE file in the project root for full license information.
+::
+
+@echo off
+set "SystemPath=%SystemRoot%\\System32"
+IF EXIST %WINDIR%\\sysnative\\reg.exe (
+  set "SystemPath=%SystemRoot%\Sysnative"
+  echo. "32-bit process..."
+)
+
+set env="/usr/local/libdragon"
+
+IF %1.==. (
+  echo. "no parameter"
+  %SystemPath%\\bash --verbose -c "export N64_INST=%env%; make"
+) ELSE (
+  echo. "parameter: %1"
+  %SystemPath%\\bash --verbose -c "export N64_INST=%env%; make %1"
+)
+
+:pause