X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=makefile;h=5211ee3f054b3eb3cfd94fc5cc0a483e01eec663;hb=HEAD;hp=11b7da914562fae539cfc2944c05f8ba1bcabaed;hpb=05364bd7d67b04adaee47006b45933b0b758ab18;p=thunder diff --git a/makefile b/makefile index 11b7da9..5211ee3 100644 --- a/makefile +++ b/makefile @@ -6,15 +6,14 @@ # This software is licensed under the GPL v3 or later # -ifeq "$(OSTYPE)" "msys" # Win32 +ifeq "$(OSTYPE)" "msys" # Win32 SYSTYPE = __GCCWIN32__ EXESUFFIX = .exe GLLIB = -lopengl32 ICON = obj/icon.o -SDLLIBTYPE = --static-libs +SDLLIBTYPE = --libs MSG = Win32 on MinGW -EXTRA = -static else #ifeq "$(OSTYPE)" "darwin" @@ -52,13 +51,14 @@ CPPFLAGS = -MMD -Wall -Wno-switch -Wno-non-virtual-dtor -Wno-uninitialized -Wno- LDFLAGS = # Ugh, let's get rid of the ref to -lcurses [DONE] -LIBS = `sdl2-config $(SDLLIBTYPE)` -lstdc++ -lz -lm $(GLLIB) $(EXTRA) +LIBS = `sdl2-config $(SDLLIBTYPE)` -lstdc++ -lz -lm $(GLLIB) INCS = -I. -Isrc OBJS = \ obj/dis63701.o \ obj/dis6809.o \ + obj/fileio.o \ obj/gui.o \ obj/icon-64x64.o \ obj/log.o \