Trunk sync r9300 (last was actually synced with 9284, skipped 9296 since we don't have an Xcode4 project in Antipodes yet).

code/ai/aigoals.cpp

@@ -1479,13 +1479,17 @@ int ai_mission_goal_achievable( int objnum, ai_goal *aigp )
 			// checking departure and destroyed.  In multiplayer, since ships can respawn,
 			// they get log entries for being destroyed even though they have respawned.
 			sindex = ship_name_lookup( aigp->target_name );
-			if ( sindex == -1 ) {
+			if ( sindex < 0 ) {
 				status = mission_log_get_time( LOG_SHIP_DEPARTED, aigp->target_name, NULL, NULL);
 				if ( !status ) {
 					status = mission_log_get_time( LOG_SHIP_DESTROYED, aigp->target_name, NULL, NULL);
-					if ( status )
-						return_val = AI_GOAL_NOT_ACHIEVABLE;
+					if ( !status ) {
+						status = mission_log_get_time( LOG_SELF_DESTRUCTED, aigp->target_name, NULL, NULL);
+					}
 				}
+
+				if ( status )
+					return_val = AI_GOAL_NOT_ACHIEVABLE;
 			} else {
 				status = 0;
 			}

code/camera/camera.cpp

@@ -977,4 +977,4 @@ void subtitles_do_frame_post_shaded(float frametime)
 		if ( sub->is_post_shaded( ) )
 			sub->do_frame(frametime);
 	}
-}
+}

code/exceptionhandler/exceptionhandler.cpp

@@ -509,4 +509,4 @@ int __cdecl RecordExceptionInfo(PEXCEPTION_POINTERS data, const char *Message)
 }
 
 #endif // _WIN32
-#endif
+#endif

code/exceptionhandler/exceptionhandler.h

@@ -69,4 +69,4 @@ int __cdecl RecordExceptionInfo(PEXCEPTION_POINTERS data, const char *Message);
 
 
 #endif // __EXCEPTION_HANDLER_H
-#endif
+#endif

code/external_dll/trackirglobal.cpp

@@ -1,4 +1,4 @@
 #include "trackirpublic.h"
 
 /* The TrackIR Interface */
-TrackIRDLL gTirDll_TrackIR;
+TrackIRDLL gTirDll_TrackIR;

code/fred2/fred.rc

@@ -404,8 +404,6 @@ BEGIN
         MENUITEM "Copy\tCtrl+C",                ID_EDIT_COPY
         MENUITEM "Paste\tCtrl+V",               ID_EDIT_PASTE, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "Add Paste",                   ID_EDIT_PASTE_SPECIAL, GRAYED
-        MENUITEM SEPARATOR
         POPUP "Add Operator"
         BEGIN
             MENUITEM "placeholder",                 ID_PLACEHOLDER, GRAYED
@@ -417,6 +415,8 @@ BEGIN
             MENUITEM SEPARATOR
         END
         MENUITEM SEPARATOR
+        MENUITEM "Add Paste",                   ID_EDIT_PASTE_SPECIAL, GRAYED
+        MENUITEM SEPARATOR
         POPUP "Insert Operator"
         BEGIN
             MENUITEM "placeholder",                 ID_PLACEHOLDER, GRAYED

code/globalincs/compatibility.h

@@ -6,4 +6,4 @@ void random_shuffle(int *first, int *last);
 template <class RandomNumberGenerator>
 void random_shuffle(int *first, int *last, RandomNumberGenerator& custom_rand);
 
-#endif
+#endif

code/globalincs/def_files.cpp

@@ -156,6 +156,9 @@ $Default ship select effect: FS2										\n\
 ;; used when no ani is specified or weapon_select_3d is active			\n\
 $Default weapon select effect: FS2										\n\
 																		\n\
+;; Enable weapons to inherit their parent object's collision group setting \n\
+$Weapons inherit parent collision group: NO								\n\
+																		\n\
 #END																	\n\
 ";
 

code/globalincs/mspdb_callstack.h

@@ -73,4 +73,4 @@ extern DWORD WINAPI SCP_mspdbcs_DumpStackThread( LPVOID pv );
 extern void SCP_mspdbcs_Initialise( );
 extern void SCP_mspdbcs_Cleanup( );
 
-#endif // _MSPDB_CALLSTACK_H_INCLUDED_
+#endif // _MSPDB_CALLSTACK_H_INCLUDED_

code/globalincs/safe_strings_test.cpp

@@ -252,4 +252,4 @@ int main(int argc, char* argv[])
 	return 0;
 }
 
-#endif
+#endif

code/globalincs/vmallocator.h

@@ -146,4 +146,4 @@ bool operator!=(const SCP_vm_allocator<T1>&, const SCP_vm_allocator<T2>&) throw(
 
 #endif
 
-#endif // _VMALLOCATOR_H_INCLUDED_
+#endif // _VMALLOCATOR_H_INCLUDED_

code/graphics/grbatch.cpp

@@ -949,4 +949,4 @@ int batch_get_size()
 	}
 
 	return n_to_render * 3;
-}
+}

code/hud/hudbrackets.cpp

@@ -1124,4 +1124,4 @@ void HudGaugeBrackets::renderBoundingBracketsSubobject()
 			// reset the scale to normal
 			gr_reset_screen_scale();
 		}
-}
+}

code/hud/hudshield.cpp

@@ -851,10 +851,11 @@ void HudGaugeShield::showShields(object *objp, int mode)
 						y_val += 3;
 						for(j = 0; j < 112; j++)
 							renderGradientLine(sx + j, mid_val, sx + j, y_val);
-
+						break;
 					//Whoops?
 					default:
-						Warning(LOCATION, "Invalid shield quadrant %d specified!", i);
+						nprintf(("HUD", "Invalid shield quadrant %d specified!\n", i));
+						break;
 				}
 			}
 		}

code/hud/hudsquadmsg.cpp

@@ -2744,4 +2744,4 @@ void HudGaugeSquadMessage::pageIn()
 	for (int i = 0; i < NUM_MBOX_FRAMES; i++ ) {
 		bm_page_in_aabitmap( Mbox_gauge[i].first_frame, Mbox_gauge[i].num_frames );
 	}
-}
+}

code/hud/hudtarget.cpp

@@ -7197,4 +7197,4 @@ void HudGaugeHardpoints::render(float frametime)
 		g3_end_frame();
 
 	hud_save_restore_camera_data(0);
-}
+}

code/io/keycontrol.cpp

@@ -2815,4 +2815,4 @@ void button_strip_noncritical_keys(button_info *bi)
 	for(idx=0;idx<Non_critical_key_set_size;idx++){
 		button_info_unset(bi,Non_critical_key_set[idx]);
 	}
-}
+}

code/lab/lab.cpp

@@ -217,7 +217,7 @@ void labviewer_change_model(char *model_fname, int lod = 0, int sel_index = -1)
 			Lab_model_num = -1;
 
 			for (j = 0; j < MAX_SHIP_WEAPONS; j++) {
-				if (Lab_weaponmodel_num[j] > 0) {
+				if (Lab_weaponmodel_num[j] >= 0) {
 					model_page_out_textures(Lab_weaponmodel_num[j], true);
 					model_unload(Lab_weaponmodel_num[j]);
 					Lab_weaponmodel_num[j] = -1;
@@ -296,7 +296,7 @@ void labviewer_change_model(char *model_fname, int lod = 0, int sel_index = -1)
 		} else {
 			// clear out the model filename
 			memset( Lab_model_filename, 0, sizeof(Lab_model_filename) );
-			if (Lab_weaponmodel_num[0] > 0) {
+			if (Lab_weaponmodel_num[0] >= 0) {
 				for (j = 0; j < MAX_SHIP_WEAPONS; j++) {
 					memset( Lab_weaponmodel_filename[j], 0, sizeof(Lab_weaponmodel_filename[j]) );
 				}
@@ -2188,7 +2188,7 @@ void labviewer_make_weap_window(Button* caller)
 void lab_init()
 {
 	GUIObject *cbp;
-	int x;
+	int x,i;
 
 	weapon_pause_sounds();
 
@@ -2235,10 +2235,12 @@ void lab_init()
 	Lab_thrust_afterburn = false;
 	Lab_arc_next_time = -1;
 	Lab_arc_disrupted = false;
+	for (i = 0; i < MAX_SHIP_WEAPONS; i++) {
+		Lab_weaponmodel_num[i] = -1;
+	}
 
 	// save detail options
 	Lab_detail_texture_save = Detail.hardware_textures;
-
 	if ( !Lab_in_mission ) {
 		// load up the list of insignia that we might use on the ships
 		pilot_load_squad_pic_list();
@@ -2462,6 +2464,14 @@ void lab_close()
 		Lab_model_num = -1;
 	}
 
+	for (i = 0; i < MAX_SHIP_WEAPONS; i++) {
+		if (Lab_weaponmodel_num[i] >= 0) {
+			model_page_out_textures(Lab_weaponmodel_num[i], true);
+			model_unload(Lab_weaponmodel_num[i]);
+			Lab_weaponmodel_num[i] = -1;
+		}
+	}
+
 	if (Lab_screen_save_bitmap != 1) {
 		gr_free_screen(Lab_screen_save_bitmap);
 		Lab_screen_save_bitmap = -1;

code/math/floating.cpp

@@ -72,4 +72,4 @@ int rand_chance(float frametime, float chance)
 			return 1;
 
 	return frand() < (frametime * (chance + 1.0f));
-}
+}

code/mission/missiontraining.h

@@ -64,4 +64,4 @@ public:
 	bool canRender();
 };
 
-#endif /* __MISSIONTRAINING_H__ */
+#endif /* __MISSIONTRAINING_H__ */

code/mod_table/mod_table.cpp

@@ -22,6 +22,7 @@ int Default_ship_select_effect = 2;
 int Default_weapon_select_effect = 2;
 bool Enable_external_shaders = false;
 bool Full_color_head_anis = false;
+bool Weapons_inherit_parent_collision_group = false;
 
 
 void parse_mod_table(char *filename)
@@ -170,6 +171,12 @@ void parse_mod_table(char *filename)
 			Default_weapon_select_effect = 0;
 	}
 
+	if (optional_string("$Weapons inherit parent collision group:")) {
+		stuff_boolean(&Weapons_inherit_parent_collision_group);
+		if (Weapons_inherit_parent_collision_group)
+			mprintf(("Game Settings Table: Weapons inherit parent collision group\n"));
+	}
+
 	required_string("#END");
 
 	// close localization

code/mod_table/mod_table.h

@@ -19,5 +19,6 @@ extern int Default_ship_select_effect;
 extern int Default_weapon_select_effect;
 extern bool Enable_external_shaders;
 extern bool Full_color_head_anis;
+extern bool Weapons_inherit_parent_collision_group;
 
 void mod_table_init();

code/model/modelanim.cpp

@@ -876,4 +876,4 @@ bool model_anim_pop_and_start_type(int stack_unique_id)
 	stack.pop_back();
 
 	return model_anim_start_type(item.shipp, item.animation_type, item.subtype, item.direction * -1, item.instant);
-}
+}

code/network/multi_options.cpp

@@ -729,4 +729,4 @@ void multi_options_process_packet(unsigned char *data, header *hinfo)
 		break;
 	}
 	PACKET_SET_SIZE();
-}
+}

code/network/multi_sexp.cpp

@@ -815,4 +815,4 @@ void multi_discard_remaining_callback_data()
 	if (!multi_sexp_discard_operator()) {
 		Warning(LOCATION, "Attempt to discard remaining data failed! Callback for operator %d lacks proper termination. Entire packet may be corrupt. Discarding remaining packet"); 
 	}
-}
+}

code/network/multi_sexp.h

@@ -47,4 +47,4 @@ bool multi_get_string(SCP_string &buffer);
 bool multi_get_bool(bool &value);
 bool multi_get_float(float &value);
 bool multi_get_short(short &value);
-bool multi_get_ushort(ushort &value);
+bool multi_get_ushort(ushort &value);

code/parse/lua.cpp

@@ -4767,6 +4767,10 @@ ADE_VIRTVAR(Position, l_Object, "vector", "Object world position (World vector)"
 
 	if(ADE_SETTING_VAR && v3 != NULL) {
 		objh->objp->pos = *v3;
+		if (objh->objp->type == OBJ_WAYPOINT) {
+			waypoint *wpt = find_waypoint_with_objnum(OBJ_INDEX(objh->objp));
+			wpt->set_pos(v3);
+		}
 	}
 
 	return ade_set_args(L, "o", l_Vector.Set(objh->objp->pos));

code/parse/scripting.cpp

@@ -1406,4 +1406,4 @@ void scripting_state_do_frame(float frametime)
 			gameseq_post_event(GS_EVENT_MAIN_MENU);
 			return;
 	}
-}
+}

code/parse/sexp.cpp

@@ -588,7 +588,7 @@ sexp_oper Operators[] = {
 	{ "use-nav-cinematics",				OP_NAV_USECINEMATICS,			1, 1 }, //kazan
 	{ "use-autopilot",					OP_NAV_USEAP,					1, 1 }, //kazan
 	{ "select-nav",						OP_NAV_SELECT,					1, 1 }, //Talon1024
-	{ "deselect-nav",					OP_NAV_DESELECT,				0, 0 }, //Talon1024
+	{ "unselect-nav",					OP_NAV_UNSELECT,				0, 0 }, //Talon1024
 
 	//Cutscene Sub-Category
 	{ "set-cutscene-bars",			OP_CUTSCENES_SET_CUTSCENE_BARS,			0, 1, },
@@ -18497,7 +18497,7 @@ void select_nav(int node)
 	SelectNav(nav_name);
 }
 
-void deselect_nav()
+void unselect_nav()
 {
 	DeselectNav();
 }
@@ -23414,9 +23414,9 @@ int eval_sexp(int cur_node, int referenced_node)
 				break;
 				
 			//Talon1024
-			case OP_NAV_DESELECT:
+			case OP_NAV_UNSELECT:
 				sexp_val = SEXP_TRUE;
-				deselect_nav();
+				unselect_nav();
 				break;
 
 			case OP_SCRAMBLE_MESSAGES:
@@ -24484,7 +24484,7 @@ int query_operator_return_type(int op)
 		case OP_NAV_USECINEMATICS:
 		case OP_NAV_USEAP:
 		case OP_NAV_SELECT:
-		case OP_NAV_DESELECT:
+		case OP_NAV_UNSELECT:
 		case OP_HUD_SET_TEXT:
 		case OP_HUD_SET_TEXT_NUM:
 		case OP_HUD_SET_MESSAGE:
@@ -24672,7 +24672,7 @@ int query_operator_argument_type(int op, int argnum)
 		case OP_VALIDATE_ALL_ARGUMENTS:
 		case OP_NUM_VALID_ARGUMENTS:
 		case OP_SUPERNOVA_STOP:
-		case OP_NAV_DESELECT:
+		case OP_NAV_UNSELECT:
 			return OPF_NONE;
 
 		case OP_AND:
@@ -28079,7 +28079,7 @@ int get_subcategory(int sexp_id)
 		case OP_NAV_USECINEMATICS:
 		case OP_NAV_USEAP:
 		case OP_NAV_SELECT:
-		case OP_NAV_DESELECT:
+		case OP_NAV_UNSELECT:
 			return CHANGE_SUBCATEGORY_NAV;
 
 
@@ -28359,7 +28359,7 @@ sexp_help_struct Sexp_help[] = {
 		"Takes 1 argument...\r\n"
 		"\t1:\tName of the nav point." },
 
-	{ OP_NAV_DESELECT, "nav-deselect (Action operator)\r\n"
+	{ OP_NAV_UNSELECT, "nav-deselect (Action operator)\r\n"
 		"\tDeselects any navpoint selected.\r\n\r\n"
 		"Takes no arguments..." },
 	

code/parse/sexp.h

@@ -704,7 +704,7 @@ class waypoint_list;
 #define OP_DEBUG							(0x0017 | OP_CATEGORY_CHANGE2 | OP_NONCAMPAIGN_FLAG)	// Karajorma
 #define OP_SET_MISSION_MOOD					(0x0018 | OP_CATEGORY_CHANGE2 | OP_NONCAMPAIGN_FLAG)	// Karajorma
 #define OP_NAV_SELECT						(0x0019 | OP_CATEGORY_CHANGE2 | OP_NONCAMPAIGN_FLAG) 	// Talon1024
-#define OP_NAV_DESELECT						(0x001a | OP_CATEGORY_CHANGE2 | OP_NONCAMPAIGN_FLAG) 	// Talon1024
+#define OP_NAV_UNSELECT						(0x001a | OP_CATEGORY_CHANGE2 | OP_NONCAMPAIGN_FLAG) 	// Talon1024
 #define OP_ALTER_SHIP_FLAG					(0x001b | OP_CATEGORY_CHANGE2 | OP_NONCAMPAIGN_FLAG)	// Karajorma
 #define OP_CHANGE_TEAM_COLOR				(0x001c | OP_CATEGORY_CHANGE2 | OP_NONCAMPAIGN_FLAG)	// The E
 

code/radar/radar.cpp

@@ -423,4 +423,4 @@ void HudGaugeRadarStd::drawCrosshairs(int x, int y)
 		m = (j * 2) - 1;
 		renderGradientLine(x,y + m*4,x,y + m*8);
 	}
-}
+}

code/radar/radarorb.cpp

@@ -688,4 +688,4 @@ void HudGaugeRadarOrb::setupViewHtl()
 	gr_set_view_matrix( &Orb_eye_position, &vmd_identity_matrix );
 
     gr_zbuffer_set(GR_ZBUFF_NONE);
-}
+}

code/ship/shiphit.cpp

@@ -230,7 +230,9 @@ void do_subobj_destroyed_stuff( ship *ship_p, ship_subsys *subsys, vec3d* hitpos
 		mission_log_add_entry(LOG_SHIP_SUBSYS_DESTROYED, ship_p->ship_name, psub->subobj_name, log_index );
 		if ( ship_obj == Player_obj )
 		{
-			snd_play( &Snds[SND_SUBSYS_DIE_1], 0.0f );
+			if (!no_explosion) {
+				snd_play( &Snds[SND_SUBSYS_DIE_1], 0.0f );
+			}
 			if (strlen(psub->alt_dmg_sub_name))
 				HUD_printf(XSTR( "Your %s subsystem has been destroyed", 499), psub->alt_dmg_sub_name);
 			else {

code/weapon/weapons.cpp

@@ -5280,6 +5280,10 @@ int weapon_create( vec3d * pos, matrix * porient, int weapon_type, int parent_ob
 		wp->damage_ship_id[i] = -1;
 	}
 
+	if (Weapons_inherit_parent_collision_group) {
+		Objects[objnum].collision_group_id = Objects[parent_objnum].collision_group_id;
+	}
+
 	return objnum;
 }
 

code/windows_stub/stubs.cpp

@@ -38,6 +38,10 @@ static char buffer[MAX_BUF_SIZE], buffer_tmp[MAX_BUF_SIZE];
 #include <malloc/malloc.h>
 #define MALLOC_USABLE(pointer) malloc_size(pointer)
 #else
+#ifdef SCP_BSD
+#include <stdlib.h>
+#include <malloc_np.h>
+#endif
 #define MALLOC_USABLE(pointer) malloc_usable_size(pointer)
 #endif // __APPLE__
 #endif // NDEBUG

configure.ac

@@ -90,31 +90,32 @@ dnl
 dnl the following block will need to be updated as additional
 dnl environments are supported
 fs2_os_win32="no"
-fs2_os_unix="no"
+fs2_os_linux="no"
 fs2_os_osx="no"
 fs2_os_solaris="no"
+fs2_os_bsd="no"
 
 dnl case $host_os in
 case "$target" in
-    *-*-mingw*)
-        # windows
-        echo "using Win32 defines (for $host_os)"
-        fs2_os_win32="yes"
+	*-*-mingw*)
+		# windows
+		echo "using Win32 defines (for $host_os)"
+		fs2_os_win32="yes"
 		AC_DEFINE([_MINGW])
 		FS2_LDFLAGS="$FS2_LDFLAGS -lgdi32 -lole32 -lwsock32 -lwinmm -lmsacm32 \
-					-lcomctl32 -lstrmiids -ldxguid -lddraw -ldinput"
-        ;;
-    x86_64-*-linux*)
-        # linux
-        echo "Using 64-bit Unix defines (for $host_os)"
-        fs2_os_unix="yes"
+			-lcomctl32 -lstrmiids -ldxguid -lddraw -ldinput"
+		;;
+	x86_64-*-linux*)
+		# linux
+		echo "Using 64-bit Unix defines (for $host_os)"
+		fs2_os_linux="yes"
 		D_CFLAGS="$D_CFLAGS -m64 -march=athlon64 -ansi"
 		D_CFLAGS="$D_CFLAGS -DLUA_USE_LINUX"
-        ;;
+		;;
 	*-*-linux*)
 		# linux
 		echo "Using Unix defines (for $host_os)"
-		fs2_os_unix="yes"
+		fs2_os_linux="yes"
 		D_CFLAGS="$D_CFLAGS -DLUA_USE_LINUX"
 		;;
 	*-*-darwin*)
@@ -127,32 +128,34 @@ case "$target" in
 	*-*-solaris*)
 		# Solaris
 		echo "Using Solaris 10 defines (for $host_os)"
-        echo "************************************************************"
-        echo "************************ NOTE ******************************"
-        echo "* Support for this OS is not actively maintatined. It ******"
-        echo "* should work but please provide feedback about builds and *"
-        echo "* play experience on this OS at ****************************"
-        echo "* http://www.hard-light.net/forums/index.php?board=113.0 ***"
-        echo "************************************************************"
+		echo "************************************************************"
+		echo "************************ NOTE ******************************"
+		echo "* Support for this OS is not actively maintatined. It ******"
+		echo "* should work but please provide feedback about builds and *"
+		echo "* play experience on this OS at ****************************"
+		echo "* http://www.hard-light.net/forums/index.php?board=113.0 ***"
+		echo "************************************************************"
 		fs2_os_solaris="yes"
 		;;
-    *freebsd*)
-        # FreeBSD 9.1
-        echo "Using Unix defines (for $host_os $host_cpu)"
-        echo "************************************************************"
-        echo "************************ NOTE ******************************"
-        echo "* Support for this OS is not actively maintatined. It ******"
-        echo "* should work but please provide feedback about builds and *"
-        echo "* play experience on this OS at ****************************"
-        echo "* http://www.hard-light.net/forums/index.php?board=113.0 ***"
-        echo "************************************************************"
-        fs2_os_unix="yes"
-        if test "$host_cpu" = "amd64"
-        then
-            D_CFLAGS="$D_CFLAGS -m64 -march=athlon64 -ansi"
-        fi
-        D_CFLAGS="$D_CFLAGS -DLUA_USE_LINUX"
-        ;;
+	*freebsd*)
+		# FreeBSD 9.1
+		echo "Using Unix defines (for $host_os $host_cpu)"
+		echo "************************************************************"
+		echo "************************ NOTE ******************************"
+		echo "* Support for this OS is not actively maintatined. It ******"
+		echo "* should work but please provide feedback about builds and *"
+		echo "* play experience on this OS at ****************************"
+		echo "* http://www.hard-light.net/forums/index.php?board=113.0 ***"
+		echo "************************************************************"
+		fs2_os_bsd="yes"
+		if test "$host_cpu" = "amd64"
+		then
+			D_CFLAGS="$D_CFLAGS -m64 -march=athlon64 -ansi"
+		fi
+		D_CFLAGS="$D_CFLAGS -DLUA_USE_LINUX"
+		LDFLAGS="$LDFLAGS -L/usr/local/lib"
+		CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+		;;
 	*)
 		# Unknown
 		echo "fs2_open does not support $host_cpu-$host_os"
@@ -160,12 +163,12 @@ case "$target" in
 		echo "host_cpu:    " $host_cpu
 		echo "host_vendor: " $host_vendor
 		echo "host_os      " $host_os
-        echo "************************************************************"
-        echo "* Please let us know about successful builds on this OS at *"
-        echo "* http://www.hard-light.net/forums/index.php?board=113.0 ***"
-        echo "* Create a new thread about your build experience and what *"
-        echo "* was required to make the build successful. ***************"
-        echo "************************************************************"
+		echo "************************************************************"
+		echo "* Please let us know about successful builds on this OS at *"
+		echo "* http://www.hard-light.net/forums/index.php?board=113.0 ***"
+		echo "* Create a new thread about your build experience and what *"
+		echo "* was required to make the build successful. ***************"
+		echo "************************************************************"
 		exit 1;
 		;;
 esac
@@ -219,10 +222,6 @@ else
 	fi
 fi
 
-if test "$fs2_lite" = "yes" ; then
-	AC_DEFINE([SCP_LITE])
-fi
-
 if test "$fs2_gprof" = "yes" ; then
 	FS2_CXXFLAGS="$FS2_CXXFLAGS -pg"
 fi
@@ -230,9 +229,11 @@ fi
 
 dnl generate appropriate conditionals for Makefile.am
 AM_CONDITIONAL(FS2_OS_WIN32,   test "$fs2_os_win32" = "yes")
-AM_CONDITIONAL(FS2_OS_UNIX,    test "$fs2_os_unix"  = "yes" || test "$fs2_os_osx" = "yes" || test "$fs2_os_solaris" = "yes")
+AM_CONDITIONAL(FS2_OS_UNIX,    test "$fs2_os_linux" = "yes" || test "$fs2_os_osx" = "yes" || test "$fs2_os_solaris" = "yes" || test "$fs2_os_bsd" = "yes")
+AM_CONDITIONAL(FS2_OS_LINUX,   test "$fs2_os_linux" = "yes")
 AM_CONDITIONAL(FS2_OS_OSX,     test "$fs2_os_osx"   = "yes")
 AM_CONDITIONAL(FS2_OS_SOLARIS, test "$fs2_os_solaris"   = "yes")
+AM_CONDITIONAL(FS2_OS_BSD,     test "$fs2_os_bsd"   = "yes")
 
 AM_CONDITIONAL(FS2_DEVIL,      test "$fs2_devil"      = "yes")
 AM_CONDITIONAL(FS2_SPEECH,     test "$fs2_speech"     = "yes")
@@ -293,7 +294,7 @@ AC_CXX_IOS_BASE
 dnl Setup paths for lib and include dirs
 
 dnl SDL check
-if test "$fs2_os_unix" = "yes" ; then
+if test "$fs2_os_linux" = "yes" || test "$fs2_os_bsd" = "yes" ; then
 	dnl Check for SDL 1.2.6+
 	SDL_VERSION=1.2.6
 	AM_PATH_SDL($SDL_VERSION,:,AC_MSG_ERROR([*** SDL >= $SDL_VERSION not found!]))
@@ -311,9 +312,6 @@ elif test "$fs2_os_osx" = "yes" ; then
 elif test "$fs2_os_solaris" = "yes" ; then
 	FS2_CXXFLAGS="$FS2_CXXFLAGS -I/usr/include/SDL"
 	FS2_LDFLAGS="$FS2_LDFLAGS -lpng -lpng12 -ljpeg -lpthread -logg -lSDL -ltheora -lopenal -lsocket -lvorbisfile -lvorbis -lnsl -lGL -lGLU"
-	AC_DEFINE([SCP_UNIX])
-	AC_DEFINE([SCP_SOLARIS])
-	AC_DEFINE([NO_DIRECT3D])
 	## don't need the CFLAGS here if recent SDL is used
 fi
 
@@ -322,7 +320,7 @@ D_CFLAGS=$D_CFLAGS" $SDL_CFLAGS"
 FS2_LIBS=$FS2_LIBS" $SDL_LIBS"
 
 dnl OGG/Vorbis/Theora check
-if test "$fs2_os_unix" = "yes" ; then
+if test "$fs2_os_linux" = "yes" || test "$fs2_os_bsd" = "yes" ; then
 	dnl Check that we have libogg, libvorbis, libvorbisfile, & libtheora
 	XIPH_PATH_OGG(:,AC_MSG_ERROR([*** OGG installation not found!]))
 	XIPH_PATH_VORBIS(:,AC_MSG_ERROR([*** Vorbis installation not found!]))
@@ -338,7 +336,7 @@ D_CFLAGS=$D_CFLAGS" $OGG_CFLAGS"
 FS2_LIBS=$FS2_LIBS" $OGG_LIBS"
 
 dnl OpenAL
-if test "$fs2_os_unix" = "yes" ; then
+if test "$fs2_os_linux" = "yes" || test "$fs2_os_bsd" = "yes" ; then
 	AM_PATH_OPENAL(:,AC_MSG_ERROR([*** OpenAL installation not found!]))
 	D_CFLAGS=$D_CFLAGS" $OPENAL_CFLAGS"
 	FS2_LIBS=$FS2_LIBS" $OPENAL_LIBS"
@@ -369,18 +367,25 @@ if test "$fs2_os_win32" = "yes" ; then
 	else
 		FS2_LDFLAGS="$FS2_LDFLAGS -lopengl32 -lglu32"
 	fi
-elif test "$fs2_os_unix" = "yes" ; then
+elif test "$fs2_os_linux" = "yes" || test "$fs2_os_bsd" = "yes" ; then
 	AM_PATH_OPENGL(:,AC_MSG_ERROR([*** OpenGL installation not found!]))
 	D_CFLAGS=$D_CFLAGS" $OPENGL_CFLAGS"
 	FS2_LIBS=$FS2_LIBS" $OPENGL_LIBS"
 	AC_DEFINE([SCP_UNIX])
 	AC_DEFINE([NO_DIRECT3D])
+	if test "$fs2_os_bsd" = "yes" ; then
+		AC_DEFINE([SCP_BSD])
+	fi
 elif test "$fs2_os_osx" = "yes" ; then
 	FS2_CXXFLAGS="$FS2_CXXFLAGS -I/System/Library/Frameworks/OpenGL.framework/Headers"
 	FS2_LDFLAGS="$FS2_LDFLAGS -framework OpenGL"
 	AC_DEFINE([SCP_UNIX])
 	AC_DEFINE([NO_DIRECT3D])
 	## don't need the CFLAGS here if recent SDL is used
+elif test "$fs2_os_solaris" = "yes" ; then
+	AC_DEFINE([SCP_UNIX])
+	AC_DEFINE([SCP_SOLARIS])
+	AC_DEFINE([NO_DIRECT3D])
 fi
 
 dnl PNG libs
@@ -412,14 +417,7 @@ FS2_LIBS=$FS2_LIBS" -ljpeg"
 
 
 dnl OGG Vorbis/Theora (static libs)
-if test "$fs2_os_unix" = "yes" ; then
-	if test "x$fs2_static_ogg" != "x" ; then
-		FS2_LIBS="$FS2_LIBS $fs2_static_ogg/libtheora.a"
-		FS2_LIBS="$FS2_LIBS $fs2_static_ogg/libvorbisfile.a"
-		FS2_LIBS="$FS2_LIBS $fs2_static_ogg/libvorbis.a"
-		FS2_LIBS="$FS2_LIBS $fs2_static_ogg/libogg.a"
-	fi
-elif test "$fs2_os_osx" = "yes" ; then
+if test "$fs2_os_linux" = "yes" || test "$fs2_os_osx" = "yes" || test "$fs2_os_bsd" = "yes" ; then
 	if test "x$fs2_static_ogg" != "x" ; then
 		FS2_LIBS="$FS2_LIBS $fs2_static_ogg/libtheora.a"
 		FS2_LIBS="$FS2_LIBS $fs2_static_ogg/libvorbisfile.a"
@@ -432,7 +430,7 @@ fi
 dnl any extra optimization or warning flags
 if test "$fs2_os_win32" = "yes" ; then
 	D_CFLAGS="$D_CFLAGS -fexceptions"
-elif test "$fs2_os_unix" = "yes" ; then
+elif test "$fs2_os_linux" = "yes" || test "$fs2_os_bsd" = "yes" ; then
 	D_CFLAGS="$D_CFLAGS -fsigned-char -Wno-unknown-pragmas"
 	FS2_CXXFLAGS="$FS2_CXXFLAGS -Wno-deprecated -Wno-char-subscripts"
 elif test "$fs2_os_osx" = "yes" ; then