diff --git a/build/shared/launch4j/bin/README.txt b/build/shared/launch4j/bin/README.txt deleted file mode 100644 index 5346d1e28..000000000 --- a/build/shared/launch4j/bin/README.txt +++ /dev/null @@ -1,68 +0,0 @@ -The MinGW binutils for Mac OS were built on OS X 10.6 by Ben Fry. - -The 64-bit Linux version was built on Ubuntu 12.04. - -The other binaries come from the original downloads on SourceForge. - - -Ben Fry - - -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . - - -Mac OS X build instructions -12 November 2011 - -# Grab the launch4j download -wget http://downloads.sourceforge.net/launch4j/launch4j-3.0.2-macosx.tgz -tar xvfz launch4j-3.0.2-macosx.tgz -# Rename it so that we remember it's an Intel version -mv launch4j launch4j-3.0.2-macosx-intel - -# Find MinGW files here: http://sourceforge.net/projects/mingw/files/ -# Specifically this file: -wget http://downloads.sourceforge.net/mingw/binutils-2.19-src.tar.gz - -# To build the 32-bit version on Mac OS X -tar xvfz binutils-2.19-src.tar.gz -mv binutils-2.19 binutils-2.19-i386 -cd binutils-2.19-i386 -CXX='g++ -m32' CC='gcc -m32' CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32 ./configure --disable-werror --target=i686-pc-mingw32 --with-gnu-ld -make -# Lots of gibberish, followed by "make[1]: Nothing to be done for `all-target'." -# Files will be at ld/ld-new and binutils/windres -cd .. - -# Now build the 64-bit version -tar xvfz binutils-2.19-src.tar.gz -mv binutils-2.19 binutils-2.19-x64 -cd binutils-2.19-x64 -./configure --disable-werror --target=i686-pc-mingw32 -make -cd .. - -# Finally, merge the 32- and 64-bit versions together -lipo -create binutils-2.19-i386/ld/ld-new binutils-2.19-x64/ld/ld-new -output launch4j-3.0.2-macosx-intel/bin/ld -lipo -create binutils-2.19-i386/binutils/windres binutils-2.19-x64/binutils/windres -output launch4j-3.0.2-macosx-intel/bin/windres - - -. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . - - -Linux 64-bit build instructions -21 July 2012 - -# Find MinGW files here: http://sourceforge.net/projects/mingw/files/ - -wget http://downloads.sourceforge.net/mingw/binutils-2.19-src.tar.gz -tar xvfz binutils-2.19-src.tar.gz -cd binutils-2.19 -./configure --disable-werror --target=i686-pc-mingw32 -make -cd .. - -# Then copy them out -cp binutils-2.19/ld/ld-new ld-linux64 -cp binutils-2.19/binutils/windres windres-linux64 - diff --git a/build/shared/launch4j/bin/ld-linux32 b/build/shared/launch4j/bin/ld-linux32 index 1d3f4091d..2e2983e88 100755 Binary files a/build/shared/launch4j/bin/ld-linux32 and b/build/shared/launch4j/bin/ld-linux32 differ diff --git a/build/shared/launch4j/bin/ld-linux64 b/build/shared/launch4j/bin/ld-linux64 deleted file mode 100755 index 3b6f8944c..000000000 Binary files a/build/shared/launch4j/bin/ld-linux64 and /dev/null differ diff --git a/build/shared/launch4j/bin/ld-macosx b/build/shared/launch4j/bin/ld-macosx index 14bc7196b..3defcfa52 100755 Binary files a/build/shared/launch4j/bin/ld-macosx and b/build/shared/launch4j/bin/ld-macosx differ diff --git a/build/shared/launch4j/bin/windres-linux32 b/build/shared/launch4j/bin/windres-linux32 index a67a74be4..5b83b9349 100755 Binary files a/build/shared/launch4j/bin/windres-linux32 and b/build/shared/launch4j/bin/windres-linux32 differ diff --git a/build/shared/launch4j/bin/windres-linux64 b/build/shared/launch4j/bin/windres-linux64 deleted file mode 100755 index f8f0be94d..000000000 Binary files a/build/shared/launch4j/bin/windres-linux64 and /dev/null differ diff --git a/build/shared/launch4j/bin/windres-macosx b/build/shared/launch4j/bin/windres-macosx index 6a9822cc7..95405de0c 100755 Binary files a/build/shared/launch4j/bin/windres-macosx and b/build/shared/launch4j/bin/windres-macosx differ diff --git a/build/shared/launch4j/head/LICENSE.txt b/build/shared/launch4j/head/LICENSE.txt index 536488e61..c30f34a8e 100644 --- a/build/shared/launch4j/head/LICENSE.txt +++ b/build/shared/launch4j/head/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright (c) 2004, 2007 Grzegorz Kowal +Copyright (c) 2004, 2014 Grzegorz Kowal Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/build/shared/launch4j/head/head.o b/build/shared/launch4j/head/head.o index d595f9e78..32c147675 100644 Binary files a/build/shared/launch4j/head/head.o and b/build/shared/launch4j/head/head.o differ diff --git a/todo.txt b/todo.txt index dbedcf43a..4c69d5be7 100644 --- a/todo.txt +++ b/todo.txt @@ -25,7 +25,7 @@ X helpful fix contributed by David Fokkema high _ exported apps reporting as "damaged" on OS X _ https://github.com/processing/processing/issues/2095 -_ JNA conflicts can be avoided with a -D option +_ JNA conflicts can be avoided with "-Djna.nosys=true" _ https://github.com/processing/processing/issues/2239 X fix for Windows launchers X fix for Windows export