X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=819bcc9be91c56f9d642aa0aac1bc394ac0d10da;hb=HEAD;hp=f0a37523fb6dfae29bee7631dfa42793cf343730;hpb=721ead373fc3d4fab6b02e0d549c0cdf9913b71b;p=apple2

diff --git a/Makefile b/Makefile
index f0a3752..819bcc9 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # Unified Makefile for Apple 2 SDL
 #
 # by James Hammons
-# (C) 2005-17 Underground Software
+# (C) 2005-2018 Underground Software
 # This software is licensed under the GPL v3
 #
 
@@ -20,8 +20,9 @@ ifeq "$(findstring Msys,$(OSTYPE))" "Msys"
 SYSTYPE    = __GCCWIN32__
 EXESUFFIX  = .exe
 ICON       = obj/icon.o
-SDLLIBTYPE = --libs
+SDLLIBTYPE = --static-libs
 MSG        = Win32 on MinGW
+EXTRA      = -static
 
 # Should catch both 'darwin' and 'darwin7.0'
 else ifeq "$(findstring Darwin,$(OSTYPE))" "Darwin"
@@ -86,7 +87,7 @@ CFLAGS   = $(GCC_DEPS) -Wall -Wno-switch $(DEFINES) -ffast-math $(SDL_CFLAGS) -p
 CPPFLAGS = $(GCC_DEPS) -Wall -Wno-switch -Wno-non-virtual-dtor $(DEFINES) \
 		-ffast-math $(SDL_CFLAGS) -pg -g
 
-LDFLAGS =
+LDFLAGS = $(EXTRA)
 
 #LIBS = -L/usr/local/lib -L/usr/lib `sdl2-config $(SDLLIBTYPE)` -lstdc++ -lz $(GLLIB)
 # Link in the gcov library (for profiling purposes)
@@ -94,48 +95,44 @@ LDFLAGS =
 # Link in the gprof lib
 #LIBS = -L/usr/local/lib -L/usr/lib `sdl2-config $(SDLLIBTYPE)` -lstdc++ -lz $(GLLIB) -pg
 #LIBS = -L/usr/local/lib -L/usr/lib $(SDL_LIBS) -lstdc++ -lz $(GLLIB) -pg
-LIBS = $(SDL_LIBS) -lstdc++ -lz $(GLLIB) -pg
+LIBS = $(SDL_LIBS) -lstdc++ -lz -lm $(GLLIB) -pg
 
 #INCS = -I. -I./src -I/usr/local/include -I/usr/include
 INCS = -I. -I./src
 
 OBJS = \
+	obj/config.o          \
 	obj/diskselector.o    \
 	obj/font10pt.o        \
 	obj/font12pt.o        \
 	obj/font14pt.o        \
 	obj/gui.o             \
-                          \
+                              \
+	obj/a2hs-scsi.o       \
+	obj/apple2-fw.o       \
+	obj/apple2e-enh.o     \
+	obj/firmware.o        \
+                              \
 	obj/apple2-icon-64x64.o \
-	obj/applevideo.o      \
-	obj/ay8910.o          \
 	obj/charset.o         \
+	obj/crc32.o           \
 	obj/dis65c02.o        \
-	obj/firmware.o        \
-	obj/floppy.o          \
+	obj/fileio.o          \
+	obj/floppydrive.o     \
+	obj/harddrive.o       \
 	obj/log.o             \
 	obj/mmu.o             \
-	obj/sdlemu_config.o   \
+	obj/mockingboard.o    \
 	obj/settings.o        \
 	obj/sound.o           \
 	obj/timing.o          \
+	obj/v6522via.o        \
 	obj/v65c02.o          \
+	obj/vay8910.o         \
 	obj/video.o           \
 	obj/apple2.o          \
 	$(ICON)
 
-#foooked:
-#	obj/button.o          \
-	obj/diskwindow.o      \
-	obj/draggablewindow.o \
-	obj/draggablewindow2.o \
-	obj/element.o         \
-	obj/guimisc.o         \
-	obj/menu.o            \
-	obj/text.o            \
-	obj/textedit.o        \
-	obj/window.o          \
-
 all: message obj $(TARGET)$(EXESUFFIX)
 	@echo
 	@echo -e "\033[01;33m***\033[00;32m Looks like it compiled OK... Give it a whirl!\033[00m"
@@ -181,9 +178,14 @@ obj/%.o: src/%.cpp
 	@$(CC) $(CPPFLAGS) $(INCS) -c $< -o $@
 
 #GUI compilation...
-#obj/%.o: src/gui/%.cpp
-#	@echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
-#	@$(CC) $(CPPFLAGS) $(INCS) -c $< -o $@
+obj/%.o: src/gui/%.cpp
+	@echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
+	@$(CC) $(CPPFLAGS) $(INCS) -c $< -o $@
+
+#Firmware compilation...
+obj/%.o: src/firmware/%.cpp
+	@echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
+	@$(CC) $(CPPFLAGS) $(INCS) -c $< -o $@
 
 $(TARGET)$(EXESUFFIX): $(OBJS)
 	@echo -e "\033[01;33m***\033[00;32m Linking it all together...\033[00m"