drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 6 Activity

Upgrade Ox

Browse Source
This commit is contained in:
Gary Talent 2017-04-21 06:12:17 -05:00
parent 0231d48c91
commit df76f9eb2c
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Dockerfile
View File

@ -8,26 +8,31 @@ RUN dnf install -y qt5-devel llvm libasan
############################################################################### ###############################################################################
# Install Ox # Install Ox
RUN git clone -b release-0.2 https://github.com/wombatant/ox.git /usr/local/src/ox && \ RUN git clone https://github.com/wombatant/ox.git /usr/local/src/ox && \
cd /usr/local/src/ox && \ cd /usr/local/src/ox && \
git checkout -b install 7bce077ea81d7dbe10f7ba33eec0e061453f3f12
# setup build dirs # setup build dirs
mkdir -p \ RUN mkdir -p \
/usr/local/src/ox/build/release \ /usr/local/src/ox/build/release \
/usr/local/src/ox/build/windows \ /usr/local/src/ox/build/windows \
/usr/local/src/ox/build/gba; \ /usr/local/src/ox/build/gba;
# install Ox for native environment # install Ox for native environment
cd /usr/local/src/ox/build/release && \ RUN cd /usr/local/src/ox/build/release && \
cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ../../ && \ cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ../../ && \
make -j install; \ make -j install
# install Ox for GBA # install Ox for GBA
cd /usr/local/src/ox/build/gba && \ RUN cd /usr/local/src/ox/build/gba && \
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DCMAKE_TOOLCHAIN_FILE=cmake/Modules/GBA.cmake \ -DCMAKE_TOOLCHAIN_FILE=cmake/Modules/GBA.cmake \
-DCMAKE_INSTALL_PREFIX=/opt/devkitPro/devkitARM \ -DCMAKE_INSTALL_PREFIX=/opt/devkitPro/devkitARM \
-DOX_USE_STDLIB=OFF ../../ && \ -DOX_USE_STDLIB=OFF ../../ && \
make -j install; \ make -j install
# install Ox for Windows # install Ox for Windows
cd /usr/local/src/ox/build/windows && \ RUN cd /usr/local/src/ox/build/windows && \
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DCMAKE_TOOLCHAIN_FILE=cmake/Modules/Mingw.cmake \ -DCMAKE_TOOLCHAIN_FILE=cmake/Modules/Mingw.cmake \
-DCMAKE_INSTALL_PREFIX=/usr/x86_64-w64-mingw32 \ -DCMAKE_INSTALL_PREFIX=/usr/x86_64-w64-mingw32 \

2
Makefile
View File

@ -32,7 +32,7 @@ gdb: make
gdb ./build/current/src/wombat/wombat gdb ./build/current/src/wombat/wombat
devenv-build: devenv-build:
docker build --no-cache . -t ${DEVENV_IMAGE} docker build . -t ${DEVENV_IMAGE}
devenv: devenv:
docker run -d \ docker run -d \
-e LOCAL_USER_ID=$(shell id -u ${USER}) \ -e LOCAL_USER_ID=$(shell id -u ${USER}) \