diff mbox

[Branch,~glmark2-dev/glmark2/trunk] Rev 49: Add some informational files.

Message ID 20110721123633.17019.98558.launchpad@loganberry.canonical.com
State Accepted
Headers show

Commit Message

Alexandros Frantzis July 21, 2011, 12:36 p.m. UTC 
------------------------------------------------------------
revno: 49
committer: Alexandros Frantzis <alf82@freemail.gr>
timestamp: Mon 2010-07-12 19:17:07 +0300
message:
  Add some informational files.
  Remove Makefile.
removed:
  Makefile
added:
  INSTALL
  README


--
lp:glmark2
https://code.launchpad.net/~glmark2-dev/glmark2/trunk

You are subscribed to branch lp:glmark2.
To unsubscribe from this branch go to https://code.launchpad.net/~glmark2-dev/glmark2/trunk/+edit-subscription
diff mbox

Patch

=== added file 'INSTALL'
--- INSTALL	1970-01-01 00:00:00 +0000
+++ INSTALL	2010-07-12 16:17:07 +0000
@@ -0,0 +1,13 @@ 
+glmark2 uses the WAF build system.
+
+To configure glmark2 use:
+
+$ ./waf configure [--gl --glesv2 --data-path=DATA_PATH --prefix=PREFIX]
+
+To build use:
+
+$ ./waf
+
+To install use:
+
+$ ./waf install --destdir=DESTDIR

=== removed file 'Makefile'
--- Makefile	2010-07-08 10:29:59 +0000
+++ Makefile	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@ 
-INSTALL = install -D
-INSTALL_DATA = $(INSTALL) -m644
-
-PKG_DEPS = sdl gl glu
-PKG_LIBS = $(shell pkg-config --libs $(PKG_DEPS))
-PKG_CFLAGS = $(shell pkg-config --cflags $(PKG_DEPS))
-
-ALL_CFLAGS = -Wall -g -O2 $(CFLAGS) $(PKG_CFLAGS) 
-ALL_DEFINES = -DGLMARK_DATA_PATH=\"$(GLMARK_DATA_PATH)\" $(DEFINES)
-
-SRCS = $(wildcard *.cpp)
-OBJS = $(SRCS:.cpp=.o)
-
-.cpp.o:
-	$(CXX) $(ALL_CFLAGS) $(ALL_DEFINES) -c $< -o $@
-
-glmark: $(OBJS)
-	$(CXX) -o glmark $(LDFLAGS) $(PKG_LIBS) $(OBJS)
-
-install: glmark
-	$(INSTALL) glmark $(DESTDIR)/usr/bin/glmark
-
-clean:
-	-rm glmark $(OBJS)

=== added file 'README'
--- README	1970-01-01 00:00:00 +0000
+++ README	2010-07-12 16:17:07 +0000
@@ -0,0 +1,16 @@ 
+glmark2 is a port of the glmark OpenGL benchmark to OpenGL 2.0 and ES 2.0.
+
+To build glmark2 you need:
+
+ * libSDL 1.2
+
+and for OpenGL 2.0:
+
+ * libGL
+
+or for OpenGL ES 2.0:
+
+ * libEGL
+ * libGLESv2
+
+Read the INSTALL files for installation instructions,