Commit Graph

161 Commits

Author SHA1 Message Date
Ethan Hugg
0bc0b71ef3 Rollup of Gecko Media Plugin patches 2014-06-17 19:54:16 -07:00
lingzhu
7818c4f30b Update platform-ios.mk 2014-06-09 09:22:54 +08:00
zhuling13
647182d67c remove comments 2014-06-08 18:12:21 -07:00
zhuling13
cb1c0f9b5a modify 2014-06-06 02:44:22 -07:00
zhuling13
d6ac7f4a60 add iosutdemo 2014-06-05 01:20:50 -07:00
zhuling13
6bf7ad4e2b and space to colon, modify bad note 2014-06-04 18:23:19 -07:00
zhuling13
b4c8f6b778 for cleaning .o and .d files generated by android demo 2014-06-02 20:21:10 -07:00
Martin Storsjö
3f982a4de4 Clarify a comment about MSVC parameters to fix building gtest
The temporary bug in gtest has now been fixed, but we still can keep
using the current way of fixing MSVC 2012 builds instead of switching
to the solution used previously.
2014-05-16 08:54:36 +03:00
Martin Storsjö
a6ad04cfdf Don't pass all MSVC specific cflags to gas-preprocessor and armasm
This avoids having to disambiguate between assembler parameters,
preprocessor parameters and MSVC parameters within gas-preprocessor.

In particular, this avoids creating a stray dependency file named
'-.d' while building. Future versions of gas-preprocessor might
require this in order to build at all.
2014-05-13 19:40:51 +03:00
Martin Storsjö
3cc01c6239 Use CCASFLAGS when assembling .S sources
This allows overriding whether all of CFLAGS should be passed
when assembling.
2014-05-13 19:39:26 +03:00
Martin Storsjö
0acb780715 Don't define MACOS and LINUX
Nothing within the library actually uses these defines for anything
any more.

If necessary, the built-in defines __APPLE__ and __linux__ can be
used instead of these manually added defines. This is similar to how
we use _WIN32 instead of manually defining WIN32.
2014-05-12 12:17:53 +03:00
Martin Storsjö
e8e2cbcc28 Revert "Set ASM_ARCH in all cases to fix Win64 Debug build"
This reverts commit 09025dc8ef.

There is no need to set ASM_ARCH unless assembly sources actually
are built. ASM_ARCH is no longer used for setting unrelated CFLAGS.
2014-05-09 19:34:49 +03:00
Martin Storsjö
4635232d93 Don't manually define WIN32/WIN64
All the code that relies on separating them uses the built-in defines
_WIN32 and _WIN64, or the corresponding machine defines (such as
_M_IX86, for MSVC 32 bit inline assembly).
2014-05-09 19:34:04 +03:00
Ethan Hugg
09025dc8ef Set ASM_ARCH in all cases to fix Win64 Debug build 2014-05-07 05:40:13 +00:00
Martin Storsjö
853e71eb88 Fix building gtest on MSVC
The previous define change in 1e607d71 only made it work on MSVC
2005 and 2008, but broke things even more for 2010 and newer.
(One shouldn't override the internal details about which tuple
implementation to use, since one implementation don't work on
all versions.) Since we don't need or use the gtest tuple code,
the simplest workaround used to be just to disable it altogether,
but that was broken in r682 in gtest.

This has been tested and works on MSVC 2005, 2008, 2010, 2012 and
2013.
2014-05-06 11:14:41 +03:00
zhiliang wang
1e607d71d2 Fix gtest build error when OS=msvc. 2014-05-06 13:06:37 +08:00
Martin Storsjö
a0002c2be8 Use $(PROJECT_NAME) in the android .so name 2014-05-04 15:57:40 +03:00
Martin Storsjö
dc57301d0c Rename the DLL definition file according to what the output DLL is named 2014-05-04 15:55:17 +03:00
Martin Storsjö
9d0647b8ac Use $(PROJECT_NAME) for naming the DLL import library as well 2014-05-04 15:54:59 +03:00
Ethan Hugg
685d595c30 Merge pull request #767 from mstorsjo/avoid-conflicting-msvc-options
Only use the -Gm option in desktop debug MSVC builds
2014-04-30 09:40:25 -07:00
Martin Storsjö
36cda3606e Only use the -Gm option in desktop debug MSVC builds
This option conflicts with -ZW which is used in Windows Phone builds.
2014-04-29 11:56:48 +03:00
Martin Storsjö
239f42a924 Don't build all object files with -ZW, only the one that needs it
This reduces the build time from 69 s to 30 s, reduces the size of
the built wels.lib from 30 MB to 3.9 MB, and reduces the number of
warnings when building wels.lib.
2014-04-29 11:03:17 +03:00
lyao2
34ad719cf2 Squashed commit of the following:
commit f73d6cf0fcae5f401fc2817ab736af996113ca09
Author: lyao2 <lyao2@LYAO2-WS01.cisco.com>
Date:   Thu Apr 24 15:02:21 2014 +0800

    remove comments

commit 75416c2cf6c1ebb7aabf9e8c52d8c7163a8009b7
Author: lyao2 <lyao2@LYAO2-WS01.cisco.com>
Date:   Thu Apr 24 14:52:09 2014 +0800

    for test

commit 7dfb65ce514edcff892bfb3919921cadcce1d055
Author: lyao2 <lyao2@LYAO2-WS01.cisco.com>
Date:   Thu Apr 24 14:12:31 2014 +0800

    for test

commit eff771645e8c349dc4e454ab1751530b3cef18ed
Author: lyao2 <lyao2@LYAO2-WS01.cisco.com>
Date:   Thu Apr 24 10:51:34 2014 +0800

    for test

commit 9c42b9a7a04068e70be94529941f549b58e63780
Author: lyao2 <lyao2@LYAO2-WS01.cisco.com>
Date:   Wed Apr 23 17:46:59 2014 +0800

    update cpu_flag

commit cce3fccc0a4249b82ab2e0e92fe53579ef942799
Author: lyao2 <lyao2@LYAO2-WS01.cisco.com>
Date:   Wed Apr 23 17:26:56 2014 +0800

    for test

commit 3d292995b3c4437a2674a687cc4e8da1b5fb83f5
Author: lyao2 <lyao2@LYAO2-WS01.cisco.com>
Date:   Wed Apr 23 16:45:57 2014 +0800

    remove space

commit c608c2ba7cf010f1dcf8c0344f68536c48e181cb
Author: lyao2 <lyao2@LYAO2-WS01.cisco.com>
Date:   Wed Apr 23 16:42:43 2014 +0800

    remove tabs

commit 3b769342a06e25ad23a2c86f23a94d0d7ca1a4c8
Author: lyao2 <lyao2@LYAO2-WS01.cisco.com>
Date:   Wed Apr 23 16:33:55 2014 +0800

    refine UT case

commit 89b869f0c8f8c9bbd61e9de32caa77877aeae064
Author: lyao2 <lyao2@LYAO2-WS01.cisco.com>
Date:   Tue Apr 22 13:40:50 2014 +0800

    Squashed commit of the following:

    commit abe55494134ef8342ffe9566df4e1b3265fe21b6
    Author: lyao2 <lyao2@LYAO2-WS01.cisco.com>
    Date:   Tue Apr 22 10:50:07 2014 +0800

        set MV range

    commit 8c7f70c351e50d945c29118bed8b3781c22b7dbc
    Author: lyao2 <lyao2@LYAO2-WS01.cisco.com>
    Date:   Mon Apr 21 16:53:10 2014 +0800

        refinement

    commit bf35f19a7dc88743aacf8e89e681e0ef3302d40a
    Author: lyao2 <lyao2@LYAO2-WS01.cisco.com>
    Date:   Fri Apr 18 17:24:31 2014 +0800

        correct tabs

    commit 130b7f895d7020bfc571d910966891da93150242
    Author: lyao2 <lyao2@LYAO2-WS01.cisco.com>
    Date:   Fri Apr 18 17:17:06 2014 +0800

        correct format

    commit 0429703b0844363559dd2b3d44e45034232a9d8f
    Author: lyao2 <lyao2@LYAO2-WS01.cisco.com>
    Date:   Fri Apr 18 15:12:44 2014 +0800

        add scroll UT
2014-04-24 15:12:49 +08:00
Martin Storsjö
f1b2d51d86 Add support for building the arm64 assembly in platform-arch.mk 2014-04-23 11:44:47 +03:00
Martin Storsjö
84ff82ee24 Exclude the new arm64 include file 2014-04-23 11:44:47 +03:00
Martin Storsjö
c8901c7dcd Add support for arm64 assembly source files in mktargets.py
Disambiguate between arm and arm64 sources by checking the directory
names.

The arm assembly sources can be assembled on arm64 and vice versa
without any effect since all of the implementation is hidden behind
the HAVE_NEON and HAVE_NEON_AARCH64 defines, but it still is cleaner
to not build extra empty object files than to build all *.S files
on all arm variants. (The iOS project files build all of the arm
assembly files, regardless of the target architecture, since
individual files can't easily be excluded based on the target
architecture there.)
2014-04-23 11:41:17 +03:00
Martin Storsjö
764f787dcb Rename the makefile variable for arm assembly sources
This is in preparation for adding support for the aarc64 assembly
files as well.
2014-04-23 10:55:30 +03:00
Martin Storsjö
3026958bde Rename the msvc-arm platform file to msvc-wp
The architecture handling is now decoupled from the main
platform file. Now you can build for Windows Phone for x86 (for
the emulator) by "make OS=msvc-wp ARCH=x86".
2014-04-11 10:54:34 +03:00
Martin Storsjö
48f7470867 Move all x86 vs arm handling to msvc-common 2014-04-11 10:54:34 +03:00
Martin Storsjö
1ee52616ac Remove a duplicate -MD declaration 2014-04-11 10:51:58 +03:00
Martin Storsjö
b1f35347eb Set -MTd/-MDd in the same way as -MT/-MD
This was overlooked in 67e5b04.
2014-04-11 10:27:14 +03:00
Licai Guo
67e5b041c2 this patch remove dependency of MSVC version
the output dll now only depends on kernel32.dll
2014-04-10 18:05:41 -07:00
Andoni Morales Alastruey
3a4cea63ef Rename cpufeatures symbols to avoid colisions in static builds
This fixes potential duplicated symbols in static links
with other libraries including the cpufeatures.o object file
2014-04-08 11:25:01 +02:00
Martin Storsjö
b35c21201b Use the Windows Runtime ThreadPool API for creating threads on Windows Phone
Windows Phone lacks the old CreateThread/beginthreadex APIs for
creating threads. (Technically, the functions still do exist,
but they aren't officially supported and aren't visible in the
headers when targeting Windows Phone.)

Building code that uses the Windows Runtime language extensions
requires building with the -ZW option.
2014-04-01 11:18:49 +03:00
volvet
9f50e0c91e clean multi-threading macro 2014-03-31 18:24:10 -07:00
Martin Storsjö
21559a2d7d Remove an unnecessary 'cd' in the mktargets.sh script
There's no need to return to the original directory at the end of
a script - the current working directory within the subshell that
executes the script doesn't affect the working directory in the
calling shell.
2014-03-27 08:58:56 +02:00
Varun B Patil
0d6764c62f Attempt to change to root dir before executing python script
When inside a git repo, attempt to change to the root dir
before running python script. Prevents a bunch of errors
when mktargets.sh is executed from the wrong dir.
2014-03-27 11:37:39 +05:30
Martin Storsjö
d024dc5cc0 Remove unused *_LIBS make variables 2014-03-25 10:13:29 +02:00
Licai Guo
f26bb57415 reorganize tests 2014-03-24 22:14:43 -07:00
Varun B Patil
064ad29f80 Better error reporting in mktargets.py 2014-03-24 12:56:06 +05:30
Ethan Hugg
e8540af9eb Merge pull request #541 from licaiguo/disable-warnings
disable most warnings produced by -Wall
2014-03-19 09:17:34 -07:00
Martin Storsjö
2ca8ef4bd3 Automatically pick the latest installed iOS SDK when building with make
This avoids having to update the makefile just to change the SDK
version whenever the iOS SDK is updated (since the previous
version is removed on updates).
2014-03-19 10:32:42 +02:00
Licai Guo
a688f5278a fix most of the warnings 2014-03-19 01:16:08 -07:00
Licai Guo
2a885ca461 disable most warnings produced by -Wall 2014-03-18 23:04:33 -07:00
Licai Guo
31a93de513 add missing build files 2014-03-18 19:47:26 -07:00
Ethan Hugg
197423f271 Merge pull request #520 from ylatuya/master
Fix compiler warnings and remove dead code
2014-03-18 13:28:02 -07:00
Andoni Morales Alastruey
c55429d7a5 Replace -Werror with -Wall
Treating warnings as error is useless if no warning is activated.
Several build systems enable -Wall in the CLFAGS, which in combination
with -Werror can trigger undesired build errors.
2014-03-18 19:15:25 +01:00
Martin Storsjö
e1b5e038d2 Use .obj as suffix for object files on MSVC
This avoids warnings when linking about "unrecognized source file
type, object file assumed".
2014-03-18 19:41:06 +02:00
Martin Storsjö
00efbc2cb5 Enable the arm assembly in msvc-arm builds
This requires using the external gas-preprocessor tool that
converts the gnu assembler format sources to armasm format at
build time. This allows keeping the source files in one single
format but only converting while building.
2014-03-17 20:28:12 +02:00
Martin Storsjö
d723ad2774 Use -DPREFIX instead of --prefix _ on OS X
The --prefix parameter differs between yasm and nasm; nasm
requires --prefix _ while yasm requires --prefix=_. Using the
define instead (as on windows) allows easier switching between
the two otherwise mostly compatible assemblers.

This fixes building with yasm on OS X in 32 bit mode. For 64 bit,
a few more tweaks are still required.
2014-03-16 11:59:34 +02:00