diff options
author | Sven Gothel <[email protected]> | 2015-09-19 21:32:18 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2015-09-19 21:32:18 +0200 |
commit | b17ba1462cc4bb96be52f378dedafb50a3bc13f1 (patch) | |
tree | 1383d5f998fe6d1204c1b6833579fe2be3119858 | |
parent | 0ebc5398fa20d23214a37dc4930a1fa1617293c7 (diff) |
Bug 1219: Use Win32 API for test PE exe, not console
Previous test PE exe, commit 0ebc5398fa20d23214a37dc4930a1fa1617293c7,
was a console exe. A console exe opens a new console window
if not being launched from one.
New test PE exe is produced w/ '-mwindows', i.e. for Win32 API
w/o a console.
-rw-r--r-- | src/java/com/jogamp/common/util/IOUtil.java | 4 | ||||
-rw-r--r-- | src/java/com/jogamp/common/util/bin/exe-windows-i386-2048b.bin.305b.gz | bin | 305 -> 0 bytes | |||
-rwxr-xr-x | src/java/com/jogamp/common/util/bin/exe-windows-i386-2048b.bin.316b.gz | bin | 0 -> 316 bytes | |||
-rwxr-xr-x | src/native/tinype/make.bat | 1 | ||||
-rwxr-xr-x | src/native/tinype/make.sh | 4 | ||||
-rw-r--r-- | src/native/tinype/tiny.c | 2 | ||||
-rwxr-xr-x | src/native/tinype/tiny.exe | bin | 2048 -> 0 bytes | |||
-rwxr-xr-x | src/native/tinype/tiny.exe.gz | bin | 305 -> 0 bytes |
8 files changed, 8 insertions, 3 deletions
diff --git a/src/java/com/jogamp/common/util/IOUtil.java b/src/java/com/jogamp/common/util/IOUtil.java index 88b39e6..3ed28db 100644 --- a/src/java/com/jogamp/common/util/IOUtil.java +++ b/src/java/com/jogamp/common/util/IOUtil.java @@ -731,14 +731,14 @@ public class IOUtil { if( Platform.OSType.WINDOWS == PlatformPropsImpl.OS_TYPE && Platform.CPUFamily.X86 == PlatformPropsImpl.CPU_ARCH.family ) { - final int gzipSize = 305; + final int gzipSize = 316; final int codeSize = 2048; final byte[] code; synchronized ( exeTestBytesLock ) { byte[] _code; if( null == exeTestBytesRef || null == ( _code = exeTestBytesRef.get() ) ) { // code = getBytesFromRelFile(new byte[codeSize], "bin/exe-windows-i386-2048b.bin", codeSize, 0); - code = getBytesFromRelFile(new byte[codeSize], "bin/exe-windows-i386-2048b.bin.305b.gz", codeSize, gzipSize); + code = getBytesFromRelFile(new byte[codeSize], "bin/exe-windows-i386-2048b.bin.316b.gz", codeSize, gzipSize); exeTestBytesRef = new WeakReference<byte[]>(code); } else { code = _code; diff --git a/src/java/com/jogamp/common/util/bin/exe-windows-i386-2048b.bin.305b.gz b/src/java/com/jogamp/common/util/bin/exe-windows-i386-2048b.bin.305b.gz Binary files differdeleted file mode 100644 index 1444ae6..0000000 --- a/src/java/com/jogamp/common/util/bin/exe-windows-i386-2048b.bin.305b.gz +++ /dev/null diff --git a/src/java/com/jogamp/common/util/bin/exe-windows-i386-2048b.bin.316b.gz b/src/java/com/jogamp/common/util/bin/exe-windows-i386-2048b.bin.316b.gz Binary files differnew file mode 100755 index 0000000..e070061 --- /dev/null +++ b/src/java/com/jogamp/common/util/bin/exe-windows-i386-2048b.bin.316b.gz diff --git a/src/native/tinype/make.bat b/src/native/tinype/make.bat deleted file mode 100755 index 121e7ee..0000000 --- a/src/native/tinype/make.bat +++ /dev/null @@ -1 +0,0 @@ -c:\mingw\bin\gcc -nodefaultlibs -nostdlib -s -Os -o tiny.exe tiny.c
diff --git a/src/native/tinype/make.sh b/src/native/tinype/make.sh new file mode 100755 index 0000000..2a81c6b --- /dev/null +++ b/src/native/tinype/make.sh @@ -0,0 +1,4 @@ +/cygdrive/c/mingw/bin/gcc -nodefaultlibs -nostdlib -s -Os -mwindows -o tiny-win32-i386.exe tiny.c +gzip -9 -c tiny-win32-i386.exe > tiny-win32-i386.exe.gz +/cygdrive/c/mingw64/bin/gcc -nodefaultlibs -nostdlib -s -Os -mwindows -o tiny-win32-x86_64.exe tiny.c +gzip -9 -c tiny-win32-x86_64.exe > tiny-win32-x86_64.exe.gz diff --git a/src/native/tinype/tiny.c b/src/native/tinype/tiny.c index 4d645bf..80f9518 100644 --- a/src/native/tinype/tiny.c +++ b/src/native/tinype/tiny.c @@ -1,3 +1,5 @@ +// const char * id = "JogAmp Windows Universal Test PE Executable"; + int __main() { return 0; diff --git a/src/native/tinype/tiny.exe b/src/native/tinype/tiny.exe Binary files differdeleted file mode 100755 index 6191a27..0000000 --- a/src/native/tinype/tiny.exe +++ /dev/null diff --git a/src/native/tinype/tiny.exe.gz b/src/native/tinype/tiny.exe.gz Binary files differdeleted file mode 100755 index 1444ae6..0000000 --- a/src/native/tinype/tiny.exe.gz +++ /dev/null |