Skip to content

Commit e35a311

Browse files
committed
Merge pull request OpenXcom#1003 from myk002/dual_boot
Master and mod metadata support, dir structure reorg may god have mercy on us all. mod format and data folder structure have changed drastically. details will be listed here: http://openxcom.org/forum/index.php/topic,3617.0.html
2 parents a15a625 + 31dd36e commit e35a311

218 files changed

Lines changed: 2367 additions & 1092 deletions

File tree

Some content is hidden

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

.gitignore

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,26 @@ _ReSharper.*/
6262
*.tmp
6363
*.dgml
6464
#OpenXcom stuff (no ending slashes for dirs so symlinks can be ignored as well as real dirs)
65-
bin/data/GEODATA
66-
bin/data/GEOGRAPH
67-
bin/data/MAPS
68-
bin/data/ROUTES
69-
bin/data/SOUND
70-
bin/data/TERRAIN
71-
bin/data/UFOGRAPH
72-
bin/data/UFOINTRO
73-
bin/data/UNITS
74-
bin/data/ANIMS
75-
bin/data/FLOP_INT
65+
bin/UFO/GEODATA
66+
bin/UFO/GEOGRAPH
67+
bin/UFO/MAPS
68+
bin/UFO/ROUTES
69+
bin/UFO/SOUND
70+
bin/UFO/TERRAIN
71+
bin/UFO/UFOGRAPH
72+
bin/UFO/UFOINTRO
73+
bin/UFO/UNITS
74+
bin/TFTD/ANIMS
75+
bin/TFTD/FLOP_INT
76+
bin/TFTD/GEODATA
77+
bin/TFTD/GEOGRAPH
78+
bin/TFTD/MAPS
79+
bin/TFTD/MISSDAT
80+
bin/TFTD/ROUTES
81+
bin/TFTD/SOUND
82+
bin/TFTD/TERRAIN
83+
bin/TFTD/UFOGRAPH
84+
bin/TFTD/UNITS
7685
deps/
7786
docs/html/
7887
build/

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ if ( BUILD_PACKAGE )
132132
set ( CPACK_PACKAGE_VENDOR "The OpenXcom project" )
133133
set ( CPACK_PACKAGE_DESCRIPTION_SUMMARY "Open-source clone of UFO: Enemy Unknown" )
134134
set ( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/cmake/modules/Description.txt" )
135-
set ( CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.txt" )
135+
set ( CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.md" )
136136
if ( NOT APPLE )
137137
set ( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.txt" )
138138
endif ()

0 commit comments

Comments
 (0)