Skip to content

Commit

Permalink
feat(releases): Drop some useless stuff and make some other important…
Browse files Browse the repository at this point in the history
… stuff more explicit
  • Loading branch information
dwatteau committed Feb 9, 2021
1 parent c8e495b commit a1ab81e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions releases/Dockerfile.linux86
@@ -1,4 +1,4 @@
# Linux x86 and x86-64 builds, with an older glibc version for maximum
# Linux x86 and x86-64 builds, with glibc 2.12 and g++ 4.4 for maximum
# compatibility.

FROM centos:6.10
Expand All @@ -17,12 +17,12 @@ RUN mkdir -p /scummtr/project /scummtr/build /scummtr/output
WORKDIR /scummtr

CMD cd /scummtr/build \
&& cmake3 -DCMAKE_C_FLAGS="-m64" -DCMAKE_CXX_FLAGS="-m64" /scummtr/project \
&& cmake3 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_CXX_FLAGS="-m64" /scummtr/project \
&& make VERBOSE=1 \
&& cp -pR . /scummtr/output/linux-x64 \
\
&& rm -rf /scummtr/build/* \
\
&& cmake3 -DCMAKE_C_FLAGS="-m32" -DCMAKE_CXX_FLAGS="-m32" /scummtr/project \
&& cmake3 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_CXX_FLAGS="-m32" /scummtr/project \
&& make VERBOSE=1 \
&& cp -pR . /scummtr/output/linux-x86
2 changes: 1 addition & 1 deletion releases/Dockerfile.win32
Expand Up @@ -10,6 +10,6 @@ RUN mkdir -p /scummtr/project /scummtr/build /scummtr/output
WORKDIR /scummtr

CMD cd /scummtr/build \
&& cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_C_COMPILER=i686-w64-mingw32-gcc -DCMAKE_CXX_COMPILER=i686-w64-mingw32-g++ -DCMAKE_C_FLAGS="-DWINVER=0x0501 -D_WIN32_WINNT=0x0501" -DCMAKE_CXX_FLAGS="-DWINVER=0x0501 -D_WIN32_WINNT=0x0501" -DCMAKE_EXE_LINKER_FLAGS="-static-libgcc -static-libstdc++ -static" /scummtr/project \
&& cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_CXX_COMPILER=i686-w64-mingw32-g++ -DCMAKE_CXX_FLAGS="-DWINVER=0x0501 -D_WIN32_WINNT=0x0501" -DCMAKE_EXE_LINKER_FLAGS="-static-libgcc -static-libstdc++ -static" /scummtr/project \
&& make VERBOSE=1 \
&& cp -pR . /scummtr/output/win32

0 comments on commit a1ab81e

Please sign in to comment.