From: Shamus Hammons Date: Fri, 19 Mar 2004 23:35:40 +0000 (+0000) Subject: No longer needed X-Git-Tag: 1.0.7~64 X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=1b88d7fb79d91efdd8d7c1278f18f8f82fca2221;p=virtualjaguar No longer needed --- diff --git a/Makefile.unix b/Makefile.unix deleted file mode 100644 index e5bb302..0000000 --- a/Makefile.unix +++ /dev/null @@ -1,119 +0,0 @@ -# -# Makefile for Virtual Jaguar GCC/SDL Portable Jaguar Emulator -# - -# Uncomment the following lines to compile for Win32 - -#SYSTYPE = __GCCWIN32__ -#EXESUFFIX = .exe -#GLLIB = opengl32 -#ICON = vj-ico.o - -# Uncomment the following lines to compile for *nix - -SYSTYPE = __GCCUNIX__ -EXESUFFIX = -GLLIB = GL -ICON = - -CC = gcc -LD = gcc -TARGET = vj - -CFLAGS = -Wall -Wno-switch -Wno-non-virtual-dtor -O2 -D$(SYSTYPE) -Dstricmp="strcasecmp" \ - -fomit-frame-pointer `sdl-config --cflags` -# -fomit-frame-pointer `sdl-config --cflags` -g -# -fomit-frame-pointer `sdl-config --cflags` -DLOG_UNMAPPED_MEMORY_ACCESSES - -LDFLAGS = $(CFLAGS) - -LIBS = -L/usr/local/lib -L/usr/lib `sdl-config --libs` -lstdc++ -lz -l$(GLLIB) - -INCS = -I. -Isrc -Isrc/include -I/usr/local/include -I/usr/include - -THECC = $(CC) $(CFLAGS) $(INCS) - -OBJS = \ - obj/anajoy.o \ - obj/blitter.o \ - obj/cdbios.o \ - obj/cdi.o \ - obj/cdrom.o \ - obj/clock.o \ - obj/crc32.o \ - obj/dac.o \ - obj/dsp.o \ - obj/eeprom.o \ - obj/gpu.o \ - obj/gui.o \ - obj/jagdasm.o \ - obj/jaguar.o \ - obj/jerry.o \ - obj/joystick.o \ - obj/log.o \ - obj/m68kcpu.o obj/m68kops.o obj/m68kopac.o obj/m68kopdm.o obj/m68kopnz.o \ - obj/m68kdasm.o \ - obj/memory.o \ - obj/objectp.o \ - obj/sdlemu_config.o \ - obj/sdlemu_opengl.o \ - obj/settings.o \ - obj/tom.o \ - obj/unzip.o \ - obj/version.o \ - obj/video.o \ - obj/vj.o \ - $(ICON) - -all: obj $(TARGET) - -clean: - rm -rf obj - rm -f ./vj$(EXESUFFIX) - -obj: - mkdir obj - -obj/%.o: src/%.c - $(THECC) -c $< -o $@ - -obj/%.o: src/%.cpp - $(THECC) -c $< -o $@ - -vj: $(OBJS) - $(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -# strip --strip-all vj$(EXESUFFIX) -# upx -9 vj$(EXESUFFIX) - -# Other stuff that has unusual dependencies - -obj/gui.o: src/gui.cpp src/include/gui.h src/include/font1.h - $(THECC) -c src/gui.cpp -o obj/gui.o - -# -# Musashi specific stuffola -# - -obj/m68kcpu.o: obj/m68kops.h src/m68k.h src/m68kconf.h - $(CC) $(CFLAGS) -Iobj -c src/m68kcpu.c -o obj/m68kcpu.o - -obj/m68kops.o: obj/m68kmake$(EXESUFFIX) obj/m68kops.h obj/m68kops.c src/m68k.h src/m68kconf.h - $(CC) $(CFLAGS) -Isrc -c obj/m68kops.c -o obj/m68kops.o - -obj/m68kopac.o: obj/m68kmake$(EXESUFFIX) obj/m68kops.h obj/m68kopac.c src/m68k.h src/m68kconf.h - $(CC) $(CFLAGS) -Isrc -c obj/m68kopac.c -o obj/m68kopac.o - -obj/m68kopdm.o: obj/m68kmake$(EXESUFFIX) obj/m68kops.h obj/m68kopdm.c src/m68k.h src/m68kconf.h - $(CC) $(CFLAGS) -Isrc -c obj/m68kopdm.c -o obj/m68kopdm.o - -obj/m68kopnz.o: obj/m68kmake$(EXESUFFIX) obj/m68kops.h obj/m68kopnz.c src/m68k.h src/m68kconf.h - $(CC) $(CFLAGS) -Isrc -c obj/m68kopnz.c -o obj/m68kopnz.o - -obj/m68kdasm.o: src/m68kdasm.c src/m68k.h src/m68kconf.h - $(CC) $(CFLAGS) -Isrc -c src/m68kdasm.c -o obj/m68kdasm.o - -obj/m68kops.h: obj/m68kmake$(EXESUFFIX) - obj/m68kmake obj src/m68k_in.c - -obj/m68kmake$(EXESUFFIX): src/m68kmake.c src/m68k_in.c - $(CC) $(WARNINGS) src/m68kmake.c -o obj/m68kmake$(EXESUFFIX) diff --git a/Makefile.win32 b/Makefile.win32 deleted file mode 100644 index ebcc4d0..0000000 --- a/Makefile.win32 +++ /dev/null @@ -1,119 +0,0 @@ -# -# Makefile for Virtual Jaguar GCC/SDL Portable Jaguar Emulator -# - -# Uncomment the following lines to compile for Win32 - -SYSTYPE = __GCCWIN32__ -EXESUFFIX = .exe -GLLIB = opengl32 -ICON = vj-ico.o - -# Uncomment the following lines to compile for *nix - -#SYSTYPE = __GCCUNIX__ -#EXESUFFIX = -#GLLIB = GL -#ICON = - -CC = gcc -LD = gcc -TARGET = vj - -CFLAGS = -Wall -Wno-switch -Wno-non-virtual-dtor -O2 -D$(SYSTYPE) -Dstricmp="strcasecmp" \ - -fomit-frame-pointer `sdl-config --cflags` -# -fomit-frame-pointer `sdl-config --cflags` -g -# -fomit-frame-pointer `sdl-config --cflags` -DLOG_UNMAPPED_MEMORY_ACCESSES - -LDFLAGS = $(CFLAGS) - -LIBS = -L/usr/local/lib -L/usr/lib `sdl-config --libs` -lstdc++ -lz -l$(GLLIB) - -INCS = -I. -Isrc -Isrc/include -I/usr/local/include -I/usr/include - -THECC = $(CC) $(CFLAGS) $(INCS) - -OBJS = \ - obj/anajoy.o \ - obj/blitter.o \ - obj/cdbios.o \ - obj/cdi.o \ - obj/cdrom.o \ - obj/clock.o \ - obj/crc32.o \ - obj/dac.o \ - obj/dsp.o \ - obj/eeprom.o \ - obj/gpu.o \ - obj/gui.o \ - obj/jagdasm.o \ - obj/jaguar.o \ - obj/jerry.o \ - obj/joystick.o \ - obj/log.o \ - obj/m68kcpu.o obj/m68kops.o obj/m68kopac.o obj/m68kopdm.o obj/m68kopnz.o \ - obj/m68kdasm.o \ - obj/memory.o \ - obj/objectp.o \ - obj/sdlemu_config.o \ - obj/sdlemu_opengl.o \ - obj/settings.o \ - obj/tom.o \ - obj/unzip.o \ - obj/version.o \ - obj/video.o \ - obj/vj.o \ - $(ICON) - -all: obj $(TARGET) - -clean: - rm -rf obj - rm -f ./vj$(EXESUFFIX) - -obj: - mkdir obj - -obj/%.o: src/%.c - $(THECC) -c $< -o $@ - -obj/%.o: src/%.cpp - $(THECC) -c $< -o $@ - -vj: $(OBJS) - $(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -# strip --strip-all vj$(EXESUFFIX) -# upx -9 vj$(EXESUFFIX) - -# Other stuff that has unusual dependencies - -obj/gui.o: src/gui.cpp src/include/gui.h src/include/font1.h - $(THECC) -c src/gui.cpp -o obj/gui.o - -# -# Musashi specific stuffola -# - -obj/m68kcpu.o: obj/m68kops.h src/m68k.h src/m68kconf.h - $(CC) $(CFLAGS) -Iobj -c src/m68kcpu.c -o obj/m68kcpu.o - -obj/m68kops.o: obj/m68kmake$(EXESUFFIX) obj/m68kops.h obj/m68kops.c src/m68k.h src/m68kconf.h - $(CC) $(CFLAGS) -Isrc -c obj/m68kops.c -o obj/m68kops.o - -obj/m68kopac.o: obj/m68kmake$(EXESUFFIX) obj/m68kops.h obj/m68kopac.c src/m68k.h src/m68kconf.h - $(CC) $(CFLAGS) -Isrc -c obj/m68kopac.c -o obj/m68kopac.o - -obj/m68kopdm.o: obj/m68kmake$(EXESUFFIX) obj/m68kops.h obj/m68kopdm.c src/m68k.h src/m68kconf.h - $(CC) $(CFLAGS) -Isrc -c obj/m68kopdm.c -o obj/m68kopdm.o - -obj/m68kopnz.o: obj/m68kmake$(EXESUFFIX) obj/m68kops.h obj/m68kopnz.c src/m68k.h src/m68kconf.h - $(CC) $(CFLAGS) -Isrc -c obj/m68kopnz.c -o obj/m68kopnz.o - -obj/m68kdasm.o: src/m68kdasm.c src/m68k.h src/m68kconf.h - $(CC) $(CFLAGS) -Isrc -c src/m68kdasm.c -o obj/m68kdasm.o - -obj/m68kops.h: obj/m68kmake$(EXESUFFIX) - obj/m68kmake obj src/m68k_in.c - -obj/m68kmake$(EXESUFFIX): src/m68kmake.c src/m68k_in.c - $(CC) $(WARNINGS) src/m68kmake.c -o obj/m68kmake$(EXESUFFIX) diff --git a/fix-unix.sh b/fix-unix.sh deleted file mode 100644 index 4a1a732..0000000 --- a/fix-unix.sh +++ /dev/null @@ -1,21 +0,0 @@ -#! /bin/sh -# -# Sets up the Allegro package for building under Unix, converting text -# files from CR/LF to LF format. - - -echo "Converting NeoPocott files to Unix format..." - -find . -type f "(" \ - -name "*.c*" -o -name "*.cfg" -o \ - -name "*.h" -o -name "*.s" -o \ - -name "*.txt" -o -name "*.asm" -o \ - -name "Makefile*" -o -name "readme.*" \ - ")" \ - -exec sh -c "echo {}; - mv {} _tmpfile; - tr -d \\\r < _tmpfile > {}; - touch -r _tmpfile {}; - rm _tmpfile" \; - -echo "Done!"