X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=makefile;h=11b7da914562fae539cfc2944c05f8ba1bcabaed;hb=05364bd7d67b04adaee47006b45933b0b758ab18;hp=966bf3bce49a3ec8f11568915ac6a4a9c93d13e9;hpb=ad913876dd8313ff082819d8cd5a921418670657;p=thunder

diff --git a/makefile b/makefile
index 966bf3b..11b7da9 100644
--- a/makefile
+++ b/makefile
@@ -12,8 +12,9 @@ SYSTYPE    = __GCCWIN32__
 EXESUFFIX  = .exe
 GLLIB      = -lopengl32
 ICON       = obj/icon.o
-SDLLIBTYPE = --libs
+SDLLIBTYPE = --static-libs
 MSG        = Win32 on MinGW
+EXTRA      = -static
 
 else
 #ifeq "$(OSTYPE)" "darwin"
@@ -50,22 +51,25 @@ CPPFLAGS = -MMD -Wall -Wno-switch -Wno-non-virtual-dtor -Wno-uninitialized -Wno-
 
 LDFLAGS =
 
-# Ugh, let's get rid of the ref to -lcurses
-LIBS = -L/usr/local/lib `sdl2-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) $(EXTRA)
 
-INCS = -I. -Isrc -I/usr/local/include
+INCS = -I. -Isrc
 
 OBJS = \
-	obj/dis6808.o    \
+	obj/dis63701.o   \
 	obj/dis6809.o    \
 	obj/gui.o        \
 	obj/icon-64x64.o \
 	obj/log.o        \
+	obj/psg.o        \
 	obj/resource.o   \
 	obj/screen.o     \
-	obj/v6808.o      \
+	obj/sound.o      \
+	obj/v63701.o     \
 	obj/v6809.o      \
 	obj/video.o      \
+	obj/ym2151.o     \
 	obj/thunder.o    \
 	$(ICON)
 
@@ -78,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.