From 62adc2edd17cbd39272715d29d1b4c8650ef7dde Mon Sep 17 00:00:00 2001
From: Xavi Del Campo <xavi.dcr@tutanota.com>
Date: Tue, 3 Mar 2020 18:11:54 +0100
Subject: Moved files

---
 Makefile      |  74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 TestLevel.lvl | Bin 1088 -> 0 bytes
 src/Makefile  |  74 ----------------------------------------------------------
 3 files changed, 74 insertions(+), 74 deletions(-)
 create mode 100644 Makefile
 delete mode 100644 TestLevel.lvl
 delete mode 100644 src/Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..f20974f
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,74 @@
+CC = psxsdkserial-gcc
+DEFINE= -D_PAL_MODE_
+DEFINE += -DPSXSDK_DEBUG
+LIBS=-lfixmath
+CC_FLAGS = -Wall -Werror -c -Os -Wfatal-errors -g
+LINKER = psxsdkserial-gcc
+
+PROJECT = OPENSEND
+PROJECT_DIR = ~/OpenSend
+
+INIT_ADDR=0x801A0000
+
+ELF2EXE = elf2exe
+ELF2EXE_FLAGS = -mark="Open-source PSX-EXE loader created with PSXSDK" -init_addr=$(INIT_ADDR)
+LICENSE_FILE = /usr/local/psxsdk/share/licenses/infoeur.dat
+
+PSXSDK_DIR = /usr/local/psxsdk/bin
+
+EMULATOR_DIR = ~/pcsxr
+EMULATOR = pcsxr.exe
+SOUND_INTERFACE =
+EMULATOR_FLAGS = -nogui -psxout
+OBJ_DIR = Obj
+SRC_DIR = .
+MUSIC_TRACKS =
+#FFMPEG = ffmpeg
+#FFMPEG_DIR = ../Music/ffmpeg/bin
+#FFMPEG_FLAGS = -f s16le -acodec pcm_s16le
+
+GNU_SIZE = mipsel-unknown-elf-size
+
+all: build image clean
+#emulator clean
+
+rebuild: remove build
+
+build: clean objects $(PROJECT).elf $(PROJECT).exe
+	
+objects: 	$(addprefix $(OBJ_DIR)/,main.o System.o Gfx.o \
+			LoadMenu.o EndAnimation.o			\
+			Font.o Serial.o)
+			
+remove:
+	rm -f Obj/*.o
+	
+$(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
+	$(CC) $< -o $@ $(DEFINE) $(CC_FLAGS)
+	
+$(PROJECT).elf: 
+	$(LINKER) Obj/*.o -o Exe/$(PROJECT).elf $(LIBS) -Wl,--gc-sections
+	
+$(PROJECT).exe:
+	$(ELF2EXE) Exe/$(PROJECT).elf Exe/$(PROJECT).exe $(ELF2EXE_FLAGS)
+	cp Exe/$(PROJECT).exe ../cdimg
+	
+image:
+	rm -f $(PROJECT).iso $(PROJECT).bin
+	rm -f $(PROJECT).cue
+	mkisofs -o $(PROJECT).iso -V $(PROJECT) -sysid PLAYSTATION ../cdimg
+	mkpsxiso $(PROJECT).iso $(PROJECT).bin $(LICENSE_FILE)
+	mv $(PROJECT).bin ../Bin
+	mv $(PROJECT).cue ../Bin
+	rm -f $(PROJECT).cue
+	rm -f $(PROJECT).iso
+	$(GNU_SIZE) Exe/$(PROJECT).elf
+	
+emulator:
+	export PATH=$$PATH:$(EMULATOR_DIR)
+	$(EMULATOR) -cdfile $(PROJECT_DIR)/Bin/$(PROJECT).bin $(EMULATOR_FLAGS)
+	
+clean:
+	rm -f $(PROJECT).elf cdimg/$(PROJECT).exe $(PROJECT).bin $(PROJECT).cue cdimg/README.txt
+	rm -f $(PROJECT).iso $(PROJECT).exe $(PROJECT).elf
+
diff --git a/TestLevel.lvl b/TestLevel.lvl
deleted file mode 100644
index 35deda0..0000000
Binary files a/TestLevel.lvl and /dev/null differ
diff --git a/src/Makefile b/src/Makefile
deleted file mode 100644
index f20974f..0000000
--- a/src/Makefile
+++ /dev/null
@@ -1,74 +0,0 @@
-CC = psxsdkserial-gcc
-DEFINE= -D_PAL_MODE_
-DEFINE += -DPSXSDK_DEBUG
-LIBS=-lfixmath
-CC_FLAGS = -Wall -Werror -c -Os -Wfatal-errors -g
-LINKER = psxsdkserial-gcc
-
-PROJECT = OPENSEND
-PROJECT_DIR = ~/OpenSend
-
-INIT_ADDR=0x801A0000
-
-ELF2EXE = elf2exe
-ELF2EXE_FLAGS = -mark="Open-source PSX-EXE loader created with PSXSDK" -init_addr=$(INIT_ADDR)
-LICENSE_FILE = /usr/local/psxsdk/share/licenses/infoeur.dat
-
-PSXSDK_DIR = /usr/local/psxsdk/bin
-
-EMULATOR_DIR = ~/pcsxr
-EMULATOR = pcsxr.exe
-SOUND_INTERFACE =
-EMULATOR_FLAGS = -nogui -psxout
-OBJ_DIR = Obj
-SRC_DIR = .
-MUSIC_TRACKS =
-#FFMPEG = ffmpeg
-#FFMPEG_DIR = ../Music/ffmpeg/bin
-#FFMPEG_FLAGS = -f s16le -acodec pcm_s16le
-
-GNU_SIZE = mipsel-unknown-elf-size
-
-all: build image clean
-#emulator clean
-
-rebuild: remove build
-
-build: clean objects $(PROJECT).elf $(PROJECT).exe
-	
-objects: 	$(addprefix $(OBJ_DIR)/,main.o System.o Gfx.o \
-			LoadMenu.o EndAnimation.o			\
-			Font.o Serial.o)
-			
-remove:
-	rm -f Obj/*.o
-	
-$(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
-	$(CC) $< -o $@ $(DEFINE) $(CC_FLAGS)
-	
-$(PROJECT).elf: 
-	$(LINKER) Obj/*.o -o Exe/$(PROJECT).elf $(LIBS) -Wl,--gc-sections
-	
-$(PROJECT).exe:
-	$(ELF2EXE) Exe/$(PROJECT).elf Exe/$(PROJECT).exe $(ELF2EXE_FLAGS)
-	cp Exe/$(PROJECT).exe ../cdimg
-	
-image:
-	rm -f $(PROJECT).iso $(PROJECT).bin
-	rm -f $(PROJECT).cue
-	mkisofs -o $(PROJECT).iso -V $(PROJECT) -sysid PLAYSTATION ../cdimg
-	mkpsxiso $(PROJECT).iso $(PROJECT).bin $(LICENSE_FILE)
-	mv $(PROJECT).bin ../Bin
-	mv $(PROJECT).cue ../Bin
-	rm -f $(PROJECT).cue
-	rm -f $(PROJECT).iso
-	$(GNU_SIZE) Exe/$(PROJECT).elf
-	
-emulator:
-	export PATH=$$PATH:$(EMULATOR_DIR)
-	$(EMULATOR) -cdfile $(PROJECT_DIR)/Bin/$(PROJECT).bin $(EMULATOR_FLAGS)
-	
-clean:
-	rm -f $(PROJECT).elf cdimg/$(PROJECT).exe $(PROJECT).bin $(PROJECT).cue cdimg/README.txt
-	rm -f $(PROJECT).iso $(PROJECT).exe $(PROJECT).elf
-
-- 
cgit v1.2.3