Skip to content

Commit 7c8d00e

Browse files
committed
Avoid conflict:
bin/data/Language/French.lng
2 parents 7d82dd0 + fa7fb2b commit 7c8d00e

85 files changed

Lines changed: 1910 additions & 960 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ option ( ENABLE_WARNING "Always show warnings (even for release builds)" OFF )
99
option ( FATAL_WARNING "Treat warnings as errors" OFF )
1010
set ( MSVC_WARNING_LEVEL 3 CACHE STRING "Visual Studio warning levels" )
1111
option ( FORCE_INSTALL_DATA_TO_BIN "Force installation of data to binary directory" OFF )
12+
set ( DATADIR "" CACHE STRING "Where to place datafiles" )
1213

1314
if ( WIN32 )
1415
set ( default_deps_dir "${CMAKE_SOURCE_DIR}/deps" )

Makefile.am

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,8 @@ openxcom_SOURCES = \
475475
src/Ruleset/MapData.h \
476476
src/Ruleset/MapDataSet.cpp \
477477
src/Ruleset/MapDataSet.h \
478+
src/Ruleset/MCDPatch.cpp \
479+
src/Ruleset/MCDPatch.h \
478480
src/Ruleset/AlienDeployment.cpp \
479481
src/Ruleset/AlienDeployment.h \
480482
src/Ruleset/AlienRace.cpp \
@@ -536,7 +538,7 @@ openxcom_SOURCES = \
536538
src/Savegame/CraftWeapon.cpp \
537539
src/Savegame/CraftWeapon.h \
538540
src/Savegame/CraftWeaponProjectile.cpp \
539-
src/Savegame/CraftWeaponProkectile.h \
541+
src/Savegame/CraftWeaponProjectile.h \
540542
src/Savegame/EquipmentLayoutItem.cpp \
541543
src/Savegame/EquipmentLayoutItem.h \
542544
src/Savegame/GameTime.cpp \

0 commit comments

Comments
 (0)