Skip to content

Commit 617fd6a

Browse files
committed
Merge pull request #519 from chief1983/project_removal_201601
Project removal 2016-01
2 parents 17c6b7c + aa0de45 commit 617fd6a

Some content is hidden

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

72 files changed

+304
-32754
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ install-sh
2424
missing
2525
.svn
2626
*.layout
27-
projects/Xcode4/Frameworks/
2827
projects/Xcode/Frameworks/
2928

3029
#========

Makefile.am

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,6 @@ SUBDIRS = mongoose code
99

1010
EXTRA_DIST = \
1111
FS2OpenSCPReadMe.doc \
12-
projects/MSVC_2005/Freespace2.sln \
13-
projects/MSVC_2005/Freespace2.vcproj \
14-
projects/MSVC_2005/code.vcproj \
15-
projects/MSVC_6/Fred2.dsp \
16-
projects/MSVC_6/Freespace2.dsp \
17-
projects/MSVC_6/Freespace2.dsw \
18-
projects/MSVC_6/code.dsp \
19-
projects/MSVC_6/libjpeg.dsp \
20-
projects/MSVC_6/liblua.dsp \
21-
projects/MSVC_6/wxFRED2.dsp \
2212
projects/Xcode/English.lproj/InfoPlist.strings \
2313
projects/Xcode/FS2_Open.icns \
2414
projects/Xcode/FS2_Open.xcodeproj/project.pbxproj \

appveyor.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ environment:
55
- VisualStudioVersion: 10.0
66
PlatformToolset: v100
77
ProjectPath: projects/MSVC_2010/Freespace2.vcxproj
8-
- VisualStudioVersion: 11.0
9-
PlatformToolset: v110
10-
ProjectPath: projects/MSVC_2012/Freespace2.vcxproj
118
- VisualStudioVersion: 12.0
129
PlatformToolset: v120
1310
ProjectPath: projects/MSVC_2013/Freespace2.vcxproj
11+
- VisualStudioVersion: 14.0
12+
PlatformToolset: v140
13+
ProjectPath: projects/MSVC_2015/Freespace2.vcxproj
1414
build_script:
1515
- msbuild "%ProjectPath%" /p:Configuration="Debug SSE2" /m /p:PlatformToolset="%PlatformToolset%" /verbosity:minimal
1616
test: off

ci/travis/before_script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
1111

1212
./autogen.sh $AUTOGEN_CONFIG
1313
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
14-
cd projects/Xcode4
14+
cd projects/Xcode
1515
tar -xvzf Frameworks.tgz
1616
fi

ci/travis/script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
if [ "$TRAVIS_OS_NAME" = "linux" ]; then
44
make -j 4
55
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
6-
cd projects/Xcode4
6+
cd projects/Xcode
77
xcodebuild ARCHS=$MACOSX_ARCH ONLY_ACTIVE_ARCH=NO -configuration "$CONFIGURATION" | xcpretty -c
88
fi

0 commit comments

Comments
 (0)