Update Android.mk.

cl_dll/Android.mk

@@ -24,26 +24,24 @@ LOCAL_CFLAGS += -DCLIENT_DLL=1
 
 SRCS=
 SRCS_C=
-SRCS+=./tfc/ev_tfc.cpp
+SRCS+=../dlls/tfc/tf_wpn_ac.cpp
-SRCS+=./hl/hl_baseentity.cpp
+SRCS+=../dlls/tfc/tf_wpn_ar.cpp
-SRCS+=./tfc/tfc_events.cpp
+SRCS+=../dlls/tfc/tf_wpn_axe.cpp
-SRCS+=./hl/hl_objects.cpp
+SRCS+=../dlls/tfc/tf_wpn_flame.cpp
-SRCS+=./tfc/tfc_weapons.cpp
+SRCS+=../dlls/tfc/tf_wpn_gl.cpp
+SRCS+=../dlls/tfc/tf_wpn_ic.cpp
+SRCS+=../dlls/tfc/tf_wpn_ng.cpp
+SRCS+=../dlls/tfc/tf_wpn_railgun.cpp
+SRCS+=../dlls/tfc/tf_wpn_rpg.cpp
+SRCS+=../dlls/tfc/tf_wpn_sg.cpp
+SRCS+=../dlls/tfc/tf_wpn_srifle.cpp
+SRCS+=../dlls/tfc/tf_wpn_tranq.cpp
 SRCS+=../dlls/crowbar.cpp
-SRCS+=../dlls/tfc/assaultcannon.cpp
+SRCS+=tfc/ev_tfc.cpp
-SRCS+=../dlls/tfc/axe.cpp
+SRCS+=tfc/tf_baseentity.cpp
-SRCS+=../dlls/tfc/flamethrower.cpp
+SRCS+=tfc/tf_events.cpp
-SRCS+=../dlls/tfc/grenadelauncher.cpp
+SRCS+=tfc/tf_objects.cpp
-SRCS+=../dlls/tfc/incendiarycannon.cpp
+SRCS+=tfc/tf_weapons.cpp
-SRCS+=../dlls/tfc/nailgun.cpp
-SRCS+=../dlls/tfc/pipebomblauncher.cpp
-SRCS+=../dlls/tfc/railgun.cpp
-SRCS+=../dlls/tfc/rpg.cpp
-SRCS+=../dlls/tfc/shotgun.cpp
-SRCS+=../dlls/tfc/sniperrifle.cpp
-SRCS+=../dlls/tfc/spanner.cpp
-SRCS+=../dlls/tfc/supernailgun.cpp
-SRCS+=../dlls/tfc/supershotgun.cpp
 #SRCS+=../game_shared/voice_banmgr.cpp
 #SRCS+=../game_shared/voice_status.cpp
 SRCS+=./ammo.cpp

dlls/Android.mk

@@ -20,7 +20,7 @@ LOCAL_CPPFLAGS := $(LOCAL_CFLAGS)
 
 LOCAL_C_INCLUDES := $(SDL_PATH)/include \
 		    $(LOCAL_PATH)/. \
-		    $(LOCAL_PATH)/wpn_shared \
+		    $(LOCAL_PATH)/tfc \
 		    $(LOCAL_PATH)/../common \
 		    $(LOCAL_PATH)/../engine/common \
 		    $(LOCAL_PATH)/../engine \
@@ -28,104 +28,91 @@ LOCAL_C_INCLUDES := $(SDL_PATH)/include \
 		    $(LOCAL_PATH)/../pm_shared \
 		    $(LOCAL_PATH)/../game_shared
 
-LOCAL_SRC_FILES := agrunt.cpp airtank.cpp \
+LOCAL_SRC_FILES := airtank.cpp \
-           aflock.cpp \
+	animating.cpp \
-           animating.cpp \
+	animation.cpp \
-           animation.cpp \
+	bmodels.cpp \
-           apache.cpp \
+	buttons.cpp \
-           barnacle.cpp \
+	cbase.cpp \
-           barney.cpp \
+	client.cpp \
-           bigmomma.cpp \
+	combat.cpp \
-           bloater.cpp \
+	crowbar.cpp \
-           bmodels.cpp \
+	defaultai.cpp \
-           bullsquid.cpp \
+	doors.cpp \
-           buttons.cpp \
+	effects.cpp \
-           cbase.cpp \
+	explode.cpp \
-           client.cpp \
+	func_break.cpp \
-           combat.cpp \
+	func_tank.cpp \
-           controller.cpp \
+	game.cpp \
-           crossbow.cpp \
+	gamerules.cpp \
-           crowbar.cpp \
+	ggrenade.cpp \
-           defaultai.cpp \
+	globals.cpp \
-           doors.cpp \
+	h_ai.cpp \
-           effects.cpp \
+	h_battery.cpp \
-           egon.cpp \
+	h_cine.cpp \
-           explode.cpp \
+	h_cycler.cpp \
-           flyingmonster.cpp \
+	h_export.cpp \
-           func_break.cpp \
+	healthkit.cpp \
-           func_tank.cpp \
+	items.cpp \
-           game.cpp \
+	lights.cpp \
-           gamerules.cpp \
+	monsters.cpp \
-           gargantua.cpp \
+	monsterstate.cpp \
-           gauss.cpp \
+	mortar.cpp \
-           genericmonster.cpp \
+	multiplay_gamerules.cpp \
-           ggrenade.cpp \
+	nodes.cpp \
-           globals.cpp \
+	observer.cpp \
-           glock.cpp \
+	pathcorner.cpp \
-           gman.cpp \
+	plane.cpp \
-           h_ai.cpp \
+	plats.cpp \
-           h_battery.cpp \
+	player.cpp \
-           h_cycler.cpp \
+	playermonster.cpp \
-           h_cine.cpp \
+	schedule.cpp \
-           h_export.cpp \
+	scripted.cpp \
-           handgrenade.cpp \
+	skill.cpp \
-           hassassin.cpp \
+	sound.cpp \
-           headcrab.cpp \
+	soundent.cpp \
-           healthkit.cpp \
+	spectator.cpp \
-           hgrunt.cpp \
+	squadmonster.cpp \
-           hornet.cpp \
+	subs.cpp \
-           hornetgun.cpp \
+	talkmonster.cpp \
-           houndeye.cpp \
+	teamplay_gamerules.cpp \
-           ichthyosaur.cpp \
+	tempmonster.cpp \
-           islave.cpp \
+	triggers.cpp \
-           items.cpp \
+	turret.cpp \
-           leech.cpp \
+	util.cpp \
-           lights.cpp \
+	weapons.cpp \
-           maprules.cpp \
+	world.cpp \
-           monstermaker.cpp \
+	xen.cpp \
-           monsters.cpp \
+	tfc/areadef.cpp \
-           monsterstate.cpp \
+	tfc/demoman.cpp \
-           mortar.cpp \
+	tfc/dispenser.cpp \
-           mp5.cpp \
+	tfc/engineer.cpp \
-           multiplay_gamerules.cpp \
+	tfc/pyro.cpp \
-           nihilanth.cpp \
+	tfc/sentry.cpp \
-           nodes.cpp \
+	tfc/spy.cpp \
-	   observer.cpp \
+	tfc/teleporter.cpp \
-           osprey.cpp \
+	tfc/tf_admin.cpp \
-           pathcorner.cpp \
+	tfc/tf_clan.cpp \
-           plane.cpp \
+	tfc/tf_gamerules.cpp \
-           plats.cpp \
+	tfc/tf_item.cpp \
-           player.cpp \
+	tfc/tf_sbar.cpp \
-	   playermonster.cpp \
+	tfc/tf_wpn_ac.cpp \
-           python.cpp \
+	tfc/tf_wpn_ar.cpp \
-           rat.cpp \
+	tfc/tf_wpn_axe.cpp \
-           roach.cpp \
+	tfc/tf_wpn_flame.cpp \
-           rpg.cpp \
+	tfc/tf_wpn_gl.cpp \
-           satchel.cpp \
+	tfc/tf_wpn_grenades.cpp \
-           schedule.cpp \
+	tfc/tf_wpn_ic.cpp \
-           scientist.cpp \
+	tfc/tf_wpn_nails.cpp \
-           scripted.cpp \
+	tfc/tf_wpn_ng.cpp \
-           shotgun.cpp \
+	tfc/tf_wpn_railgun.cpp \
-           singleplay_gamerules.cpp \
+	tfc/tf_wpn_rpg.cpp \
-           skill.cpp \
+	tfc/tf_wpn_sg.cpp \
-           sound.cpp \
+	tfc/tf_wpn_srifle.cpp \
-           soundent.cpp \
+	tfc/tf_wpn_tranq.cpp \
-           spectator.cpp \
+	tfc/tfort.cpp \
-           squadmonster.cpp \
+	tfc/tfortmap.cpp \
-           squeakgrenade.cpp \
+	tfc/tforttm.cpp \
-           subs.cpp \
-           talkmonster.cpp \
-           teamplay_gamerules.cpp \
-           tentacle.cpp \
-           tempmonster.cpp \
-           triggers.cpp \
-           tripmine.cpp \
-           turret.cpp \
-           util.cpp \
-           weapons.cpp \
-           world.cpp \
-           xen.cpp \
-           zombie.cpp \
 	   ../pm_shared/pm_debug.c \
 	   ../pm_shared/pm_math.c \
 	   ../pm_shared/pm_shared.c