Skip to content

Instantly share code, notes, and snippets.

@codebrainz
Created May 12, 2011 04:09
Show Gist options
  • Save codebrainz/967911 to your computer and use it in GitHub Desktop.
Save codebrainz/967911 to your computer and use it in GitHub Desktop.
changeset: 2603:b97cf584311b
tag: tip
parent: 2592:247816f97bea
user: Matthew Brush <matthewbrush@gmail.com>
date: Wed May 11 21:04:14 2011 -0700
summary: Add include to makefiles, remove trailing spaces after backslash.
diff -r 247816f97bea -r b97cf584311b src/Makefile.am
--- a/src/Makefile.am Wed May 11 22:48:19 2011 -0400
+++ b/src/Makefile.am Wed May 11 21:04:14 2011 -0700
@@ -390,9 +390,9 @@
../extern/lua-5.1/src/lundump.h ../extern/lua-5.1/src/lvm.h ../extern/lua-5.1/src/lzio.h
jsoncpp = ../extern/jsoncpp/src/lib_json/json_reader.cpp \
-../extern/jsoncpp/src/lib_json/json_value.cpp \
-../extern/jsoncpp/src/lib_json/json_writer.cpp \
-../extern/jsoncpp/include/json/autolink.h \
+../extern/jsoncpp/src/lib_json/json_value.cpp \
+../extern/jsoncpp/src/lib_json/json_writer.cpp \
+../extern/jsoncpp/include/json/autolink.h \
../extern/jsoncpp/include/json/config.h \
../extern/jsoncpp/include/json/features.h \
../extern/jsoncpp/include/json/forwards.h \
@@ -603,6 +603,8 @@
noinst_LIBRARIES += libtomcrypt.a
+main_CPPFLAGS = -I$(top_srcdir)/extern/jsoncpp/include
+
main_SOURCES = $(PNG) \
$(Screens) \
$(DataStructures) \
@@ -622,6 +624,8 @@
libtomcrypt.a libtommath.a
nodist_stepmania_SOURCES = ver.cpp
+
+stepmania_CPPFLAGS = -I$(top_srcdir)/extern/jsoncpp/include
stepmania_SOURCES = $(main_SOURCES)
stepmania_LDADD = $(main_LDADD)
diff -r 247816f97bea -r b97cf584311b src/NotesLoaderJson.cpp
--- a/src/NotesLoaderJson.cpp Wed May 11 22:48:19 2011 -0400
+++ b/src/NotesLoaderJson.cpp Wed May 11 21:04:14 2011 -0700
@@ -1,6 +1,6 @@
#include "global.h"
#include "NotesLoaderJson.h"
-#include "Json/Value.h"
+#include "json/value.h"
#include "TimingData.h"
#include "RageUtil.h"
#include "JsonUtil.h"
diff -r 247816f97bea -r b97cf584311b src/NotesWriterJson.cpp
--- a/src/NotesWriterJson.cpp Wed May 11 22:48:19 2011 -0400
+++ b/src/NotesWriterJson.cpp Wed May 11 21:04:14 2011 -0700
@@ -1,7 +1,7 @@
#include "global.h"
#include "NotesWriterJson.h"
#include "TimingData.h"
-#include "Json/Value.h"
+#include "json/value.h"
#include "JsonUtil.h"
#include "Song.h"
#include "BackgroundUtil.h"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment