Skip to content

Instantly share code, notes, and snippets.

@hans
Last active November 3, 2017 14:26
Show Gist options
  • Save hans/1fd410c0f8fb8bc41183835770a05d76 to your computer and use it in GitHub Desktop.
Save hans/1fd410c0f8fb8bc41183835770a05d76 to your computer and use it in GitHub Desktop.
diff -ruw ./gaps/Makefile ../../SUNCGtoolbox-master/gaps/Makefile
--- ./gaps/Makefile 2017-10-01 23:23:17.000000000 +0000
+++ ../../SUNCGtoolbox-master/gaps/Makefile 2017-11-03 14:25:28.760111809 +0000
@@ -31,7 +31,7 @@
target:
cd pkgs; $(MAKE) $(TARGET)
cd apps; $(MAKE) $(TARGET)
- cd vc; $(MAKE) $(TARGET)
+ # cd vc; $(MAKE) $(TARGET)
# cd docs; $(MAKE) $(TARGET)
diff -ruw ./gaps/apps/scn2cam/Makefile ../../SUNCGtoolbox-master/gaps/apps/scn2cam/Makefile
--- ./gaps/apps/scn2cam/Makefile 2017-10-01 23:23:17.000000000 +0000
+++ ../../SUNCGtoolbox-master/gaps/apps/scn2cam/Makefile 2017-11-03 13:29:13.260003921 +0000
@@ -11,6 +11,7 @@
#
PKG_LIBS=-lR3Graphics -lR3Shapes -lR2Shapes -lRNBasics -ljpeg -lpng
+PKG_LIBS_EXT=-lOSMesa
#
diff -ruw ./gaps/apps/scn2img/Makefile ../../SUNCGtoolbox-master/gaps/apps/scn2img/Makefile
--- ./gaps/apps/scn2img/Makefile 2017-10-01 23:23:17.000000000 +0000
+++ ../../SUNCGtoolbox-master/gaps/apps/scn2img/Makefile 2017-11-03 13:29:35.192004622 +0000
@@ -11,6 +11,7 @@
#
PKG_LIBS=-lR3Graphics -lR3Shapes -lR2Shapes -lRNBasics -ljpeg -lpng
+PKG_LIBS_EXT=-lOSMesa
#
diff -ruw ./gaps/makefiles/Makefile.apps ../../SUNCGtoolbox-master/gaps/makefiles/Makefile.apps
--- ./gaps/makefiles/Makefile.apps 2017-10-01 23:23:17.000000000 +0000
+++ ../../SUNCGtoolbox-master/gaps/makefiles/Makefile.apps 2017-11-03 13:28:56.904003398 +0000
@@ -58,7 +58,7 @@
#OPENGL_LIBS=-lglut -lGLU -lGL -lX11 -lm
OPENGL_LIBS=-lfglut -lGLU -lGL -lX11 -lm
endif
-LIBS=$(PKG_LIBS) $(USER_LIBS) $(OPENGL_LIBS)
+LIBS=$(PKG_LIBS) $(PKG_LIBS_EXT) $(USER_LIBS) $(OPENGL_LIBS)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment