X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=makefile;h=5211ee3f054b3eb3cfd94fc5cc0a483e01eec663;hb=9eb5812230547fd62f2413d84a0dcc9e1336be21;hp=d0f50c77a5ca82642866676960ae870d82af7cb5;hpb=87647f03b4d7cf53948ed8f9f25ad30da5e596bf;p=thunder

diff --git a/makefile b/makefile
old mode 100755
new mode 100644
index d0f50c7..5211ee3
--- a/makefile
+++ b/makefile
@@ -1,12 +1,12 @@
 #
 # Makefile for Thunder SDL
 #
-# by James L. Hammons
+# by James Hammons
 # (C) 2009 Underground Software
 # This software is licensed under the GPL v3 or later
 #
 
-ifeq "$(OSTYPE)" "msys"							# Win32
+ifeq "$(OSTYPE)" "msys"	# Win32
 
 SYSTYPE    = __GCCWIN32__
 EXESUFFIX  = .exe
@@ -26,7 +26,7 @@ ICON       =
 SDLLIBTYPE = --static-libs
 MSG        = Mac OS X
 
-else											# *nix
+else	# *nix
 
 SYSTYPE    = __GCCUNIX__
 EXESUFFIX  =
@@ -42,26 +42,35 @@ CC         = gcc
 LD         = gcc
 TARGET     = thunder
 
-CFLAGS   = -MMD -Wall -Wno-switch -Wno-uninitialized -Wno-unused -O2 -D$(SYSTYPE) -fomit-frame-pointer `sdl-config --cflags`
+CFLAGS   = -MMD -Wall -Wno-switch -Wno-uninitialized -Wno-unused -O2 -D$(SYSTYPE) -fomit-frame-pointer `sdl2-config --cflags`
 CPPFLAGS = -MMD -Wall -Wno-switch -Wno-non-virtual-dtor -Wno-uninitialized -Wno-unused -O2 -D$(SYSTYPE) \
-		-fomit-frame-pointer `sdl-config --cflags` \
+		-fomit-frame-pointer `sdl2-config --cflags` \
 		-g
 #		-DLOG_UNMAPPED_MEMORY_ACCESSES
 
 LDFLAGS =
 
-# Ugh, let's get rid of the ref to -lcurses
-LIBS = -L/usr/local/lib `sdl-config $(SDLLIBTYPE)` -lstdc++ -lz $(GLLIB) -lcurses
+# Ugh, let's get rid of the ref to -lcurses [DONE]
+LIBS = `sdl2-config $(SDLLIBTYPE)` -lstdc++ -lz -lm $(GLLIB)
 
-INCS = -I. -Isrc -I/usr/local/include
+INCS = -I. -Isrc
 
 OBJS = \
-	obj/gui.o      \
-	obj/log.o      \
-	obj/resource.o \
-	obj/screen.o   \
-	obj/v6809.o    \
-	obj/thunder.o  \
+	obj/dis63701.o   \
+	obj/dis6809.o    \
+	obj/fileio.o     \
+	obj/gui.o        \
+	obj/icon-64x64.o \
+	obj/log.o        \
+	obj/psg.o        \
+	obj/resource.o   \
+	obj/screen.o     \
+	obj/sound.o      \
+	obj/v63701.o     \
+	obj/v6809.o      \
+	obj/video.o      \
+	obj/ym2151.o     \
+	obj/thunder.o    \
 	$(ICON)
 
 all: checkenv message obj $(TARGET)$(EXESUFFIX)
@@ -73,7 +82,7 @@ all: checkenv message obj $(TARGET)$(EXESUFFIX)
 checkenv:
 	@echo
 	@echo -en "\033[01;33m***\033[00;32m Checking compilation environment... \033[00m"
-ifeq "" "$(shell which sdl-config)"
+ifeq "" "$(shell which sdl2-config)"
 	@echo
 	@echo
 	@echo -e "\033[01;33mIt seems that you don't have the SDL development libraries installed.
@@ -117,9 +126,8 @@ obj/%.o: src/%.cpp
 	@$(CC) $(CPPFLAGS) $(INCS) -c $< -o $@
 
 obj/%.o: src/%.asm
-	nasm -f elf32 -I ./res/ $< -o $@
-# *** sigh *** yet another variable... !!! FIX !!!
-#	nasm -f coff $< -o $@
+	@echo -e "\033[01;33m***\033[00;32m Assembling $<...\033[00m"
+	@nasm -f elf64 -I ./res/ $< -o $@
 
 $(TARGET)$(EXESUFFIX): $(OBJS)
 	@echo -e "\033[01;33m***\033[00;32m Linking it all together...\033[00m"