Skip to content

Commit

Permalink
* converted the project to c++
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin Gerhardy committed Mar 25, 2012
1 parent 328fa5d commit 48fd7b8
Show file tree
Hide file tree
Showing 449 changed files with 1,737 additions and 1,772 deletions.
2 changes: 1 addition & 1 deletion LICENSES
Expand Up @@ -6874,7 +6874,7 @@ radiant/bitmaps/grid_window.png | GNU General Public License 2.0 or later | Nate
radiant/bitmaps/particle_map.png | GNU General Public License 2.0 or later | Nate Wright
radiant/bitmaps/particle_weapon.png | GNU General Public License 2.0 or later | Nate Wright
radiant/bitmaps/texwindow_uniformsize.png | | orbweaver (commiter in darkradiant repository) | http://darkradiant.svn.sourceforge.net/viewvc/darkradiant/trunk/darkradiant/install/bitmaps/texwindow_uniformsize.png?view=markup&pathrev=309
src/common/pqueue.c | Public Domain
src/common/pqueue.cpp | Public Domain
src/common/pqueue.h | Public Domain
src/docs/pathfinding.odg | GNU Free Documentation License | Werner "hoehrer" Höhrer
src/docs/tex/chapters/geoscape.tex | GNU General Public License 2.0 | Eric Goller
Expand Down
148 changes: 74 additions & 74 deletions build/modules/cgame-campaign.mk
Expand Up @@ -12,84 +12,84 @@ $(TARGET)_LDFLAGS += $(SO_LDFLAGS) $(MXML_LIBS) -lm
$(TARGET)_FILE := base/$(TARGET).$(SO_EXT)

$(TARGET)_SRCS = \
client/cgame/campaign/cl_game_campaign.c \
client/cgame/campaign/cp_aircraft.c \
client/cgame/campaign/cp_aircraft_callbacks.c \
client/cgame/campaign/cp_alien_interest.c \
client/cgame/campaign/cp_base.c \
client/cgame/campaign/cp_base_callbacks.c \
client/cgame/campaign/cp_basedefence_callbacks.c \
client/cgame/campaign/cp_building.c \
client/cgame/campaign/cp_cgame_callbacks.c \
client/cgame/campaign/cp_capacity.c \
client/cgame/campaign/cp_hospital.c \
client/cgame/campaign/cp_hospital_callbacks.c \
client/cgame/campaign/cp_messages.c \
client/cgame/campaign/cp_missions.c \
client/cgame/campaign/cp_mission_triggers.c \
client/cgame/campaign/cp_parse.c \
client/cgame/campaign/cp_rank.c \
client/cgame/campaign/cp_team.c \
client/cgame/campaign/cp_team_callbacks.c \
client/cgame/campaign/cp_time.c \
client/cgame/campaign/cp_xvi.c \
client/cgame/campaign/cp_alienbase.c \
client/cgame/campaign/cp_aliencont.c \
client/cgame/campaign/cp_aliencont_callbacks.c \
client/cgame/campaign/cp_auto_mission.c \
client/cgame/campaign/cp_mission_callbacks.c \
client/cgame/campaign/cp_airfight.c \
client/cgame/campaign/cp_campaign.c \
client/cgame/campaign/cp_event.c \
client/cgame/campaign/cp_employee.c \
client/cgame/campaign/cp_employee_callbacks.c \
client/cgame/campaign/cp_installation.c \
client/cgame/campaign/cp_installation_callbacks.c \
client/cgame/campaign/cp_market.c \
client/cgame/campaign/cp_market_callbacks.c \
client/cgame/campaign/cp_map.c \
client/cgame/campaign/cp_mapfightequip.c \
client/cgame/campaign/cp_nation.c \
client/cgame/campaign/cp_produce.c \
client/cgame/campaign/cp_produce_callbacks.c \
client/cgame/campaign/cp_radar.c \
client/cgame/campaign/cp_research.c \
client/cgame/campaign/cp_research_callbacks.c \
client/cgame/campaign/cp_save.c \
client/cgame/campaign/cp_statistics.c \
client/cgame/campaign/cp_transfer.c \
client/cgame/campaign/cp_transfer_callbacks.c \
client/cgame/campaign/cp_ufo.c \
client/cgame/campaign/cp_ufopedia.c \
client/cgame/campaign/cp_uforecovery.c \
client/cgame/campaign/cp_uforecovery_callbacks.c \
client/cgame/campaign/cp_messageoptions.c \
client/cgame/campaign/cp_messageoptions_callbacks.c \
client/cgame/campaign/cp_overlay.c \
client/cgame/campaign/cp_popup.c \
client/cgame/campaign/cp_fightequip_callbacks.c \
client/cgame/campaign/cl_game_campaign.cpp \
client/cgame/campaign/cp_aircraft.cpp \
client/cgame/campaign/cp_aircraft_callbacks.cpp \
client/cgame/campaign/cp_alien_interest.cpp \
client/cgame/campaign/cp_base.cpp \
client/cgame/campaign/cp_base_callbacks.cpp \
client/cgame/campaign/cp_basedefence_callbacks.cpp \
client/cgame/campaign/cp_building.cpp \
client/cgame/campaign/cp_cgame_callbacks.cpp \
client/cgame/campaign/cp_capacity.cpp \
client/cgame/campaign/cp_hospital.cpp \
client/cgame/campaign/cp_hospital_callbacks.cpp \
client/cgame/campaign/cp_messages.cpp \
client/cgame/campaign/cp_missions.cpp \
client/cgame/campaign/cp_mission_triggers.cpp \
client/cgame/campaign/cp_parse.cpp \
client/cgame/campaign/cp_rank.cpp \
client/cgame/campaign/cp_team.cpp \
client/cgame/campaign/cp_team_callbacks.cpp \
client/cgame/campaign/cp_time.cpp \
client/cgame/campaign/cp_xvi.cpp \
client/cgame/campaign/cp_alienbase.cpp \
client/cgame/campaign/cp_aliencont.cpp \
client/cgame/campaign/cp_aliencont_callbacks.cpp \
client/cgame/campaign/cp_auto_mission.cpp \
client/cgame/campaign/cp_mission_callbacks.cpp \
client/cgame/campaign/cp_airfight.cpp \
client/cgame/campaign/cp_campaign.cpp \
client/cgame/campaign/cp_event.cpp \
client/cgame/campaign/cp_employee.cpp \
client/cgame/campaign/cp_employee_callbacks.cpp \
client/cgame/campaign/cp_installation.cpp \
client/cgame/campaign/cp_installation_callbacks.cpp \
client/cgame/campaign/cp_market.cpp \
client/cgame/campaign/cp_market_callbacks.cpp \
client/cgame/campaign/cp_map.cpp \
client/cgame/campaign/cp_mapfightequip.cpp \
client/cgame/campaign/cp_nation.cpp \
client/cgame/campaign/cp_produce.cpp \
client/cgame/campaign/cp_produce_callbacks.cpp \
client/cgame/campaign/cp_radar.cpp \
client/cgame/campaign/cp_research.cpp \
client/cgame/campaign/cp_research_callbacks.cpp \
client/cgame/campaign/cp_save.cpp \
client/cgame/campaign/cp_statistics.cpp \
client/cgame/campaign/cp_transfer.cpp \
client/cgame/campaign/cp_transfer_callbacks.cpp \
client/cgame/campaign/cp_ufo.cpp \
client/cgame/campaign/cp_ufopedia.cpp \
client/cgame/campaign/cp_uforecovery.cpp \
client/cgame/campaign/cp_uforecovery_callbacks.cpp \
client/cgame/campaign/cp_messageoptions.cpp \
client/cgame/campaign/cp_messageoptions_callbacks.cpp \
client/cgame/campaign/cp_overlay.cpp \
client/cgame/campaign/cp_popup.cpp \
client/cgame/campaign/cp_fightequip_callbacks.cpp \
\
client/cgame/campaign/missions/cp_mission_baseattack.c \
client/cgame/campaign/missions/cp_mission_buildbase.c \
client/cgame/campaign/missions/cp_mission_harvest.c \
client/cgame/campaign/missions/cp_mission_intercept.c \
client/cgame/campaign/missions/cp_mission_recon.c \
client/cgame/campaign/missions/cp_mission_rescue.c \
client/cgame/campaign/missions/cp_mission_supply.c \
client/cgame/campaign/missions/cp_mission_terror.c \
client/cgame/campaign/missions/cp_mission_xvi.c
client/cgame/campaign/missions/cp_mission_baseattack.cpp \
client/cgame/campaign/missions/cp_mission_buildbase.cpp \
client/cgame/campaign/missions/cp_mission_harvest.cpp \
client/cgame/campaign/missions/cp_mission_intercept.cpp \
client/cgame/campaign/missions/cp_mission_recon.cpp \
client/cgame/campaign/missions/cp_mission_rescue.cpp \
client/cgame/campaign/missions/cp_mission_supply.cpp \
client/cgame/campaign/missions/cp_mission_terror.cpp \
client/cgame/campaign/missions/cp_mission_xvi.cpp

ifneq ($(HARD_LINKED_CGAME),1)
$(TARGET)_SRCS += shared/mathlib.c \
shared/shared.c \
shared/utf8.c \
shared/parse.c \
shared/infostring.c \
$(TARGET)_SRCS += shared/mathlib.cpp \
shared/shared.cpp \
shared/utf8.cpp \
shared/parse.cpp \
shared/infostring.cpp \
\
game/q_shared.c \
game/chr_shared.c \
game/inv_shared.c \
game/inventory.c
game/q_shared.cpp \
game/chr_shared.cpp \
game/inv_shared.cpp \
game/inventory.cpp
else
$(TARGET)_IGNORE := yes
endif
Expand Down
24 changes: 12 additions & 12 deletions build/modules/cgame-multiplayer.mk
Expand Up @@ -12,21 +12,21 @@ $(TARGET)_LDFLAGS += $(SO_LDFLAGS) $(MXML_LIBS) -lm
$(TARGET)_FILE := base/$(TARGET).$(SO_EXT)

$(TARGET)_SRCS = \
client/cgame/multiplayer/cl_game_multiplayer.c \
client/cgame/multiplayer/mp_callbacks.c \
client/cgame/multiplayer/mp_serverlist.c
client/cgame/multiplayer/cl_game_multiplayer.cpp \
client/cgame/multiplayer/mp_callbacks.cpp \
client/cgame/multiplayer/mp_serverlist.cpp

ifneq ($(HARD_LINKED_CGAME),1)
$(TARGET)_SRCS += shared/mathlib.c \
shared/shared.c \
shared/utf8.c \
shared/parse.c \
shared/infostring.c \
$(TARGET)_SRCS += shared/mathlib.cpp \
shared/shared.cpp \
shared/utf8.cpp \
shared/parse.cpp \
shared/infostring.cpp \
\
game/q_shared.c \
game/chr_shared.c \
game/inv_shared.c \
game/inventory.c
game/q_shared.cpp \
game/chr_shared.cpp \
game/inv_shared.cpp \
game/inventory.cpp
else
$(TARGET)_IGNORE := yes
endif
Expand Down
20 changes: 10 additions & 10 deletions build/modules/cgame-skirmish.mk
Expand Up @@ -12,19 +12,19 @@ $(TARGET)_LDFLAGS += $(SO_LDFLAGS) $(MXML_LIBS) -lm
$(TARGET)_FILE := base/$(TARGET).$(SO_EXT)

$(TARGET)_SRCS = \
client/cgame/skirmish/cl_game_skirmish.c
client/cgame/skirmish/cl_game_skirmish.cpp

ifneq ($(HARD_LINKED_CGAME),1)
$(TARGET)_SRCS += shared/mathlib.c \
shared/shared.c \
shared/utf8.c \
shared/parse.c \
shared/infostring.c \
$(TARGET)_SRCS += shared/mathlib.cpp \
shared/shared.cpp \
shared/utf8.cpp \
shared/parse.cpp \
shared/infostring.cpp \
\
game/q_shared.c \
game/chr_shared.c \
game/inv_shared.c \
game/inventory.c
game/q_shared.cpp \
game/chr_shared.cpp \
game/inv_shared.cpp \
game/inventory.cpp
else
$(TARGET)_IGNORE := yes
endif
Expand Down
26 changes: 13 additions & 13 deletions build/modules/cgame-staticcampaign.mk
Expand Up @@ -12,23 +12,23 @@ $(TARGET)_LDFLAGS += $(SO_LDFLAGS) $(MXML_LIBS) -lm
$(TARGET)_FILE := base/$(TARGET).$(SO_EXT)

$(TARGET)_SRCS = \
client/cgame/staticcampaign/cl_game_staticcampaign.c \
client/cgame/staticcampaign/scp_missions.c \
client/cgame/staticcampaign/scp_parse.c
client/cgame/staticcampaign/cl_game_staticcampaign.cpp \
client/cgame/staticcampaign/scp_missions.cpp \
client/cgame/staticcampaign/scp_parse.cpp

ifneq ($(HARD_LINKED_CGAME),1)
$(TARGET)_SRCS += shared/mathlib.c \
shared/shared.c \
shared/utf8.c \
shared/parse.c \
shared/infostring.c \
$(TARGET)_SRCS += shared/mathlib.cpp \
shared/shared.cpp \
shared/utf8.cpp \
shared/parse.cpp \
shared/infostring.cpp \
\
common/binaryexpressionparser.c \
common/binaryexpressionparser.cpp \
\
game/q_shared.c \
game/chr_shared.c \
game/inv_shared.c \
game/inventory.c \
game/q_shared.cpp \
game/chr_shared.cpp \
game/inv_shared.cpp \
game/inventory.cpp \
\
$(cgame-campaign_SRCS)
else
Expand Down

0 comments on commit 48fd7b8

Please sign in to comment.