Changes in Makefile [59ea67d:1efc42c] in buchla-emu

File:

• Makefile (modified) (6 diffs)

Makefile

@@ -4 +4 @@
 GCC :=                  gcc
 SDL2 :=                 /opt/sdl2
-EXT :=
 else
 GCC :=                  x86_64-w64-mingw32-gcc
 SDL2 :=                 /opt/sdl2-win
-EXT :=                  .exe
 endif
 
@@ -34 +32 @@
 FLAGS_LNK :=    $(FLAGS) -pthread -Wall -Wextra
 LIBS :=                 $(SDL2_LIB)/libSDL2.a \
-                                $(SDL2_LIB)/libSDL2_net.a \
                                 $(SDL2_LIB)/libSDL2_ttf.a \
                                 $(SDL2_LIB)/libfreetype.a \
@@ -44 +41 @@
 FLAGS_LNK :=    $(FLAGS) -Wall -Wextra
 LIBS :=                 $(SDL2_LIB)/libSDL2.a \
-                                $(SDL2_LIB)/libSDL2_net.a \
                                 $(SDL2_LIB)/libSDL2_ttf.a \
                                 $(SDL2_LIB)/libfreetype.a \
@@ -64 +60 @@
                                 $(SDL2_LIB)/libSDL2.a \
                                 $(SDL2_LIB)/libSDL2main.a \
-                                $(SDL2_LIB)/libSDL2_net.a \
                                 $(SDL2_LIB)/libSDL2_ttf.a \
                                 $(SDL2_LIB)/libfreetype.a \
                                 -l gdi32 \
                                 -l imm32 \
-                                -l iphlpapi \
                                 -l ole32 \
                                 -l oleaut32 \
                                 -l version \
-                                -l winmm \
-                                -l ws2_32
+                                -l winmm
 endif
 
 HEADERS :=              $(wildcard cpu/*.h) $(wildcard emu/*.h)
 
-all:                    buchla$(EXT) buchla.disk
+all:                    buchla buchla.disk
 
-build/gen:
+build:
+                                mkdir build
+
+build/gen:              | build
                                 gcc $(FLAGS) -o build/gen cpu/m68kmake.c
 
@@ -94 +90 @@
 
 $(GEN_CP) $(GEN_HP): \
-                                build/gen
+                                build/gen | build
                                 cd cpu; ../build/gen ../build
 
@@ -104 +100 @@
 CPU_OP :=               $(CPU_O:%=build/%)
 
-build/%.o:              cpu/%.c $(HEADERS) $(GEN_HP)
+build/%.o:              cpu/%.c $(HEADERS) $(GEN_HP) | build
                                 $(GCC) $(FLAGS_CPU) -c -o $@ $<
 
 EMU_C :=                main.c cpu.c vid.c fpu.c tim.c lcd.c ser.c mid.c fdd.c snd.c \
-                                led.c kbd.c sdl.c gdb.c
+                                led.c kbd.c sdl.c
 EMU_O :=                $(EMU_C:.c=.o)
 EMU_OP :=               $(EMU_O:%=build/%)
 
-build/%.o:              emu/%.c $(HEADERS)
+build/%.o:              emu/%.c $(HEADERS) | build
                                 $(GCC) $(FLAGS_EMU) -c -o $@ $<
 
-buchla$(EXT):   $(CPU_OP) $(GEN_OP)     $(EMU_OP)
-                                $(GCC) $(FLAGS_LNK) -o buchla$(EXT) \
+buchla:                 $(CPU_OP) $(GEN_OP)     $(EMU_OP)
+                                $(GCC) $(FLAGS_LNK) -o buchla \
                                 $(CPU_OP) $(GEN_OP) $(EMU_OP) \
                                 $(LIBS)
 
-mkdisk$(EXT):   emu/mkdisk.c
-                                $(GCC) $(FLAGS_AUX) -o mkdisk$(EXT) emu/mkdisk.c
+mkdisk:                 emu/mkdisk.c
+                                $(GCC) $(FLAGS_AUX) -o mkdisk emu/mkdisk.c
 
-buchla.disk:    mkdisk$(EXT) midas.abs
-                                ./mkdisk$(EXT)
+buchla.disk:    mkdisk midas.abs
+                                ./mkdisk
 
-run:                    buchla$(EXT) buchla.disk
-                                ./buchla$(EXT) ${EMU_OPTS}
+run:                    buchla buchla.disk
+                                ./buchla
 
-val:                    buchla$(EXT) buchla.disk
+val:                    buchla buchla.disk
                                 valgrind --leak-resolution=high --track-fds=yes --leak-check=full \
-                                --show-reachable=yes --suppressions=misc/buchla.supp \
-                                ./buchla$(EXT) ${EMU_OPTS}
+                                --show-reachable=yes --suppressions=misc/buchla.supp ./buchla
 
 clean:
-                                rm -f build/gen build/*.c build/*.h build/*.o
-                                rm -f buchla$(EXT)
-                                rm -f mkdisk$(EXT)
+                                rm -rf build
+                                rm -f buchla
+                                rm -f mkdisk
                                 rm -f buchla.disk