summaryrefslogtreecommitdiff
path: root/progs/perf
diff options
context:
space:
mode:
Diffstat (limited to 'progs/perf')
-rw-r--r--progs/perf/.gitignore10
-rw-r--r--progs/perf/Makefile2
-rw-r--r--progs/perf/common.c4
3 files changed, 15 insertions, 1 deletions
diff --git a/progs/perf/.gitignore b/progs/perf/.gitignore
new file mode 100644
index 0000000000..7e8fe616cd
--- /dev/null
+++ b/progs/perf/.gitignore
@@ -0,0 +1,10 @@
+copytex
+drawoverhead
+fbobind
+fill
+genmipmap
+readpixels
+swapbuffers
+teximage
+vbo
+vertexrate
diff --git a/progs/perf/Makefile b/progs/perf/Makefile
index 066eb8608e..f7b965542e 100644
--- a/progs/perf/Makefile
+++ b/progs/perf/Makefile
@@ -10,7 +10,7 @@ LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) \
# using : to avoid APP_CC pointing to CC loop
CC := $(APP_CC)
-CFLAGS += -I$(INCDIR)
+CFLAGS := -I$(INCDIR) $(CFLAGS)
LDLIBS = $(LIBS)
PROG_SOURCES = \
diff --git a/progs/perf/common.c b/progs/perf/common.c
index 722f4b7b45..b6489ef918 100644
--- a/progs/perf/common.c
+++ b/progs/perf/common.c
@@ -30,6 +30,10 @@
#include <stdlib.h>
#include <stdarg.h>
+#if defined(_MSC_VER)
+#define snprintf _snprintf
+#endif
+
/* Need to add a fflush windows console with mingw, otherwise nothing
* shows up until program exit. May want to add logging here.