Changes in Makefile [59ea67d:3231e25] in buchla-emu

File:

• Makefile (modified) (8 diffs)

Makefile

@@ -3 +3 @@
 ifndef WIN
 GCC :=                  gcc
+GPP :=                  g++
 SDL2 :=                 /opt/sdl2
+RTMIDI :=               /opt/rtmidi
 EXT :=
 else
 GCC :=                  x86_64-w64-mingw32-gcc
+GPP :=                  x86_64-w64-mingw32-g++
 SDL2 :=                 /opt/sdl2-win
+RTMIDI :=               /opt/rtmidi-win
 EXT :=                  .exe
 endif
@@ -13 +17 @@
 SDL2_INC :=             $(SDL2)/include
 SDL2_LIB :=             $(SDL2)/lib
+
+RTMIDI_INC :=   $(RTMIDI)/include
+RTMIDI_LIB :=   $(RTMIDI)/lib
 
 FLAGS :=                -std=c99 -O2 -gdwarf-4
@@ -23 +30 @@
                                 -Wpedantic -Wconversion -Wsign-conversion -Wshadow \
                                 -Wstrict-prototypes -Wmissing-declarations -Wredundant-decls \
-                                -I cpu -I emu -I build -I $(SDL2_INC)
+                                -I cpu -I emu -I build -I $(SDL2_INC) -I $(RTMIDI_INC)
 
 FLAGS_AUX :=    $(FLAGS) -Wall -Wextra \
@@ -37 +44 @@
                                 $(SDL2_LIB)/libSDL2_ttf.a \
                                 $(SDL2_LIB)/libfreetype.a \
-                                -ldl -lm
+                                $(RTMIDI_LIB)/librtmidi.a \
+                                -ldl -lm -lasound
 endif
 
@@ -47 +55 @@
                                 $(SDL2_LIB)/libSDL2_ttf.a \
                                 $(SDL2_LIB)/libfreetype.a \
+                                $(RTMIDI_LIB)/librtmidi.a \
                                 -framework AppKit \
                                 -framework AudioToolbox \
                                 -framework Carbon \
+                                -framework CoreMIDI \
                                 -framework CoreAudio \
                                 -framework CoreFoundation \
@@ -60 +70 @@
 else
 FLAGS_EMU +=    -D EMU_WIN
-FLAGS_LNK :=    $(FLAGS) -Wall -Wextra
+FLAGS_LNK :=    $(FLAGS) -Wall -Wextra -static -static-libstdc++
 LIBS :=                 -l mingw32 \
                                 $(SDL2_LIB)/libSDL2.a \
@@ -67 +77 @@
                                 $(SDL2_LIB)/libSDL2_ttf.a \
                                 $(SDL2_LIB)/libfreetype.a \
+                                $(RTMIDI_LIB)/librtmidi.a \
                                 -l gdi32 \
                                 -l imm32 \
@@ -116 +127 @@
 
 buchla$(EXT):   $(CPU_OP) $(GEN_OP)     $(EMU_OP)
-                                $(GCC) $(FLAGS_LNK) -o buchla$(EXT) \
+                                $(GPP) $(FLAGS_LNK) -o buchla$(EXT) \
                                 $(CPU_OP) $(GEN_OP) $(EMU_OP) \
                                 $(LIBS)