Changes in Makefile [3231e25:59ea67d] 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
@@ -17 +13 @@
 SDL2_INC :=             $(SDL2)/include
 SDL2_LIB :=             $(SDL2)/lib
-
-RTMIDI_INC :=   $(RTMIDI)/include
-RTMIDI_LIB :=   $(RTMIDI)/lib
 
 FLAGS :=                -std=c99 -O2 -gdwarf-4
@@ -30 +23 @@
                                 -Wpedantic -Wconversion -Wsign-conversion -Wshadow \
                                 -Wstrict-prototypes -Wmissing-declarations -Wredundant-decls \
-                                -I cpu -I emu -I build -I $(SDL2_INC) -I $(RTMIDI_INC)
+                                -I cpu -I emu -I build -I $(SDL2_INC)
 
 FLAGS_AUX :=    $(FLAGS) -Wall -Wextra \
@@ -44 +37 @@
                                 $(SDL2_LIB)/libSDL2_ttf.a \
                                 $(SDL2_LIB)/libfreetype.a \
-                                $(RTMIDI_LIB)/librtmidi.a \
-                                -ldl -lm -lasound
+                                -ldl -lm
 endif
 
@@ -55 +47 @@
                                 $(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 \
@@ -70 +60 @@
 else
 FLAGS_EMU +=    -D EMU_WIN
-FLAGS_LNK :=    $(FLAGS) -Wall -Wextra -static -static-libstdc++
+FLAGS_LNK :=    $(FLAGS) -Wall -Wextra
 LIBS :=                 -l mingw32 \
                                 $(SDL2_LIB)/libSDL2.a \
@@ -77 +67 @@
                                 $(SDL2_LIB)/libSDL2_ttf.a \
                                 $(SDL2_LIB)/libfreetype.a \
-                                $(RTMIDI_LIB)/librtmidi.a \
                                 -l gdi32 \
                                 -l imm32 \
@@ -127 +116 @@
 
 buchla$(EXT):   $(CPU_OP) $(GEN_OP)     $(EMU_OP)
-                                $(GPP) $(FLAGS_LNK) -o buchla$(EXT) \
+                                $(GCC) $(FLAGS_LNK) -o buchla$(EXT) \
                                 $(CPU_OP) $(GEN_OP) $(EMU_OP) \
                                 $(LIBS)