Skip to content

Commit

Permalink
Normalised line endings
Browse files Browse the repository at this point in the history
  • Loading branch information
Deltafire committed Nov 9, 2013
1 parent 8d504af commit 58e710e
Show file tree
Hide file tree
Showing 49 changed files with 3,982 additions and 3,981 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* text=auto
14 changes: 7 additions & 7 deletions platforms/android/project/.classpath
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="output" path="bin"/>
</classpath>
66 changes: 33 additions & 33 deletions platforms/android/project/.project
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>DemoActivity</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.android.ide.eclipse.adt.ApkBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>DemoActivity</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.android.ide.eclipse.adt.ApkBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
44 changes: 22 additions & 22 deletions platforms/android/project/gen/org/milkytracker/R.java
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* aapt tool from the resource data it found. It
* should not be modified by hand.
*/

package org.milkytracker;

public final class R {
public static final class attr {
}
public static final class layout {
public static final int main=0x7f020000;
}
public static final class raw {
public static final int milky=0x7f030000;
}
public static final class string {
public static final int app_name=0x7f040000;
}
}
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* aapt tool from the resource data it found. It
* should not be modified by hand.
*/

package org.milkytracker;

public final class R {
public static final class attr {
}
public static final class layout {
public static final int main=0x7f020000;
}
public static final class raw {
public static final int milky=0x7f030000;
}
public static final class string {
public static final int app_name=0x7f040000;
}
}
38 changes: 19 additions & 19 deletions platforms/haiku/Add_Jamfiles.sh
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
#!/bin/bash

MILKY_ROOT="../.."

echo "Copying Jamfiles..."

cp Jamfiles/Jamfile $MILKY_ROOT
cp Jamfiles/Jamrules $MILKY_ROOT
cp Jamfiles/src-compression-Jamfile $MILKY_ROOT/src/compression/Jamfile
cp Jamfiles/src-compression-zzlib-generic-Jamfile $MILKY_ROOT/src/compression/zziplib/generic/Jamfile
cp Jamfiles/src-fx-Jamfile $MILKY_ROOT/src/fx/Jamfile
cp Jamfiles/src-midi-Jamfile $MILKY_ROOT/src/midi/Jamfile
cp Jamfiles/src-milkyplay-Jamfile $MILKY_ROOT/src/milkyplay/Jamfile
cp Jamfiles/src-ppui-Jamfile $MILKY_ROOT/src/ppui/Jamfile
cp Jamfiles/src-ppui-osinterface-Jamfile $MILKY_ROOT/src/ppui/osinterface/Jamfile
cp Jamfiles/src-tracker-Jamfile $MILKY_ROOT/src/tracker/Jamfile
cp Jamfiles/src-tracker-haiku-MilkySettings-Jamfile $MILKY_ROOT/src/tracker/haiku/MilkySettings/Jamfile

echo "Done!"
#!/bin/bash

MILKY_ROOT="../.."

echo "Copying Jamfiles..."

cp Jamfiles/Jamfile $MILKY_ROOT
cp Jamfiles/Jamrules $MILKY_ROOT
cp Jamfiles/src-compression-Jamfile $MILKY_ROOT/src/compression/Jamfile
cp Jamfiles/src-compression-zzlib-generic-Jamfile $MILKY_ROOT/src/compression/zziplib/generic/Jamfile
cp Jamfiles/src-fx-Jamfile $MILKY_ROOT/src/fx/Jamfile
cp Jamfiles/src-midi-Jamfile $MILKY_ROOT/src/midi/Jamfile
cp Jamfiles/src-milkyplay-Jamfile $MILKY_ROOT/src/milkyplay/Jamfile
cp Jamfiles/src-ppui-Jamfile $MILKY_ROOT/src/ppui/Jamfile
cp Jamfiles/src-ppui-osinterface-Jamfile $MILKY_ROOT/src/ppui/osinterface/Jamfile
cp Jamfiles/src-tracker-Jamfile $MILKY_ROOT/src/tracker/Jamfile
cp Jamfiles/src-tracker-haiku-MilkySettings-Jamfile $MILKY_ROOT/src/tracker/haiku/MilkySettings/Jamfile

echo "Done!"
48 changes: 24 additions & 24 deletions platforms/haiku/Jamfiles/src-compression-Jamfile
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
SubDir TOP src compression ;
SubDirHdrs $(PathCompression) lha ;
SubDirHdrs $(PathMilkyPlay) ;
SubDirHdrs $(PathOSInterface) posix ;
SubDirHdrs $(PathPPUI) ;
SubDirHdrs $(PathZZIP) ;
SubDirHdrs - ;
SubDirHdrs $(PathZZIP) generic ;
Library libcompression :
Decompressor.cpp
DecompressorGZIP.cpp
DecompressorLHA.cpp
DecompressorLZX.cpp
DecompressorPP20.cpp
DecompressorUMX.cpp
DecompressorZIP.cpp
PP20.cpp
unlzx.cpp
ZipExtractor.cpp
lha/unlha.cpp
zziplib/MyIO.cpp
;
SubDir TOP src compression ;

SubDirHdrs $(PathCompression) lha ;
SubDirHdrs $(PathMilkyPlay) ;
SubDirHdrs $(PathOSInterface) posix ;
SubDirHdrs $(PathPPUI) ;
SubDirHdrs $(PathZZIP) ;
SubDirHdrs - ;
SubDirHdrs $(PathZZIP) generic ;

Library libcompression :
Decompressor.cpp
DecompressorGZIP.cpp
DecompressorLHA.cpp
DecompressorLZX.cpp
DecompressorPP20.cpp
DecompressorUMX.cpp
DecompressorZIP.cpp
PP20.cpp
unlzx.cpp
ZipExtractor.cpp
lha/unlha.cpp
zziplib/MyIO.cpp
;
30 changes: 15 additions & 15 deletions platforms/haiku/Jamfiles/src-compression-zzlib-generic-Jamfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
SubDir TOP src compression zziplib generic ;
SubDirHdrs $(PathZZIP) ;
Library libzzip :
dir.cpp
err.cpp
fetch.cpp
file.cpp
fseeko.cpp
info.cpp
plugin.cpp
stat.cpp
zip.cpp
;
SubDir TOP src compression zziplib generic ;

SubDirHdrs $(PathZZIP) ;

Library libzzip :
dir.cpp
err.cpp
fetch.cpp
file.cpp
fseeko.cpp
info.cpp
plugin.cpp
stat.cpp
zip.cpp
;
52 changes: 26 additions & 26 deletions platforms/haiku/Jamfiles/src-fx-Jamfile
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
SubDir TOP src fx ;
SubDirHdrs $(PathOSInterface) posix ;
SubDirHdrs $(PathPPUI) ;
SubDirHdrs - ;
Library libfx :
Camera.cpp
Filter.cpp
Fire.cpp
fpmath.cpp
Math3d.cpp
ParticleBlobs.cpp
ParticleEmitter.cpp
ParticleFun.cpp
ParticleFX.cpp
ParticleScene.cpp
Starfield.cpp
TCBSpline.cpp
TCBSplineTest.cpp
Texture.cpp
TexturedGrid.cpp
TexturedPlane.cpp
Twister.cpp
TwisterFX.cpp
;
SubDir TOP src fx ;

SubDirHdrs $(PathOSInterface) posix ;
SubDirHdrs $(PathPPUI) ;
SubDirHdrs - ;

Library libfx :
Camera.cpp
Filter.cpp
Fire.cpp
fpmath.cpp
Math3d.cpp
ParticleBlobs.cpp
ParticleEmitter.cpp
ParticleFun.cpp
ParticleFX.cpp
ParticleScene.cpp
Starfield.cpp
TCBSpline.cpp
TCBSplineTest.cpp
Texture.cpp
TexturedGrid.cpp
TexturedPlane.cpp
Twister.cpp
TwisterFX.cpp
;
30 changes: 15 additions & 15 deletions platforms/haiku/Jamfiles/src-midi-Jamfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
SubDir TOP src midi ;
SubDirHdrs $(PathTracker) ;
SubDirHdrs $(PathMidi) ;
SubDirHdrs $(PathMidi) haiku ;
SubDirHdrs $(PathMilkyPlay) ;
SubDirHdrs $(PathOSInterface) posix ;
SubDirHdrs $(PathPPUI) ;
SubDirHdrs - ;
Library libmidi :
# --- Haiku specific ---
haiku/MilkyMidiConsumer.cpp
haiku/MidiSetup.cpp
;
SubDir TOP src midi ;

SubDirHdrs $(PathTracker) ;
SubDirHdrs $(PathMidi) ;
SubDirHdrs $(PathMidi) haiku ;
SubDirHdrs $(PathMilkyPlay) ;
SubDirHdrs $(PathOSInterface) posix ;
SubDirHdrs $(PathPPUI) ;
SubDirHdrs - ;

Library libmidi :
# --- Haiku specific ---
haiku/MilkyMidiConsumer.cpp
haiku/MidiSetup.cpp
;
Loading

0 comments on commit 58e710e

Please sign in to comment.