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

diff --git a/Makefile b/Makefile
old mode 100755
new mode 100644
index e94b4a6..819bcc9
--- a/Makefile
+++ b/Makefile
@@ -1,165 +1,206 @@
 #
 # Unified Makefile for Apple 2 SDL
 #
-# by James L. Hammons
-# (C) 2005 Underground Software
-# This software is licensed under the GPL v2
+# by James Hammons
+# (C) 2005-2018 Underground Software
+# This software is licensed under the GPL v3
 #
 
+FIND = find
+FINDSDL2 := $(shell which $(CROSS)sdl2-config 2> /dev/null)
+
 # Figure out which system we're compiling for, and set the appropriate variables
 
-ifeq "$(OSTYPE)" "msys"							# Win32
+ifeq "$(CROSS)" ""
+OSTYPE   := $(shell uname -a)
+
+# Win32
+ifeq "$(findstring Msys,$(OSTYPE))" "Msys"
 
 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"
-ifeq "darwin" "$(findstring darwin,$(OSTYPE))"	# Should catch both 'darwin' and 'darwin7.0'
+# Should catch both 'darwin' and 'darwin7.0'
+else ifeq "$(findstring Darwin,$(OSTYPE))" "Darwin"
 
 SYSTYPE    = __GCCUNIX__ -D_OSX_
 EXESUFFIX  =
-GLLIB      =
 ICON       =
 SDLLIBTYPE = --static-libs
 MSG        = Mac OS X
 
-else											# *nix
+# *nix
+else ifeq "$(findstring Linux,$(OSTYPE))" "Linux"
 
 SYSTYPE    = __GCCUNIX__
 EXESUFFIX  =
-GLLIB      = -lGL
 ICON       =
 SDLLIBTYPE = --libs
 MSG        = generic Unix/Linux
 
+# Throw error, unknown OS
+else
+
+$(error OS TYPE UNDETECTED)
+
 endif
+# Cross compile using MXE under Linux host
+else
+
+SYSTYPE    = __GCCWIN32__
+EXESUFFIX  = .exe
+ICON       = obj/icon.o
+SDLLIBTYPE = --libs
+MSG        = Win32 under MXE (cross compile)
+
 endif
 
-CC         = gcc
-LD         = gcc
+CC         = $(CROSS)gcc
+LD         = $(CROSS)gcc
 TARGET     = apple2
 
+SDL_CFLAGS = `$(CROSS)sdl2-config --cflags`
+SDL_LIBS   = `$(CROSS)sdl2-config $(SDLLIBTYPE)`
+DEFINES    = -D$(SYSTYPE)
+GCC_DEPS   = -MMD
+
 # Note that we use optimization level 2 instead of 3--3 doesn't seem to gain much over 2
-#CFLAGS   = -MMD -Wall -Wno-switch -O2 -D$(SYSTYPE) -ffast-math -fomit-frame-pointer `sdl-config --cflags`
+#CFLAGS   = -MMD -Wall -Wno-switch -O2 -D$(SYSTYPE) -ffast-math -fomit-frame-pointer `sdl2-config --cflags`
 #CPPFLAGS = -MMD -Wall -Wno-switch -Wno-non-virtual-dtor -O2 -D$(SYSTYPE) \
 # No optimization and w/gcov flags, so that we get an accurate picture from gcov
 #CFLAGS   = -MMD -Wall -Wno-switch -D$(SYSTYPE) \
-#		-ffast-math -fomit-frame-pointer `sdl-config --cflags` -fprofile-arcs -ftest-coverage
+#		-ffast-math -fomit-frame-pointer `sdl2-config --cflags` -fprofile-arcs -ftest-coverage
 #CPPFLAGS = -MMD -Wall -Wno-switch -Wno-non-virtual-dtor -D$(SYSTYPE) \
-#		-ffast-math -fomit-frame-pointer `sdl-config --cflags` -fprofile-arcs -ftest-coverage
+#		-ffast-math -fomit-frame-pointer `sdl2-config --cflags` -fprofile-arcs -ftest-coverage
 # No optimization for profiling with gprof...
-CFLAGS   = -MMD -Wall -Wno-switch -D$(SYSTYPE) \
-		-ffast-math `sdl-config --cflags` -pg -g
-CPPFLAGS = -MMD -Wall -Wno-switch -Wno-non-virtual-dtor -D$(SYSTYPE) \
-		-ffast-math `sdl-config --cflags` -pg -g
-#		-fomit-frame-pointer `sdl-config --cflags` -g
-#		-fomit-frame-pointer `sdl-config --cflags` -DLOG_UNMAPPED_MEMORY_ACCESSES
+#CFLAGS   = -MMD -Wall -Wno-switch -D$(SYSTYPE) \
+#		-ffast-math `sdl2-config --cflags` -pg -g
+#CPPFLAGS = -MMD -Wall -Wno-switch -Wno-non-virtual-dtor -D$(SYSTYPE) \
+#		-ffast-math `sdl2-config --cflags` -pg -g
+#		-fomit-frame-pointer `sdl2-config --cflags` -g
+#		-fomit-frame-pointer `sdl2-config --cflags` -DLOG_UNMAPPED_MEMORY_ACCESSES
+CFLAGS   = $(GCC_DEPS) -Wall -Wno-switch $(DEFINES) -ffast-math $(SDL_CFLAGS) -pg -g
+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 `sdl-config $(SDLLIBTYPE)` -lstdc++ -lz $(GLLIB)
+#LIBS = -L/usr/local/lib -L/usr/lib `sdl2-config $(SDLLIBTYPE)` -lstdc++ -lz $(GLLIB)
 # Link in the gcov library (for profiling purposes)
-#LIBS = -L/usr/local/lib -L/usr/lib `sdl-config $(SDLLIBTYPE)` -lstdc++ -lz $(GLLIB) -lgcov
+#LIBS = -L/usr/local/lib -L/usr/lib `sdl2-config $(SDLLIBTYPE)` -lstdc++ -lz $(GLLIB) -lgcov
 # Link in the gprof lib
-LIBS = -L/usr/local/lib -L/usr/lib `sdl-config $(SDLLIBTYPE)` -lstdc++ -lz $(GLLIB) -pg
+#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 -lm $(GLLIB) -pg
 
-INCS = -I. -I./src -I/usr/local/include -I/usr/include
+#INCS = -I. -I./src -I/usr/local/include -I/usr/include
+INCS = -I. -I./src
 
 OBJS = \
-	obj/button.o          \
-	obj/draggablewindow.o \
-	obj/draggablewindow2.o \
-	obj/element.o         \
+	obj/config.o          \
+	obj/diskselector.o    \
+	obj/font10pt.o        \
+	obj/font12pt.o        \
+	obj/font14pt.o        \
 	obj/gui.o             \
-	obj/guimisc.o         \
-	obj/menu.o            \
-	obj/textedit.o        \
-	obj/window.o          \
-                          \
-	obj/applevideo.o      \
-	obj/ay8910.o          \
+                              \
+	obj/a2hs-scsi.o       \
+	obj/apple2-fw.o       \
+	obj/apple2e-enh.o     \
+	obj/firmware.o        \
+                              \
+	obj/apple2-icon-64x64.o \
+	obj/charset.o         \
+	obj/crc32.o           \
 	obj/dis65c02.o        \
-	obj/floppy.o          \
+	obj/fileio.o          \
+	obj/floppydrive.o     \
+	obj/harddrive.o       \
 	obj/log.o             \
-	obj/sdlemu_config.o   \
-	obj/sdlemu_opengl.o   \
+	obj/mmu.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)
 
-all: checkenv message obj $(TARGET)$(EXESUFFIX)
+all: message obj $(TARGET)$(EXESUFFIX)
 	@echo
-	@echo "*** Looks like it compiled OK... Give it a whirl!"
+	@echo -e "\033[01;33m***\033[00;32m Looks like it compiled OK... Give it a whirl!\033[00m"
 
 # Check the compilation environment, barf if not appropriate
 
-checkenv:
-	@echo
-	@echo -n "*** Checking compilation environment... "
-ifeq "" "$(shell which sdl-config)"
-	@echo
-	@echo
-	@echo "It seems that you don't have the SDL development libraries installed. If you"
-	@echo "have installed them, make sure that the sdl-config file is somewhere in your"
-	@echo "path and is executable."
-	@echo
-#Is there a better way to break out of the makefile?
-	@break
-else
-	@echo "OK"
+ifeq "$(FINDSDL2)" ""
+  $(info )
+  $(info It seems that you don't have the SDL 2 development libraries installed. If you)
+  $(info have installed them, make sure that the sdl2-config file is somewhere in your)
+  $(info path and is executable.)
+  $(info )
+  $(error SDL2 MISSING)
 endif
 
 message:
 	@echo
-	@echo "*** Building Apple 2 SDL for $(MSG)..."
+	@echo -e "\033[01;33m***\033[00;32m Building Apple2 SDL for $(MSG)...\033[00m"
 	@echo
 
 clean:
-	@echo -n "*** Cleaning out the garbage..."
+	@echo -en "\033[01;33m***\033[00;32m Cleaning out the garbage...\033[00m"
 	@rm -rf obj
 	@rm -f ./$(TARGET)$(EXESUFFIX)
-	@echo "done!"
+	@echo -e "\033[01;37mdone!\033[00m"
 
 obj:
 	@mkdir obj
 
-# This is only done for Win32 at the moment...
-
+# Icon creation is only done for Win32 at the moment...
 ifneq "" "$(ICON)"
 $(ICON): res/$(TARGET).rc res/$(TARGET).ico
-	@echo "*** Processing icon..."
-	@windres -i res/$(TARGET).rc -o $(ICON) --include-dir=./res
+	@echo -e "\033[01;33m***\033[00;32m Processing icon...\033[00m"
+	@$(CROSS)windres -i res/$(TARGET).rc -o $(ICON) --include-dir=./res
 endif
 
 obj/%.o: src/%.c
-	@echo "*** Compiling $<..."
+	@echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
 	@$(CC) $(CFLAGS) $(INCS) -c $< -o $@
 
 obj/%.o: src/%.cpp
-	@echo "*** Compiling $<..."
+	@echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
 	@$(CC) $(CPPFLAGS) $(INCS) -c $< -o $@
 
 #GUI compilation...
 obj/%.o: src/gui/%.cpp
-	@echo "*** Compiling $<..."
+	@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 "*** Linking it all together..."
+	@echo -e "\033[01;33m***\033[00;32m Linking it all together...\033[00m"
 	@$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-#	strip --strip-all vj$(EXESUFFIX)
-#	upx -9 vj$(EXESUFFIX)
+#	strip --strip-all $(TARGET)$(EXESUFFIX)
+#	upx -9 $(TARGET)$(EXESUFFIX)
+
+statistics:
+	@echo -n "Lines in source files: "
+	@-$(FIND) ./src -name "*.cpp" | xargs cat | wc -l
+	@echo -n "Lines in header files: "
+	@-$(FIND) ./src -name "*.h" | xargs cat | wc -l
 
 # Pull in dependencies autogenerated by gcc's -MMD switch
 # The "-" in front in there just in case they haven't been created yet
 
 -include obj/*.d
+