Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add windows-x86_64 build to liquidfun #536

Merged
merged 7 commits into from
Oct 1, 2018
Merged

Add windows-x86_64 build to liquidfun #536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
894acb5
Add windows-x86_64 build to liquidfun
nornagon Mar 6, 2018
066296a
trim appveyor/travis for faster turnaround
nornagon Mar 19, 2018
084851b
Add liquidfun on windows_x86_64 to pom.xml
nornagon Mar 19, 2018
1336d8a
Try using cmake to generate an MSVC project
nornagon Mar 21, 2018
c99d690
[liquidfun] Set MSVC warning verison to 17
nornagon Mar 31, 2018
61d13b0
Merge branch 'master' into lf-windows
saudet Oct 1, 2018
b73a6b9
Fix build for LiquidFun on Windows
saudet Oct 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ environment:
OS: windows-x86
- PROJ: "ale"
OS: windows-x86
- PROJ: "liquidfun"
OS: windows-x86
- PROJ: "systems"
OS: windows-x86

Expand Down Expand Up @@ -106,6 +108,8 @@ environment:
OS: windows-x86_64
- PROJ: "ale"
OS: windows-x86_64
- PROJ: "liquidfun"
OS: windows-x86_64
- PROJ: "systems"
OS: windows-x86_64

Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

* Add support for Windows to presets for LiquidFun ([pull #536](https://github.com/bytedeco/javacpp-presets/pull/536))
* Add CUDA-enabled build for MXNet via `-gpu` extension ([pull #609](https://github.com/bytedeco/javacpp-presets/pull/609))
* Prevent MKL-DNN from compiling code with `-march=native` ([pull #618](https://github.com/bytedeco/javacpp-presets/pull/618))
* Add an RPATH to `libmkldnn.so.0` to avoid loading issues on Linux ([issue deeplearning4j/deeplearning4j#6366](https://github.com/deeplearning4j/deeplearning4j/issues/6366))
Expand Down
20 changes: 18 additions & 2 deletions liquidfun/cppbuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,32 @@ cd liquidfun-$LIQUIDFUN_VERSION
case $PLATFORM in
linux-x86)
cd liquidfun/Box2D
CC="$OLDCC -m32" CXX="$OLDCXX -m32" $CMAKE -DBOX2D_INSTALL=ON -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH -DBOX2D_BUILD_SHARED=ON -DBOX2D_BUILD_EXAMPLES=OFF -DBOX2D_BUILD_UNITTESTS=OFF
CC="gcc -m32" CXX="g++ -m32" $CMAKE -DBOX2D_INSTALL=ON -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH -DBOX2D_BUILD_SHARED=ON -DBOX2D_BUILD_EXAMPLES=OFF -DBOX2D_BUILD_UNITTESTS=OFF
make -j $MAKEJ
make install/strip
;;
linux-x86_64)
cd liquidfun/Box2D
CC="$OLDCC -m64" CXX="$OLDCXX -m64" $CMAKE -DBOX2D_INSTALL=ON -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH -DBOX2D_BUILD_SHARED=ON -DBOX2D_BUILD_EXAMPLES=OFF -DBOX2D_BUILD_UNITTESTS=OFF
CC="gcc -m64" CXX="g++ -m64" $CMAKE -DBOX2D_INSTALL=ON -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH -DBOX2D_BUILD_SHARED=ON -DBOX2D_BUILD_EXAMPLES=OFF -DBOX2D_BUILD_UNITTESTS=OFF
make -j $MAKEJ
make install/strip
;;
windows-x86)
cd liquidfun/Box2D
CXXFLAGS="/Wv:17" $CMAKE -G "Visual Studio 14 2015" -DBOX2D_INSTALL=ON -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH -DBOX2D_BUILD_SHARED=ON -DBOX2D_BUILD_EXAMPLES=OFF -DBOX2D_BUILD_UNITTESTS=OFF
MSBuild.exe Box2D.sln //p:Configuration=Release //maxcpucount:$MAKEJ
cp -r Box2D $INSTALL_PATH/include
cp Box2D/Release/*.lib $INSTALL_PATH/lib
cp Box2D/Release/*.dll $INSTALL_PATH/bin
;;
windows-x86_64)
cd liquidfun/Box2D
CXXFLAGS="/Wv:17" $CMAKE -G "Visual Studio 14 2015 Win64" -DBOX2D_INSTALL=ON -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH -DBOX2D_BUILD_SHARED=ON -DBOX2D_BUILD_EXAMPLES=OFF -DBOX2D_BUILD_UNITTESTS=OFF
MSBuild.exe Box2D.sln //p:Configuration=Release //maxcpucount:$MAKEJ
cp -r Box2D $INSTALL_PATH/include
cp Box2D/Release/*.lib $INSTALL_PATH/lib
cp Box2D/Release/*.dll $INSTALL_PATH/bin
;;
macosx-*)
patch -Np1 <$INSTALL_PATH/../../liquidfun-macosx.patch
cd liquidfun/Box2D
Expand Down
14 changes: 13 additions & 1 deletion liquidfun/platform/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,18 @@
<version>${project.version}</version>
<classifier>${javacpp.platform.macosx-x86_64}</classifier>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>${javacpp.moduleId}</artifactId>
<version>${project.version}</version>
<classifier>${javacpp.platform.windows-x86}</classifier>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>${javacpp.moduleId}</artifactId>
<version>${project.version}</version>
<classifier>${javacpp.platform.windows-x86_64}</classifier>
</dependency>
</dependencies>

<build>
Expand All @@ -55,7 +67,7 @@
<configuration>
<archive>
<manifestEntries>
<Class-Path>${javacpp.moduleId}.jar ${javacpp.moduleId}-linux-x86.jar ${javacpp.moduleId}-linux-x86_64.jar ${javacpp.moduleId}-macosx-x86_64.jar</Class-Path>
<Class-Path>${javacpp.moduleId}.jar ${javacpp.moduleId}-linux-x86.jar ${javacpp.moduleId}-linux-x86_64.jar ${javacpp.moduleId}-macosx-x86_64.jar ${javacpp.moduleId}-windows-x86.jar ${javacpp.moduleId}-windows-x86_64.jar</Class-Path>
</manifestEntries>
</archive>
</configuration>
Expand Down
16 changes: 0 additions & 16 deletions liquidfun/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@
<packaging>jar</packaging>
<name>JavaCPP Presets for LiquidFun</name>

<properties>
<javacpp.platform.oldcompiler>${javacpp.platform.compiler}</javacpp.platform.oldcompiler>
</properties>

<dependencies>
<dependency>
<groupId>org.bytedeco</groupId>
Expand All @@ -37,18 +33,6 @@
<plugin>
<groupId>org.bytedeco</groupId>
<artifactId>javacpp</artifactId>
<configuration>
<propertyKeysAndValues>
<property>
<name>platform.root</name>
<value>${javacpp.platform.root}</value>
</property>
<property>
<name>platform.compiler</name>
<value>${javacpp.platform.oldcompiler}</value>
</property>
</propertyKeysAndValues>
</configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion liquidfun/src/main/java/org/bytedeco/javacpp/liquidfun.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.javacpp;

Expand Down
2 changes: 1 addition & 1 deletion liquidfun/src/main/java/org/bytedeco/javacpp/presets/liquidfun.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
*/

@Properties(target = "org.bytedeco.javacpp.liquidfun", value = {
@Platform(value = {"linux-x86", "macosx"},
@Platform(value = {"linux-x86", "macosx", "windows-x86"},
define = "LIQUIDFUN_EXTERNAL_LANGUAGE_API 1",
include = {"<Box2D/Common/b2Settings.h>",
"<Box2D/Common/b2Math.h>",
Expand Down
2 changes: 2 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1287,6 +1287,7 @@
<module>leptonica</module>
<module>tesseract</module>
<module>ale</module>
<module>liquidfun</module>
<module>systems</module>
</modules>
<properties>
Expand Down Expand Up @@ -1346,6 +1347,7 @@
<module>cuda</module>
<module>tensorflow</module>
<module>ale</module>
<module>liquidfun</module>
<module>systems</module>
</modules>
<properties>
Expand Down