Commits

alain_linden committed ef6ce33

linux build and packaging working.

Comments (0)

Files changed (3)

 <map>
     <key>installables</key>
     <map>
+      <key>GL</key>
+      <map>
+        <key>license</key>
+        <string>GL</string>
+        <key>license_file</key>
+        <string>LICENSES/GL.txt</string>
+        <key>name</key>
+        <string>GL</string>
+        <key>platforms</key>
+        <map>
+          <key>linux</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>d85d88088360aee5b67105ad93b5ad16</string>
+              <key>url</key>
+              <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-linux-20100929.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>linux</string>
+          </map>
+        </map>
+      </map>
       <key>freeglut</key>
       <map>
         <key>license</key>
           <key>name</key>
           <string>darwin</string>
         </map>
+        <key>linux</key>
+        <map>
+          <key>configurations</key>
+          <map>
+            <key>Release</key>
+            <map>
+              <key>build</key>
+              <map>
+              </map>
+              <key>default</key>
+              <string>True</string>
+              <key>name</key>
+              <string>Release</string>
+            </map>
+          </map>
+          <key>manifest</key>
+          <array>
+            <string>lib/release/libglui.a</string>
+          </array>
+          <key>name</key>
+          <string>linux</string>
+        </map>
         <key>windows</key>
         <map>
           <key>configurations</key>
         mkdir -p "$stage/include"
         cp src/include/GL/glui.h "$stage/include"
     ;;
+    "linux")
+        mkdir -p "$stage/packages/include/GL"
+        cp "$stage/packages/include/glut.h" "$stage/packages/include/GL"
+        make -C src linux
+        mkdir -p "$stage/lib/release"
+        cp src/lib/libglui.a "$stage/lib/release"
+        mkdir -p "$stage/include"
+        cp src/include/GL/glui.h "$stage/include"
+    ;;
     "windows")
         build_sln src/msvc/glui.sln "Debug|Win32" "_glui library"
         build_sln src/msvc/glui.sln "Release|Win32" "_glui library"

glui-2.36/src/makefile

 UNAME = $(shell uname)
 
 ifeq ($(UNAME), Linux)
-CXX       = g++
-CPPFLAGS += $(OPTS) -Wall -pedantic
+CXX       = g++-4.1
+CPPFLAGS += $(OPTS) -Wall -pedantic -m32
 endif
 
 #######################################
 darwin: setup $(GLUI_OBJS)
 	libtool -static -o $(GLUI_LIB) $(GLUI_OBJS)
 
+linux: setup $(GLUI_LIB)
+
 setup:
 	mkdir -p bin
 	mkdir -p lib