Skip to content

Instantly share code, notes, and snippets.

@PilzAdam

PilzAdam/gist:4578183

Created January 20, 2013 12:11
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save PilzAdam/4578183 to your computer and use it in GitHub Desktop.
Save PilzAdam/4578183 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.diff
--- minetest_10-10-24_16-33-41_wonderful/Makefile 2013-01-19 12:51:42.000000000 +0100
+++ minetest_10-10-24_16-33-41_build/Makefile 2013-01-20 12:38:28.361228250 +0100
@@ -6,10 +6,10 @@
SOURCES = $(addprefix src/, $(SOURCE_FILES))
OBJECTS = $(SOURCES:.cpp=.o)
-IRRLICHTPATH = ../irrlicht/irrlicht-1.7.1
-JTHREADPATH = ../jthread/jthread-1.2.1
+IRRLICHTPATH = /usr/include/irrlicht
+JTHREADPATH = jthread
-CPPFLAGS = -I$(IRRLICHTPATH)/include -I/usr/X11R6/include -I$(JTHREADPATH)/src
+CPPFLAGS = -I$(IRRLICHTPATH) -I/usr/X11R6/include -I$(JTHREADPATH)
#CXXFLAGS = -O3 -ffast-math -Wall
#CXXFLAGS = -O3 --fast-math -Wall -g
@@ -26,7 +26,7 @@
# Target specific settings
-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L$(IRRLICHTPATH)/lib/Linux -L$(JTHREADPATH)/src/.libs -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljthread
+all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L$(IRRLICHTPATH)/lib/Linux -L$(JTHREADPATH) -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljthread
all_linux clean_linux: SYSTEM=Linux
all_win32: LDFLAGS = -L$(IRRLICHTPATH)/lib/Win32-gcc -L$(JTHREADPATH)/Debug -lIrrlicht -lopengl32 -lm -ljthread
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment