summaryrefslogtreecommitdiff
path: root/tools/mid2agb
diff options
context:
space:
mode:
authorgolem galvanize <golemgalvanize@github.com>2018-12-07 14:47:20 -0500
committergolem galvanize <golemgalvanize@github.com>2018-12-07 14:47:20 -0500
commit53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch)
tree07e69072826569c7c31230cb4671a5d321e5f972 /tools/mid2agb
parent18124740a4d75ae95948f95ca6f63c320e51501c (diff)
parent6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff)
fixing merge conflicts
Diffstat (limited to 'tools/mid2agb')
-rw-r--r--tools/mid2agb/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/mid2agb/Makefile b/tools/mid2agb/Makefile
index 4dc2f123f..77f96db5a 100644
--- a/tools/mid2agb/Makefile
+++ b/tools/mid2agb/Makefile
@@ -1,6 +1,6 @@
CXX := g++
-CXXFLAGS := -std=c++11 -O2 -s -Wall -Wno-switch -Werror
+CXXFLAGS := -std=c++11 -O2 -Wall -Wno-switch -Werror
SRCS := agb.cpp error.cpp main.cpp midi.cpp tables.cpp