d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

various packages: run `make cleanup-style`

This commit is contained in:
Tony Theodore 2014-10-29 21:09:07 +11:00
parent a063f823e8
commit e72ab4a659
10 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
index.html
View File

@ -2148,7 +2148,7 @@ local-pkg-list: $(LOCAL_PKG_LIST)</pre>
<tr>
<td class="package">qt3d</td>
<td class="website"><a href="http://qt-project.org/">Qt</a></td>
</tr>
</tr>
<tr>
<td class="package">qtactiveqt</td>
<td class="website"><a href="http://qt-project.org/">Qt</a></td>
@ -3073,9 +3073,9 @@ endef</pre>
<dt>2014-xx-xx &ndash; Release <span id="latest-version">2.23</span></dt>
<dd>
<p>
The <a href="#download">stable branch</a> was updated to the
current development version after a thorough <a
href="https://lists.nongnu.org/archive/html/mingw-cross-env-list/FIXME">testing
The <a href="#download">stable branch</a> was updated to the
current development version after a thorough <a
href="https://lists.nongnu.org/archive/html/mingw-cross-env-list/FIXME">testing
phase</a>.
</p>
@ -3100,28 +3100,28 @@ endef</pre>
</p>
<p>
Unfortunately, a number of factors have forced us to drop support
for MinGW 3 (i.e. "<a href="http://mingw.org/">MinGW.org</a>"),
in favor of the MinGW-w64 toolchain. This decision was made in a
large part because of the dropping of support for MinGW by <a
href="https://github.com/mxe/mxe/pull/453#issuecomment-51703048">
GLib</a> and <a
href="https://github.com/mxe/mxe/issues/492#issue-41366666">Qt5</a>,
which arguably are two of the most important packages in MXE.
Other considerations have also been taken, like the <a
href="https://github.com/mxe/mxe/pull/323#issuecomment-39463810">lack
of maintainership in MinGW</a> and <a
href="https://github.com/mxe/mxe/issues/400">potential legal
challenges</a> that comes with using supplemental DirectX
headers in MinGW in order to support Qt4. Worse yet, having to
support the unsupported MinGW toolchain impedes adding or
updating packages, as shown in the <a
href"https://github.com/mxe/mxe/pull/453#issuecomment-51703048">pull
Unfortunately, a number of factors have forced us to drop support
for MinGW 3 (i.e. "<a href="http://mingw.org/">MinGW.org</a>"),
in favor of the MinGW-w64 toolchain. This decision was made in a
large part because of the dropping of support for MinGW by <a
href="https://github.com/mxe/mxe/pull/453#issuecomment-51703048">
GLib</a> and <a
href="https://github.com/mxe/mxe/issues/492#issue-41366666">Qt5</a>,
which arguably are two of the most important packages in MXE.
Other considerations have also been taken, like the <a
href="https://github.com/mxe/mxe/pull/323#issuecomment-39463810">lack
of maintainership in MinGW</a> and <a
href="https://github.com/mxe/mxe/issues/400">potential legal
challenges</a> that comes with using supplemental DirectX
headers in MinGW in order to support Qt4. Worse yet, having to
support the unsupported MinGW toolchain impedes adding or
updating packages, as shown in the <a
href"https://github.com/mxe/mxe/pull/453#issuecomment-51703048">pull
request of updating GLib</a>.
</p>
<p>
Please note that dropping support for MinGW <strong>DOES NOT
Please note that dropping support for MinGW <strong>DOES NOT
MEAN</strong> dropping support for the 32-bit architecture. MinGW-w64
also supports 32-bit target through i686-w64-mingw32.
</p>

4
src/glib.mk
View File

@ -69,8 +69,8 @@ define $(PKG)_BUILD
# Detecting if these GLib tools are already available on host machine,
# either because of a host package installation or from an earlier MXE
# installation of GLib.
# If it is installed, we symlink it into the MXE bin/.
# If not, we build it.
# If it is installed, we symlink it into the MXE bin/.
# If not, we build it.
$(if $(findstring y,\
$(shell [ -x "`which glib-genmarshal`" ] && \
[ -x "`which glib-compile-schemas`" ] && \

2
src/intltool.mk
View File

@ -7,7 +7,7 @@ $(PKG)_CHECKSUM := 7fddbd8e1bf94adbf1bc947cbf3b8ddc2453f8ad
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := https://launchpad.net/intltool/trunk/$($(PKG)_VERSION)/+download/$($(PKG)_FILE)
$(PKG)_DEPS :=
$(PKG)_DEPS :=
define $(PKG)_UPDATE
$(WGET) -q -O- 'https://launchpad.net/intltool/+download' | \

2
src/libcaca.mk
View File

@ -20,7 +20,7 @@ endef
define $(PKG)_BUILD
cd '$(1)' && autoreconf -fi
$(if $(BUILD_STATIC), \
$(SED) -i 's/__declspec(dllimport)//' '$(1)/caca/caca.h'; \
$(SED) -i 's/__declspec(dllimport)//' '$(1)/caca/caca.h'; \
$(SED) -i 's/__declspec(dllimport)//' '$(1)/caca/caca0.h')
cd '$(1)' && ./configure \
$(MXE_CONFIGURE_OPTS) \

6
src/luabind-test.cpp
View File

@ -23,7 +23,7 @@ extern "C" int init(lua_State* L)
int main()
{
lua_State* L = luaL_newstate();
init(L);
luaL_dostring(L, "greet()");
lua_State* L = luaL_newstate();
init(L);
luaL_dostring(L, "greet()");
}

2
src/oce.mk
View File

@ -25,7 +25,7 @@ define $(PKG)_BUILD
-DOCE_INSTALL_BIN_DIR=$(PREFIX)/$(TARGET)/bin \
-DOCE_INSTALL_LIB_DIR=$(PREFIX)/$(TARGET)/lib \
-DOCE_INSTALL_CMAKE_DATA_DIR=$(PREFIX)/$(TARGET)/lib/cmake/OCE
$(MAKE) -C '$(1)' -j '$(JOBS)' install VERBOSE=1
cd '$(1)/examples/find_package_oce' && cmake . -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)'

4
src/qscintilla2.mk
View File

@ -25,8 +25,8 @@ define $(PKG)_BUILD
'$(TARGET)-g++' \
-W -Wall -Werror -std=c++0x -pedantic \
`'$(TARGET)-pkg-config' Qt5Widgets --cflags` \
`'$(TARGET)-pkg-config' Qt5Widgets --cflags` \
'$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-qscintilla2.exe' -lqscintilla2 \
`'$(TARGET)-pkg-config' Qt5Widgets --libs`
`'$(TARGET)-pkg-config' Qt5Widgets --libs`
endef

2
src/sdl_image.mk
View File

@ -38,7 +38,7 @@ define $(PKG)_BUILD
-W -Wall -Werror -ansi -pedantic \
'$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl_image.exe' \
`'$(TARGET)-pkg-config' SDL_image --cflags --libs`
mkdir -p '$(1)/cmake-build-test'
cp '$(2)-CMakeLists.txt' '$(1)/cmake-build-test/CMakeLists.txt'
cp '$(2).c' '$(1)/cmake-build-test/'

2
src/sdl_sound.mk
View File

@ -57,7 +57,7 @@ define $(PKG)_BUILD
-W -Wall -Werror -std=c99 -pedantic \
'$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl_sound.exe' \
`'$(TARGET)-pkg-config' SDL_sound --cflags --libs`
mkdir -p '$(1)/cmake-build-test'
cp '$(2)-CMakeLists.txt' '$(1)/cmake-build-test/CMakeLists.txt'
cp '$(2).c' '$(1)/cmake-build-test/'

2
src/vidstab-test.c
View File

@ -27,7 +27,7 @@ int main(int argc, char *argv[])
if (vsMotionDetectInit(&md, &conf, &fi) != VS_OK)
return 1;
vsMotionDetectionCleanup(&md);
return 0;