rik/jlibloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use _WIN32 to detect if building for Windows.

Browse Source
This commit is contained in:
Adam Murdoch
2014-03-15 16:13:53 +11:00
parent 9f18c944b8
commit d90112d086
5 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle
View File

@@ -130,7 +130,6 @@ libraries {
} else if (targetPlatform.operatingSystem.windows) { } else if (targetPlatform.operatingSystem.windows) {
cppCompiler.args "-I${org.gradle.internal.jvm.Jvm.current().javaHome}/include" cppCompiler.args "-I${org.gradle.internal.jvm.Jvm.current().javaHome}/include"
cppCompiler.args "-I${org.gradle.internal.jvm.Jvm.current().javaHome}/include/win32" cppCompiler.args "-I${org.gradle.internal.jvm.Jvm.current().javaHome}/include/win32"
cppCompiler.define("WIN32")
linker.args "Shlwapi.lib", "Advapi32.lib" linker.args "Shlwapi.lib", "Advapi32.lib"
} else if (targetPlatform.operatingSystem.freeBSD) { } else if (targetPlatform.operatingSystem.freeBSD) {
cppCompiler.args '-I', "${org.gradle.internal.jvm.Jvm.current().javaHome}/include" cppCompiler.args '-I', "${org.gradle.internal.jvm.Jvm.current().javaHome}/include"

2
src/curses/cpp/curses.cpp
View File

@@ -17,7 +17,7 @@
/* /*
* Curses functions * Curses functions
*/ */
#ifndef WIN32 #ifndef _WIN32
#include "native.h" #include "native.h"
#include "generic.h" #include "generic.h"

2
src/main/cpp/posix.cpp
View File

@@ -17,7 +17,7 @@
/* /*
* POSIX platform functions. * POSIX platform functions.
*/ */
#ifndef WIN32 #ifndef _WIN32
#include "native.h" #include "native.h"
#include "generic.h" #include "generic.h"

2
src/main/cpp/win.cpp
View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#ifdef WIN32 #ifdef _WIN32
#include "native.h" #include "native.h"
#include "generic.h" #include "generic.h"

2
src/shared/cpp/generic_posix.cpp
View File

@@ -17,7 +17,7 @@
/* /*
* POSIX platform functions. * POSIX platform functions.
*/ */
#ifndef WIN32 #ifndef _WIN32
#include "native.h" #include "native.h"
#include "generic.h" #include "generic.h"