--- polyworld-1.0/./app/PWApp.cp	2005-08-15 01:21:23.000000000 -0400
+++ polyworld-strick/./app/PWApp.cp	2005-10-26 23:51:19.000000000 -0400
@@ -83,7 +83,7 @@
 //---------------------------------------------------------------------------
 // TPWApp::TPWApp
 //---------------------------------------------------------------------------
-TPWApp::TPWApp(int argc, char** argv) : QApplication(argc, argv)
+TPWApp::TPWApp(int& argc, char** argv) : QApplication(argc, argv)
 {
 }
 
--- polyworld-1.0/./app/PWApp.h	2005-07-26 22:41:14.000000000 -0400
+++ polyworld-strick/./app/PWApp.h	2005-10-26 23:05:24.000000000 -0400
@@ -12,7 +12,7 @@
 Q_OBJECT
 
 public:
-	TPWApp(int argc, char** argv);
+	TPWApp(int& argc, char** argv);
 };
 
 #endif
--- polyworld-1.0/./app/Simulation.cp	2005-10-17 19:44:48.000000000 -0400
+++ polyworld-strick/./app/Simulation.cp	2005-10-26 17:11:54.000000000 -0400
@@ -16,7 +16,7 @@
 
 // qt
 #include <qapplication.h>
-#include <QDesktopWidget.h>
+#include <qdesktopwidget.h>
 
 // Local
 #include "barrier.h"
--- polyworld-1.0/./app/Simulation.h	2005-10-17 19:44:48.000000000 -0400
+++ polyworld-strick/./app/Simulation.h	2005-10-26 17:14:08.000000000 -0400
@@ -1,11 +1,15 @@
 #ifndef SIMULATION_H
 #define SIMULATION_H
 
+#ifdef linux
+#include <errno.h>
+#endif
+
 // qt
 #include <qobject.h>
 #include <qapplication.h>
 #include <qmainwindow.h>
-#include <QMenu.h>
+#include <qmenu.h>
 
 // Local
 #include "barrier.h"
--- polyworld-1.0/./utils/gdlink.h	2005-08-17 04:41:40.000000000 -0400
+++ polyworld-strick/./utils/gdlink.h	2005-10-25 16:33:37.000000000 -0400
@@ -167,7 +167,7 @@
 	void remove(const TTYPE a);
 	
 	/* remove the link corresponding to item, without checking to see if it is actually in the list! */		
-	void gdlist<TTYPE>::removeFastUnsafe(gdlink<TTYPE> *item);
+	void removeFastUnsafe(gdlink<TTYPE> *item);
 
 	/* unlink & return the entry corresponding to a */	
 	gdlink<TTYPE>* unlink(const TTYPE a);			
@@ -711,4 +711,4 @@
 	std::cerr << "attempt to remove non-existent TTYPE node\n";
 }
 
-#endif DLINK_H
+#endif /*DLINK_H*/
--- polyworld-1.0/./utils/misc.cp	2005-09-06 02:27:11.000000000 -0400
+++ polyworld-strick/./utils/misc.cp	2005-10-26 21:39:14.000000000 -0400
@@ -10,7 +10,11 @@
 #include "misc.h"
 
 // System
+
+#ifndef linux      /* how does one say #ifdef MAC_OSX ? */
 #include <mach/mach_time.h>
+#endif
+
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -118,6 +122,15 @@
 
 double hirestime( void )
 {
+#ifdef linux
+
+	struct timeval tv;
+	gettimeofday( &tv, NULL );
+
+	return (double)tv.tv_sec + (double)tv.tv_usec/1000000.0;
+
+#else /* this seems to be Apple-specific, referencing "mach"... */
+
     static uint32_t num = 0;
     static uint32_t denom = 0;
     uint64_t now;
@@ -134,6 +147,8 @@
     }
     now = mach_absolute_time();
     return (double)(now * (double)num / denom / NSEC_PER_SEC);
+
+#endif
 }
 
 int SetMaximumFiles( long filecount )
--- polyworld-1.0/./utils/misc.h	2005-10-16 07:14:14.000000000 -0400
+++ polyworld-strick/./utils/misc.h	2005-10-26 17:15:23.000000000 -0400
@@ -27,8 +27,6 @@
 #define sopar <<" ("<<
 #define cpars <<") "<<
 
-#define forever for (;;)
-
 #define nint(a) ((long)((a)+(((a)<0.0)?-0.499999999:0.499999999)))
 
 #define interp(x,ylo,yhi) ((ylo)+(x)*((yhi)-(ylo)))
@@ -87,7 +85,7 @@
 
 #ifndef PI
 #define PI M_PI
-#endif PI
+#endif /*PI*/
 
 #define TWOPI 6.28318530717059647602
 #define HPI M_PI_2
--- polyworld-1.0/polyworld.pro	2005-10-20 03:08:03.000000000 -0400
+++ polyworld-strick/polyworld.pro	2005-10-27 00:34:18.000000000 -0400
@@ -34,7 +34,7 @@
 				utils/error.cp \
 				utils/indexlist.cp \
 				utils/misc.cp \
-				utils/PwMovietools.cp
+				utils/PwMovieTools.cp
 																			  	
 TARGET		= 	Polyworld
 
@@ -47,9 +47,13 @@
 				utils \
 				$(QT_INCLUDE_DIR) \
 				$(QT_INCLUDE_DIR)/QtOpenGL \
-				/System/Library/Frameworks/AGL.framework/Versions/A/Headers/
-								
+				/usr/include/GL/ \
+				/usr/new/include/QtGui \
+				/usr/new/include/QtCore \
+				/usr/new/include/Qt/ \
+				/usr/new/include
+
 QMAKE_CFLAGS_DEBUG += -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC
 
-LIBS	+=	-L$(QTDIR)/lib/ -lQtOpenGL -framework OpenGL -framework AGL
+LIBS	+=	-L$(QTDIR)/lib/ -lQtOpenGL