Index: endianlove.h
===================================================================
--- endianlove.h	(revision 1739)
+++ endianlove.h	(working copy)
@@ -24,7 +24,7 @@
 
 #ifndef HAVE_STDINT
 
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+/* #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 # define HAVE_STDINT 1
 #else
 # if defined(__GNUC_PREREQ) && __GNUC_PREREQ(4,0)
@@ -32,7 +32,7 @@
 # else
 #  define HAVE_STDINT 0
 # endif
-#endif
+#endif */
 
 #endif
 
Index: physics.h
===================================================================
--- physics.h	(revision 1739)
+++ physics.h	(working copy)
@@ -25,6 +25,9 @@
 #include <algorithm> // swap
 #include "openc2e.h" // FRIEND_SERIALIZE
 
+#define Point MyPoint
+#define Line MyLine
+
 struct Point {
 	float x, y;
 	Point() { x = y = 0; }
Index: qtgui/qtopenc2e.cpp
===================================================================
--- qtgui/qtopenc2e.cpp	(revision 1739)
+++ qtgui/qtopenc2e.cpp	(working copy)
@@ -19,7 +19,7 @@
 #include <QtGui>
 #include "openc2eview.h"
 #include "Engine.h"
-#include "OpenALBackend.h"
+#include "AudioBackend.h"
 #include "MetaRoom.h"
 
 #include "AgentInjector.h"
Index: main.cpp
===================================================================
--- main.cpp	(revision 1739)
+++ main.cpp	(working copy)
@@ -31,9 +31,10 @@
 
 #ifdef _WIN32
 #include <windows.h>
-#undef main
 #endif
 
+#undef main
+
 extern "C" int main(int argc, char *argv[]) {
 	try {
 		std::cout << "openc2e (development build), built " __DATE__ " " __TIME__ "\nCopyright (c) 2004-2008 Alyssa Milburn and others\n\n";
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 1739)
+++ CMakeLists.txt	(working copy)
@@ -113,6 +113,7 @@
 	World.cpp
 	main.cpp
 	util.cpp
+        SDL_gfxPrimitives.c
 )
 
 SET(OPENC2E_SDL
@@ -152,7 +153,6 @@
 FIND_PACKAGE(SDL REQUIRED)
 #FIND_PACKAGE(SDL_mixer REQUIRED)
 FIND_PACKAGE(SDL_net REQUIRED)
-FIND_PACKAGE(SDL_gfx REQUIRED)
 IF(OPENC2E_USE_OPENAL MATCHES "^(YES|AUTO)$")
 	FIND_PACKAGE(OpenAL)
 ELSE(OPENC2E_USE_OPENAL MATCHES "^(YES|AUTO)$")
@@ -214,7 +214,6 @@
 	${SDL_LIBRARY}
 #	${SDLMIXER_LIBRARY} 
 	${SDLNET_LIBRARY}
-	${SDLGFX_LIBRARY}
 	${OPENAL_LIBRARY}
 	${ALUT_LIBRARY}
 	${FRONTEND_LIBS}
@@ -233,7 +232,6 @@
 	${SDL_INCLUDE_DIR}
 #	${SDLMIXER_INCLUDE_DIR}
 	${SDLNET_INCLUDE_DIR}
-	${SDLGFX_INCLUDE_DIR}
 	${OPENAL_INCLUDE_DIR}
 	${ALUT_INCLUDE_DIR}
 	${Boost_INCLUDE_DIR}