From a7c95a350b86c4bb5ba0d6a37fd6b5686dd5f7dd Mon Sep 17 00:00:00 2001 From: Night Owl Date: Sun, 9 Dec 2018 11:27:58 +0500 Subject: [PATCH] Update Android.mk. --- cl_dll/Android.mk | 36 +++++---- dlls/Android.mk | 185 +++++++++++++++++++++------------------------- 2 files changed, 103 insertions(+), 118 deletions(-) diff --git a/cl_dll/Android.mk b/cl_dll/Android.mk index 3f1bf805..81db4574 100755 --- a/cl_dll/Android.mk +++ b/cl_dll/Android.mk @@ -24,26 +24,24 @@ LOCAL_CFLAGS += -DCLIENT_DLL=1 SRCS= SRCS_C= -SRCS+=./tfc/ev_tfc.cpp -SRCS+=./hl/hl_baseentity.cpp -SRCS+=./tfc/tfc_events.cpp -SRCS+=./hl/hl_objects.cpp -SRCS+=./tfc/tfc_weapons.cpp +SRCS+=../dlls/tfc/tf_wpn_ac.cpp +SRCS+=../dlls/tfc/tf_wpn_ar.cpp +SRCS+=../dlls/tfc/tf_wpn_axe.cpp +SRCS+=../dlls/tfc/tf_wpn_flame.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+=../dlls/tfc/axe.cpp -SRCS+=../dlls/tfc/flamethrower.cpp -SRCS+=../dlls/tfc/grenadelauncher.cpp -SRCS+=../dlls/tfc/incendiarycannon.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+=tfc/ev_tfc.cpp +SRCS+=tfc/tf_baseentity.cpp +SRCS+=tfc/tf_events.cpp +SRCS+=tfc/tf_objects.cpp +SRCS+=tfc/tf_weapons.cpp #SRCS+=../game_shared/voice_banmgr.cpp #SRCS+=../game_shared/voice_status.cpp SRCS+=./ammo.cpp diff --git a/dlls/Android.mk b/dlls/Android.mk index 1dc79616..e88b15f0 100644 --- a/dlls/Android.mk +++ b/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 \ - aflock.cpp \ - animating.cpp \ - animation.cpp \ - apache.cpp \ - barnacle.cpp \ - barney.cpp \ - bigmomma.cpp \ - bloater.cpp \ - bmodels.cpp \ - bullsquid.cpp \ - buttons.cpp \ - cbase.cpp \ - client.cpp \ - combat.cpp \ - controller.cpp \ - crossbow.cpp \ - crowbar.cpp \ - defaultai.cpp \ - doors.cpp \ - effects.cpp \ - egon.cpp \ - explode.cpp \ - flyingmonster.cpp \ - func_break.cpp \ - func_tank.cpp \ - game.cpp \ - gamerules.cpp \ - gargantua.cpp \ - gauss.cpp \ - genericmonster.cpp \ - ggrenade.cpp \ - globals.cpp \ - glock.cpp \ - gman.cpp \ - h_ai.cpp \ - h_battery.cpp \ - h_cycler.cpp \ - h_cine.cpp \ - h_export.cpp \ - handgrenade.cpp \ - hassassin.cpp \ - headcrab.cpp \ - healthkit.cpp \ - hgrunt.cpp \ - hornet.cpp \ - hornetgun.cpp \ - houndeye.cpp \ - ichthyosaur.cpp \ - islave.cpp \ - items.cpp \ - leech.cpp \ - lights.cpp \ - maprules.cpp \ - monstermaker.cpp \ - monsters.cpp \ - monsterstate.cpp \ - mortar.cpp \ - mp5.cpp \ - multiplay_gamerules.cpp \ - nihilanth.cpp \ - nodes.cpp \ - observer.cpp \ - osprey.cpp \ - pathcorner.cpp \ - plane.cpp \ - plats.cpp \ - player.cpp \ - playermonster.cpp \ - python.cpp \ - rat.cpp \ - roach.cpp \ - rpg.cpp \ - satchel.cpp \ - schedule.cpp \ - scientist.cpp \ - scripted.cpp \ - shotgun.cpp \ - singleplay_gamerules.cpp \ - skill.cpp \ - sound.cpp \ - soundent.cpp \ - spectator.cpp \ - squadmonster.cpp \ - squeakgrenade.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 \ +LOCAL_SRC_FILES := airtank.cpp \ + animating.cpp \ + animation.cpp \ + bmodels.cpp \ + buttons.cpp \ + cbase.cpp \ + client.cpp \ + combat.cpp \ + crowbar.cpp \ + defaultai.cpp \ + doors.cpp \ + effects.cpp \ + explode.cpp \ + func_break.cpp \ + func_tank.cpp \ + game.cpp \ + gamerules.cpp \ + ggrenade.cpp \ + globals.cpp \ + h_ai.cpp \ + h_battery.cpp \ + h_cine.cpp \ + h_cycler.cpp \ + h_export.cpp \ + healthkit.cpp \ + items.cpp \ + lights.cpp \ + monsters.cpp \ + monsterstate.cpp \ + mortar.cpp \ + multiplay_gamerules.cpp \ + nodes.cpp \ + observer.cpp \ + pathcorner.cpp \ + plane.cpp \ + plats.cpp \ + player.cpp \ + playermonster.cpp \ + schedule.cpp \ + scripted.cpp \ + skill.cpp \ + sound.cpp \ + soundent.cpp \ + spectator.cpp \ + squadmonster.cpp \ + subs.cpp \ + talkmonster.cpp \ + teamplay_gamerules.cpp \ + tempmonster.cpp \ + triggers.cpp \ + turret.cpp \ + util.cpp \ + weapons.cpp \ + world.cpp \ + xen.cpp \ + tfc/areadef.cpp \ + tfc/demoman.cpp \ + tfc/dispenser.cpp \ + tfc/engineer.cpp \ + tfc/pyro.cpp \ + tfc/sentry.cpp \ + tfc/spy.cpp \ + tfc/teleporter.cpp \ + tfc/tf_admin.cpp \ + tfc/tf_clan.cpp \ + tfc/tf_gamerules.cpp \ + tfc/tf_item.cpp \ + tfc/tf_sbar.cpp \ + tfc/tf_wpn_ac.cpp \ + tfc/tf_wpn_ar.cpp \ + tfc/tf_wpn_axe.cpp \ + tfc/tf_wpn_flame.cpp \ + tfc/tf_wpn_gl.cpp \ + tfc/tf_wpn_grenades.cpp \ + tfc/tf_wpn_ic.cpp \ + tfc/tf_wpn_nails.cpp \ + tfc/tf_wpn_ng.cpp \ + tfc/tf_wpn_railgun.cpp \ + tfc/tf_wpn_rpg.cpp \ + tfc/tf_wpn_sg.cpp \ + tfc/tf_wpn_srifle.cpp \ + tfc/tf_wpn_tranq.cpp \ + tfc/tfort.cpp \ + tfc/tfortmap.cpp \ + tfc/tforttm.cpp \ ../pm_shared/pm_debug.c \ ../pm_shared/pm_math.c \ ../pm_shared/pm_shared.c