diff options
| author | ruki <[email protected]> | 2016-09-17 21:09:15 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2016-09-17 21:09:15 +0800 |
| commit | 05019549ea769b64a31929b7044e7a53dba97549 (patch) | |
| tree | a9a72f7790fd735638ffeec5289cfef88e5bf137 | |
| parent | b70792995b5a0e4253ca83f09efa565c72a0cb88 (diff) | |
remove core/tools and uses xmake to compile core
42 files changed, 42 insertions, 2023 deletions
diff --git a/core/COPYING.LGPLv2.1 b/core/COPYING.LGPLv2.1 deleted file mode 100755 index 00b4fedfe..000000000 --- a/core/COPYING.LGPLv2.1 +++ /dev/null @@ -1,504 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - <one line to give the library's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - <signature of Ty Coon>, 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - diff --git a/core/INSTALL b/core/INSTALL deleted file mode 100755 index d5c2c9c8e..000000000 --- a/core/INSTALL +++ /dev/null @@ -1,31 +0,0 @@ -======================================================================== -usage: - -1. configure - make config|f [PLAT=ios|android|linux|mac|mingw|cygwin] [ARCH=x86|x64|armv5te|armv6|armv7|armv7s|arm64] [DEBUG=y|n] [SMALL=y|n] [DEMO=y|n] [PROF=y|n] [PREFIX=..] [BIN=] [PRE=] [SDK=] - -2. build - make [all] - make rebuild|r - -3. update build - make update|u - -4. clean build - make clean|c - -5. install - make install|i - -6. make info - make error|e - make output|o - make warning|w - -7. make document - make doc|d - -8. help - make help|h - - diff --git a/core/README.md b/core/README.md deleted file mode 100755 index dccf47b88..000000000 --- a/core/README.md +++ /dev/null @@ -1,69 +0,0 @@ - -build ------ - -```bash - // build for linux-x86 debug - cd ./xmake/core - [make f PLAT=linux ARCH=x86 DEBUG=y] => optional - make r - - // build for linux-x64 release - cd ./xmake/core - [make f PLAT=linux ARCH=x64 DEBUG=n] => optional - make r - - // build for linux and add cflags and ldflags - cd ./xmake/core - make f PLAT=linux CFLAG="-I." LDFLAG="-L. -lxxx" - make r - - // build for mac - cd ./xmake/core - [make f PLAT=mac ARCH=x64] => optional - make r - - // build for ios-armv7, using sdk7.1 framework - cd ./xmake/core - make f PLAT=ios ARCH=armv7 SDK=/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk - make r - - // build for ios armv7 and arm64 universal version - cd ./xmake/core - make lipo ARCH1=armv7 ARCH2=arm64 SDK=/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk - - // build for android-armv5te, need set the ndk and toolchains directory - cd ./xmake/core - make f PLAT=android ARCH=armv5te SDK=/home/xxxx/android-ndk-r9d BIN=/home/xxxx/android-ndk-r9d/toolchains/arm-linux-androideabi-4.8/prebuilt/darwin-x86_64/bin - make r - - // build for android-armv6, if ndk and toolchains have been setted - cd ./xmake/core - make f PLAT=android ARCH=armv6 - make r - - // build for windows using msvc - cd ./xmake/core - run ./msys.bat - [make f PLAT=msvc ARCH=x86] => optional - make r - - // build for windows using mingw and need link libgcc.a from mingw - run msys - cd ./xmake/core - [make f PLAT=mingw ARCH=x86] => optional - make r - - // build for windows using cygwin - run cygwin - cd ./xmake/core - [make f PLAT=cygwin ARCH=x86] => optional - make r - - // build for windows and custom complier path and prefix and need link libgcc.a from mingw - run cygwin - cd ./xmake/core - make f PLAT=mingw ARCH=x86 BIN="/home/xxx/bin" PRE="i386-mingw32-" - make r -``` - diff --git a/core/build.bat b/core/build.bat deleted file mode 100644 index d07a77d60..000000000 --- a/core/build.bat +++ /dev/null @@ -1,9 +0,0 @@ -@echo off
-if not exist tool\msys\bin tool\7z.exe x tool\msys\bin.7z -otool\msys > nul
-if not exist tool\msys\local\bin tool\7z.exe x tool\msys\local\bin.7z -otool\msys\local > nul
-if not exist tool\msys\local\inc tool\7z.exe x tool\msys\local\inc.7z -otool\msys\local > nul
-if not exist tool\msys\local\lib tool\7z.exe x tool\msys\local\lib.7z -otool\msys\local > nul
-rem echo '%temp%' /tmp > tool\msys\etc\fstab
-echo HOME='%~dp0' > tool\msys\etc\home
-cmd /K tool\msys\msys.bat
-exit
diff --git a/core/build.sh b/core/build.sh deleted file mode 100644 index c9dc9292c..000000000 --- a/core/build.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -if [ -f .config.mak ]; then - rm .config.mak -fi -make f DEBUG=n PLAT=msvc ARCH=x86 -make r -if [ $? -ne 0 ]; then - make o -fi -exit diff --git a/core/makefile b/core/makefile index 6ab634d6f..4cf6bfc5b 100755 --- a/core/makefile +++ b/core/makefile @@ -140,29 +140,30 @@ endif # host HOST :=$(if $(HOST),$(HOST),$(if ${shell uname | egrep -i linux},linux,)) -HOST :=$(if $(HOST),$(HOST),$(if ${shell uname | egrep -i darwin},mac,)) +HOST :=$(if $(HOST),$(HOST),$(if ${shell uname | egrep -i darwin},macosx,)) HOST :=$(if $(HOST),$(HOST),$(if ${shell uname | egrep -i cygwin},cygwin,)) HOST :=$(if $(HOST),$(HOST),$(if ${shell uname | egrep -i mingw},msys,)) -HOST :=$(if $(HOST),$(HOST),$(if ${shell uname | egrep -i msvc},msys,)) +HOST :=$(if $(HOST),$(HOST),$(if ${shell uname | egrep -i windows},msys,)) HOST :=$(if $(HOST),$(HOST),linux) # platform PLAT :=$(if $(PLAT),$(PLAT),$(if ${shell uname | egrep -i linux},linux,)) -PLAT :=$(if $(PLAT),$(PLAT),$(if ${shell uname | egrep -i darwin},mac,)) +PLAT :=$(if $(PLAT),$(PLAT),$(if ${shell uname | egrep -i darwin},macosx,)) PLAT :=$(if $(PLAT),$(PLAT),$(if ${shell uname | egrep -i cygwin},cygwin,)) PLAT :=$(if $(PLAT),$(PLAT),$(if ${shell uname | egrep -i mingw},mingw,)) -PLAT :=$(if $(PLAT),$(PLAT),$(if ${shell uname | egrep -i msvc},msvc,)) +PLAT :=$(if $(PLAT),$(PLAT),$(if ${shell uname | egrep -i windows},windows,)) PLAT :=$(if $(PLAT),$(PLAT),linux) # architecture ifeq ($(ARCH),) -ARCH :=$(if $(findstring msvc,$(PLAT)),x86,$(ARCH)) +ARCH :=$(if $(findstring windows,$(PLAT)),x86,$(ARCH)) ARCH :=$(if $(findstring mingw,$(PLAT)),x86,$(ARCH)) -ARCH :=$(if $(findstring mac,$(PLAT)),x$(shell getconf LONG_BIT),$(ARCH)) +ARCH :=$(if $(findstring macosx,$(PLAT)),x$(shell getconf LONG_BIT),$(ARCH)) ARCH :=$(if $(findstring linux,$(PLAT)),x$(shell getconf LONG_BIT),$(ARCH)) -ARCH :=$(if $(findstring x32,$(ARCH)),x86,$(ARCH)) -ARCH :=$(if $(findstring ios,$(PLAT)),armv7,$(ARCH)) +ARCH :=$(if $(findstring x32,$(ARCH)),i386,$(ARCH)) +ARCH :=$(if $(findstring x64,$(ARCH)),x86_64,$(ARCH)) +ARCH :=$(if $(findstring iphoneos,$(PLAT)),armv7,$(ARCH)) ARCH :=$(if $(findstring android,$(PLAT)),armv7,$(ARCH)) endif @@ -175,7 +176,7 @@ DTYPE :=$(if $(findstring y,$(DEBUG)),d,r) # small SMALL :=$(if $(SMALL),$(SMALL),n) -SMALL :=$(if $(findstring ios,$(PLAT)),y,$(SMALL)) +SMALL :=$(if $(findstring iphoneos,$(PLAT)),y,$(SMALL)) SMALL :=$(if $(findstring android,$(PLAT)),y,$(SMALL)) # demo @@ -188,10 +189,10 @@ PROF :=$(if $(PROF),$(PROF),n) ARM :=$(if $(findstring arm,$(ARCH)),y,n) # x86 -x86 :=$(if $(findstring x86,$(ARCH)),y,n) +x86 :=$(if $(findstring i386,$(ARCH)),y,n) # x64 -x64 :=$(if $(findstring x64,$(ARCH)),y,n) +x64 :=$(if $(findstring x86_64,$(ARCH)),y,n) # sh4 SH4 :=$(if $(findstring sh4,$(ARCH)),y,n) @@ -229,7 +230,7 @@ DISTCC := endif # sed -ifeq ($(HOST),mac) +ifeq ($(HOST),macosx) #SED := sed -i '' SED := perl -pi -e else @@ -237,7 +238,7 @@ SED := sed -i endif # echo -ifeq ($(HOST),mac) +ifeq ($(HOST),macosx) SHELL = bash endif ifeq ($(HOST),linux) @@ -246,7 +247,7 @@ endif ECHO := echo -e # make upper -ifeq ($(HOST),mac) +ifeq ($(HOST),macosx) define MAKE_UPPER ${shell echo $(1) | perl -p -e "s/(.*)/\U\1/g"} endef @@ -257,12 +258,12 @@ endef endif # config base -ifeq ($(PLAT),mac) +ifeq ($(PLAT),macosx) base_LIBPATH := /usr/local/lib base_LIBNAMES := m dl pthread endif -ifeq ($(PLAT),msvc) +ifeq ($(PLAT),windows) base_LIBPATH := base_LIBNAMES := ws2_32 endif @@ -446,7 +447,7 @@ config : .null @$(ECHO) "tbox_LIBPATH =" >> .config.mak @$(ECHO) "tbox_INCFLAGS =" >> .config.mak @$(ECHO) "tbox_LIBFLAGS =" >> .config.mak - @$(ECHO) "tbox_LIBNAMES =tboxr" >> .config.mak + @$(ECHO) "tbox_LIBNAMES =tbox" >> .config.mak @$(ECHO) "export TBOX" >> .config.mak @$(ECHO) "export tbox_INCPATH" >> .config.mak @$(ECHO) "export tbox_LIBPATH" >> .config.mak diff --git a/core/pkg/luajit.pkg/inc/luajit/lua.h b/core/pkg/luajit.pkg/inc/luajit/lua.h index c83fd3bbe..758ca7884 100644 --- a/core/pkg/luajit.pkg/inc/luajit/lua.h +++ b/core/pkg/luajit.pkg/inc/luajit/lua.h @@ -102,8 +102,6 @@ typedef LUA_NUMBER lua_Number; /* type for integer functions */ typedef LUA_INTEGER lua_Integer; - - /* ** state manipulation */ diff --git a/core/pkg/luajit.pkg/lib/linux/x86/libluajit.a b/core/pkg/luajit.pkg/lib/linux/i386/libluajit.a Binary files differindex c60ee0143..c60ee0143 100644 --- a/core/pkg/luajit.pkg/lib/linux/x86/libluajit.a +++ b/core/pkg/luajit.pkg/lib/linux/i386/libluajit.a diff --git a/core/pkg/luajit.pkg/lib/linux/x64/libluajit.a b/core/pkg/luajit.pkg/lib/linux/x86_64/libluajit.a Binary files differindex abb51043d..abb51043d 100644 --- a/core/pkg/luajit.pkg/lib/linux/x64/libluajit.a +++ b/core/pkg/luajit.pkg/lib/linux/x86_64/libluajit.a diff --git a/core/pkg/luajit.pkg/lib/mac/x64/libluajit.a b/core/pkg/luajit.pkg/lib/macosx/x86_64/libluajit.a Binary files differindex 73cd64373..73cd64373 100644 --- a/core/pkg/luajit.pkg/lib/mac/x64/libluajit.a +++ b/core/pkg/luajit.pkg/lib/macosx/x86_64/libluajit.a diff --git a/core/pkg/luajit.pkg/lib/msvc/x86/luajit.lib b/core/pkg/luajit.pkg/lib/windows/x86/luajit.lib Binary files differindex 50df1f898..50df1f898 100644 --- a/core/pkg/luajit.pkg/lib/msvc/x86/luajit.lib +++ b/core/pkg/luajit.pkg/lib/windows/x86/luajit.lib diff --git a/core/pkg/luajit.pkg/manifest.json b/core/pkg/luajit.pkg/manifest.json deleted file mode 100755 index 2043e853d..000000000 --- a/core/pkg/luajit.pkg/manifest.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "format": - { - "name": "The TBOOX Package Format" - , "version": "v1.0.1" - , "website": "http://www.tboox.org" - } - -, "package": - { - "name": "The Luajit Library" - } - -, "compiler": - { - "default": - { - "debug": - { - "libs": "luajit" - } - , "release": "$.compiler.default.debug" - } - - , "mac" : - { - "x64": "$.compiler.default" - } - - , "linux" : - { - "x64": "$.compiler.default" - , "x86": "$.compiler.default" - } - - , "msvc" : - { - "x86": "$.compiler.default" - } - } -} diff --git a/core/pkg/tbox.pkg/inc/linux/x64/tbox.config.h b/core/pkg/tbox.pkg/inc/linux/x64/tbox.config.h deleted file mode 100755 index 095066c75..000000000 --- a/core/pkg/tbox.pkg/inc/linux/x64/tbox.config.h +++ /dev/null @@ -1,120 +0,0 @@ -#ifndef TB_CONFIG_H -#define TB_CONFIG_H - -// version -#define TB_CONFIG_VERSION "1.5.3" -#define TB_CONFIG_VERSION_MAJOR 1 -#define TB_CONFIG_VERSION_MINOR 5 -#define TB_CONFIG_VERSION_ALTER 3 -#define TB_CONFIG_VERSION_BUILD 201608031402 - -// defines -#define TB_CONFIG_OS_LINUX 1 -#define _GNU_SOURCE 1 -#define _REENTRANT 1 -#define TB_CONFIG_SMALL 1 -#define TB_CONFIG_TYPE_HAVE_FLOAT 1 -#define TB_CONFIG_POSIX_HAVE_POSIX_SPAWNP 1 -#define TB_CONFIG_LIBC_HAVE_MKTIME 1 -#define TB_CONFIG_LIBM_HAVE_ACOS 1 -#define TB_CONFIG_POSIX_HAVE_SOCKET 1 -#define TB_CONFIG_LIBC_HAVE_SETLOCALE 1 -#define TB_CONFIG_POSIX_HAVE_POLL 1 -#define TB_CONFIG_LIBC_HAVE_KILL 1 -#define TB_CONFIG_POSIX_HAVE_PWRITEV 1 -#define TB_CONFIG_LIBM_HAVE_ATAN2 1 -#define TB_CONFIG_POSIX_HAVE_SCHED_YIELD 1 -#define TB_CONFIG_LIBC_HAVE_STRLEN 1 -#define TB_CONFIG_LIBC_HAVE_WCSCMP 1 -#define TB_CONFIG_LIBC_HAVE_WCSNCAT 1 -#define TB_CONFIG_POSIX_HAVE_EXECVP 1 -#define TB_CONFIG_POSIX_HAVE_FORK 1 -#define TB_CONFIG_POSIX_HAVE_GETIFADDRS 1 -#define TB_CONFIG_POSIX_HAVE_FDATASYNC 1 -#define TB_CONFIG_POSIX_HAVE_DLOPEN 1 -#define TB_CONFIG_POSIX_HAVE_REGEXEC 1 -#define TB_CONFIG_POSIX_HAVE_VFORK 1 -#define TB_CONFIG_LIBC_HAVE_STRCAT 1 -#define TB_CONFIG_LIBC_HAVE_WCSSTR 1 -#define TB_CONFIG_LIBC_HAVE_WCSCAT 1 -#define TB_CONFIG_LIBM_HAVE_POW 1 -#define TB_CONFIG_LIBC_HAVE_MEMCPY 1 -#define TB_CONFIG_LIBM_HAVE_SQRTF 1 -#define TB_CONFIG_LIBC_HAVE_WCSNLEN 1 -#define TB_CONFIG_LIBM_HAVE_ACOSF 1 -#define TB_CONFIG_POSIX_HAVE_OPEN 1 -#define TB_CONFIG_LIBC_HAVE_STRNLEN 1 -#define TB_CONFIG_LIBC_HAVE_RANDOM 1 -#define TB_CONFIG_LIBM_HAVE_ATANF 1 -#define TB_CONFIG_LIBC_HAVE_STRNCAT 1 -#define TB_CONFIG_LIBC_HAVE_WCSNCPY 1 -#define TB_CONFIG_LIBC_HAVE_GMTIME 1 -#define TB_CONFIG_LIBM_HAVE_TAN 1 -#define TB_CONFIG_LIBM_HAVE_POWF 1 -#define TB_CONFIG_LIBM_HAVE_SINF 1 -#define TB_CONFIG_LIBM_HAVE_ATAN 1 -#define TB_CONFIG_LIBC_HAVE_STRNCMP 1 -#define TB_CONFIG_LIBC_HAVE_MEMMOVE 1 -#define TB_CONFIG_LIBC_HAVE_STRNCASECMP 1 -#define TB_CONFIG_POSIX_HAVE_PREADV 1 -#define TB_CONFIG_LIBC_HAVE_WCSCPY 1 -#define TB_CONFIG_LIBM_HAVE_SQRT 1 -#define TB_CONFIG_LIBC_HAVE_STRCMP 1 -#define TB_CONFIG_LIBC_HAVE_STRCASECMP 1 -#define TB_CONFIG_LIBC_HAVE_MEMSET 1 -#define TB_CONFIG_LIBC_HAVE_FPUTS 1 -#define TB_CONFIG_LIBM_HAVE_TANF 1 -#define TB_CONFIG_LIBC_HAVE_STRNCPY 1 -#define TB_CONFIG_LIBC_HAVE_LOCALTIME 1 -#define TB_CONFIG_LIBC_HAVE_WCSNCASECMP 1 -#define TB_CONFIG_LIBC_HAVE_STRCPY 1 -#define TB_CONFIG_POSIX_HAVE_SEM_INIT 1 -#define TB_CONFIG_SYSTEMV_HAVE_SEMGET 1 -#define TB_CONFIG_POSIX_HAVE_WAITPID 1 -#define TB_CONFIG_POSIX_HAVE_EPOLL_WAIT 1 -#define TB_CONFIG_POSIX_HAVE_EPOLL_CREATE 1 -#define TB_CONFIG_LIBC_HAVE_GETTIMEOFDAY 1 -#define TB_CONFIG_LIBM_HAVE_ATAN2F 1 -#define TB_CONFIG_LIBC_HAVE_STRSTR 1 -#define TB_CONFIG_POSIX_HAVE_SENDFILE 1 -#define TB_CONFIG_LIBC_HAVE_WCSNCMP 1 -#define TB_CONFIG_POSIX_HAVE_WRITEV 1 -#define TB_CONFIG_LIBM_HAVE_LOG2 1 -#define TB_CONFIG_LIBM_HAVE_COS 1 -#define TB_CONFIG_POSIX_HAVE_READV 1 -#define TB_CONFIG_POSIX_HAVE_PTHREAD_MUTEX_INIT 1 -#define TB_CONFIG_LIBM_HAVE_FMODF 1 -#define TB_CONFIG_MODULE_HAVE_HASH 1 -#define TB_CONFIG_LIBC_HAVE_WCSTOMBS 1 -#define TB_CONFIG_LIBM_HAVE_FMOD 1 -#define TB_CONFIG_LIBC_HAVE_MEMCMP 1 -#define TB_CONFIG_POSIX_HAVE_REGCOMP 1 -#define TB_CONFIG_POSIX_HAVE_SYSCONF 1 -#define TB_CONFIG_POSIX_HAVE_GETPAGESIZE 1 -#define TB_CONFIG_POSIX_HAVE_GETHOSTNAME 1 -#define TB_CONFIG_POSIX_HAVE_OPENDIR 1 -#define TB_CONFIG_LIBM_HAVE_SIN 1 -#define TB_CONFIG_LIBM_HAVE_COSF 1 -#define TB_CONFIG_LIBM_HAVE_EXP 1 -#define TB_CONFIG_POSIX_HAVE_PTHREAD_CREATE 1 -#define TB_CONFIG_LIBM_HAVE_ASIN 1 -#define TB_CONFIG_LIBM_HAVE_EXPF 1 -#define TB_CONFIG_LIBC_HAVE_WCSLEN 1 -#define TB_CONFIG_MODULE_HAVE_THREAD 1 -#define TB_CONFIG_MODULE_HAVE_NETWORK 1 -#define TB_CONFIG_LIBC_HAVE_MBSTOWCS 1 -#define TB_CONFIG_LIBC_HAVE_WCSCASECMP 1 -#define TB_CONFIG_LIBM_HAVE_ASINF 1 -#define TB_CONFIG_LIBC_HAVE_SIGSETJMP 1 -#define TB_CONFIG_LIBM_HAVE_LOG2F 1 -#define TB_CONFIG_LIBC_HAVE_SRANDOM 1 -#define TB_CONFIG_LIBC_HAVE_SETJMP 1 -#define TB_CONFIG_LIBC_HAVE_SIGNAL 1 -#define TB_CONFIG_LIBC_HAVE_BACKTRACE 1 - -// undefines -#undef TB_CONFIG_TRACE_INFO_ONLY -#undef TB_CONFIG_EXCEPTION_ENABLE -#undef TB_CONFIG_MEMORY_UNALIGNED_ACCESS_ENABLE - -#endif diff --git a/core/pkg/tbox.pkg/inc/linux/x86/tbox.config.h b/core/pkg/tbox.pkg/inc/linux/x86/tbox.config.h deleted file mode 100755 index 24e3f1851..000000000 --- a/core/pkg/tbox.pkg/inc/linux/x86/tbox.config.h +++ /dev/null @@ -1,120 +0,0 @@ -#ifndef TB_CONFIG_H -#define TB_CONFIG_H - -// version -#define TB_CONFIG_VERSION "1.5.3" -#define TB_CONFIG_VERSION_MAJOR 1 -#define TB_CONFIG_VERSION_MINOR 5 -#define TB_CONFIG_VERSION_ALTER 3 -#define TB_CONFIG_VERSION_BUILD 201608031359 - -// defines -#define TB_CONFIG_OS_LINUX 1 -#define _GNU_SOURCE 1 -#define _REENTRANT 1 -#define TB_CONFIG_SMALL 1 -#define TB_CONFIG_TYPE_HAVE_FLOAT 1 -#define TB_CONFIG_POSIX_HAVE_POSIX_SPAWNP 1 -#define TB_CONFIG_LIBC_HAVE_MKTIME 1 -#define TB_CONFIG_LIBM_HAVE_ACOS 1 -#define TB_CONFIG_POSIX_HAVE_SOCKET 1 -#define TB_CONFIG_LIBC_HAVE_SETLOCALE 1 -#define TB_CONFIG_POSIX_HAVE_POLL 1 -#define TB_CONFIG_LIBC_HAVE_KILL 1 -#define TB_CONFIG_POSIX_HAVE_PWRITEV 1 -#define TB_CONFIG_LIBM_HAVE_ATAN2 1 -#define TB_CONFIG_POSIX_HAVE_SCHED_YIELD 1 -#define TB_CONFIG_LIBC_HAVE_STRLEN 1 -#define TB_CONFIG_LIBC_HAVE_WCSCMP 1 -#define TB_CONFIG_LIBC_HAVE_WCSNCAT 1 -#define TB_CONFIG_POSIX_HAVE_EXECVP 1 -#define TB_CONFIG_POSIX_HAVE_FORK 1 -#define TB_CONFIG_POSIX_HAVE_GETIFADDRS 1 -#define TB_CONFIG_POSIX_HAVE_FDATASYNC 1 -#define TB_CONFIG_POSIX_HAVE_DLOPEN 1 -#define TB_CONFIG_POSIX_HAVE_REGEXEC 1 -#define TB_CONFIG_POSIX_HAVE_VFORK 1 -#define TB_CONFIG_LIBC_HAVE_STRCAT 1 -#define TB_CONFIG_LIBC_HAVE_WCSSTR 1 -#define TB_CONFIG_LIBC_HAVE_WCSCAT 1 -#define TB_CONFIG_LIBM_HAVE_POW 1 -#define TB_CONFIG_LIBC_HAVE_MEMCPY 1 -#define TB_CONFIG_LIBM_HAVE_SQRTF 1 -#define TB_CONFIG_LIBC_HAVE_WCSNLEN 1 -#define TB_CONFIG_LIBM_HAVE_ACOSF 1 -#define TB_CONFIG_POSIX_HAVE_OPEN 1 -#define TB_CONFIG_LIBC_HAVE_STRNLEN 1 -#define TB_CONFIG_LIBC_HAVE_RANDOM 1 -#define TB_CONFIG_LIBM_HAVE_ATANF 1 -#define TB_CONFIG_LIBC_HAVE_STRNCAT 1 -#define TB_CONFIG_LIBC_HAVE_WCSNCPY 1 -#define TB_CONFIG_LIBC_HAVE_GMTIME 1 -#define TB_CONFIG_LIBM_HAVE_TAN 1 -#define TB_CONFIG_LIBM_HAVE_POWF 1 -#define TB_CONFIG_LIBM_HAVE_SINF 1 -#define TB_CONFIG_LIBM_HAVE_ATAN 1 -#define TB_CONFIG_LIBC_HAVE_STRNCMP 1 -#define TB_CONFIG_LIBC_HAVE_MEMMOVE 1 -#define TB_CONFIG_LIBC_HAVE_STRNCASECMP 1 -#define TB_CONFIG_POSIX_HAVE_PREADV 1 -#define TB_CONFIG_LIBC_HAVE_WCSCPY 1 -#define TB_CONFIG_LIBM_HAVE_SQRT 1 -#define TB_CONFIG_LIBC_HAVE_STRCMP 1 -#define TB_CONFIG_LIBC_HAVE_STRCASECMP 1 -#define TB_CONFIG_LIBC_HAVE_MEMSET 1 -#define TB_CONFIG_LIBC_HAVE_FPUTS 1 -#define TB_CONFIG_LIBM_HAVE_TANF 1 -#define TB_CONFIG_LIBC_HAVE_STRNCPY 1 -#define TB_CONFIG_LIBC_HAVE_LOCALTIME 1 -#define TB_CONFIG_LIBC_HAVE_WCSNCASECMP 1 -#define TB_CONFIG_LIBC_HAVE_STRCPY 1 -#define TB_CONFIG_POSIX_HAVE_SEM_INIT 1 -#define TB_CONFIG_SYSTEMV_HAVE_SEMGET 1 -#define TB_CONFIG_POSIX_HAVE_WAITPID 1 -#define TB_CONFIG_POSIX_HAVE_EPOLL_WAIT 1 -#define TB_CONFIG_POSIX_HAVE_EPOLL_CREATE 1 -#define TB_CONFIG_LIBC_HAVE_GETTIMEOFDAY 1 -#define TB_CONFIG_LIBM_HAVE_ATAN2F 1 -#define TB_CONFIG_LIBC_HAVE_STRSTR 1 -#define TB_CONFIG_POSIX_HAVE_SENDFILE 1 -#define TB_CONFIG_LIBC_HAVE_WCSNCMP 1 -#define TB_CONFIG_POSIX_HAVE_WRITEV 1 -#define TB_CONFIG_LIBM_HAVE_LOG2 1 -#define TB_CONFIG_LIBM_HAVE_COS 1 -#define TB_CONFIG_POSIX_HAVE_READV 1 -#define TB_CONFIG_POSIX_HAVE_PTHREAD_MUTEX_INIT 1 -#define TB_CONFIG_LIBM_HAVE_FMODF 1 -#define TB_CONFIG_MODULE_HAVE_HASH 1 -#define TB_CONFIG_LIBC_HAVE_WCSTOMBS 1 -#define TB_CONFIG_LIBM_HAVE_FMOD 1 -#define TB_CONFIG_LIBC_HAVE_MEMCMP 1 -#define TB_CONFIG_POSIX_HAVE_REGCOMP 1 -#define TB_CONFIG_POSIX_HAVE_SYSCONF 1 -#define TB_CONFIG_POSIX_HAVE_GETPAGESIZE 1 -#define TB_CONFIG_POSIX_HAVE_GETHOSTNAME 1 -#define TB_CONFIG_POSIX_HAVE_OPENDIR 1 -#define TB_CONFIG_LIBM_HAVE_SIN 1 -#define TB_CONFIG_LIBM_HAVE_COSF 1 -#define TB_CONFIG_LIBM_HAVE_EXP 1 -#define TB_CONFIG_POSIX_HAVE_PTHREAD_CREATE 1 -#define TB_CONFIG_LIBM_HAVE_ASIN 1 -#define TB_CONFIG_LIBM_HAVE_EXPF 1 -#define TB_CONFIG_LIBC_HAVE_WCSLEN 1 -#define TB_CONFIG_MODULE_HAVE_THREAD 1 -#define TB_CONFIG_MODULE_HAVE_NETWORK 1 -#define TB_CONFIG_LIBC_HAVE_MBSTOWCS 1 -#define TB_CONFIG_LIBC_HAVE_WCSCASECMP 1 -#define TB_CONFIG_LIBM_HAVE_ASINF 1 -#define TB_CONFIG_LIBC_HAVE_SIGSETJMP 1 -#define TB_CONFIG_LIBM_HAVE_LOG2F 1 -#define TB_CONFIG_LIBC_HAVE_SRANDOM 1 -#define TB_CONFIG_LIBC_HAVE_SETJMP 1 -#define TB_CONFIG_LIBC_HAVE_SIGNAL 1 -#define TB_CONFIG_LIBC_HAVE_BACKTRACE 1 - -// undefines -#undef TB_CONFIG_TRACE_INFO_ONLY -#undef TB_CONFIG_EXCEPTION_ENABLE -#undef TB_CONFIG_MEMORY_UNALIGNED_ACCESS_ENABLE - -#endif diff --git a/core/pkg/tbox.pkg/inc/mac/x64/tbox.config.h b/core/pkg/tbox.pkg/inc/mac/x64/tbox.config.h deleted file mode 100755 index da1a2fa56..000000000 --- a/core/pkg/tbox.pkg/inc/mac/x64/tbox.config.h +++ /dev/null @@ -1,118 +0,0 @@ -#ifndef TB_CONFIG_H -#define TB_CONFIG_H - -// version -#define TB_CONFIG_VERSION "1.5.3" -#define TB_CONFIG_VERSION_MAJOR 1 -#define TB_CONFIG_VERSION_MINOR 5 -#define TB_CONFIG_VERSION_ALTER 3 -#define TB_CONFIG_VERSION_BUILD 201608031341 - -// defines -#define TB_CONFIG_OS_MACOSX 1 -#define _GNU_SOURCE 1 -#define _REENTRANT 1 -#define TB_CONFIG_SMALL 1 -#define TB_CONFIG_TYPE_HAVE_FLOAT 1 -#define TB_CONFIG_POSIX_HAVE_POSIX_SPAWNP 1 -#define TB_CONFIG_LIBC_HAVE_MKTIME 1 -#define TB_CONFIG_LIBM_HAVE_ACOS 1 -#define TB_CONFIG_POSIX_HAVE_SOCKET 1 -#define TB_CONFIG_LIBC_HAVE_SETLOCALE 1 -#define TB_CONFIG_POSIX_HAVE_POLL 1 -#define TB_CONFIG_LIBC_HAVE_KILL 1 -#define TB_CONFIG_LIBC_HAVE_BACKTRACE 1 -#define TB_CONFIG_POSIX_HAVE_SCHED_YIELD 1 -#define TB_CONFIG_LIBC_HAVE_STRLEN 1 -#define TB_CONFIG_LIBC_HAVE_WCSCMP 1 -#define TB_CONFIG_LIBC_HAVE_WCSNCAT 1 -#define TB_CONFIG_POSIX_HAVE_EXECVP 1 -#define TB_CONFIG_POSIX_HAVE_FORK 1 -#define TB_CONFIG_POSIX_HAVE_GETIFADDRS 1 -#define TB_CONFIG_POSIX_HAVE_DLOPEN 1 -#define TB_CONFIG_POSIX_HAVE_REGEXEC 1 -#define TB_CONFIG_POSIX_HAVE_VFORK 1 -#define TB_CONFIG_LIBC_HAVE_STRCAT 1 -#define TB_CONFIG_LIBC_HAVE_WCSSTR 1 -#define TB_CONFIG_LIBC_HAVE_WCSCAT 1 -#define TB_CONFIG_LIBM_HAVE_POW 1 -#define TB_CONFIG_LIBC_HAVE_MEMCPY 1 -#define TB_CONFIG_LIBM_HAVE_SQRTF 1 -#define TB_CONFIG_LIBC_HAVE_WCSNLEN 1 -#define TB_CONFIG_LIBM_HAVE_ACOSF 1 -#define TB_CONFIG_POSIX_HAVE_OPEN 1 -#define TB_CONFIG_LIBC_HAVE_STRNLEN 1 -#define TB_CONFIG_LIBC_HAVE_RANDOM 1 -#define TB_CONFIG_LIBM_HAVE_ATANF 1 -#define TB_CONFIG_LIBC_HAVE_STRNCAT 1 -#define TB_CONFIG_LIBC_HAVE_WCSNCPY 1 -#define TB_CONFIG_LIBC_HAVE_GMTIME 1 -#define TB_CONFIG_LIBM_HAVE_TAN 1 -#define TB_CONFIG_LIBM_HAVE_POWF 1 -#define TB_CONFIG_LIBM_HAVE_SINF 1 -#define TB_CONFIG_MODULE_HAVE_NETWORK 1 -#define TB_CONFIG_LIBC_HAVE_STRNCMP 1 -#define TB_CONFIG_LIBC_HAVE_MEMMOVE 1 -#define TB_CONFIG_LIBC_HAVE_STRNCASECMP 1 -#define TB_CONFIG_LIBC_HAVE_STRLCPY 1 -#define TB_CONFIG_LIBC_HAVE_WCSCPY 1 -#define TB_CONFIG_LIBM_HAVE_SQRT 1 -#define TB_CONFIG_LIBC_HAVE_STRCMP 1 -#define TB_CONFIG_LIBC_HAVE_STRCASECMP 1 -#define TB_CONFIG_LIBC_HAVE_MEMSET 1 -#define TB_CONFIG_LIBC_HAVE_FPUTS 1 -#define TB_CONFIG_LIBM_HAVE_TANF 1 -#define TB_CONFIG_LIBC_HAVE_STRNCPY 1 -#define TB_CONFIG_LIBC_HAVE_LOCALTIME 1 -#define TB_CONFIG_LIBC_HAVE_WCSNCASECMP 1 -#define TB_CONFIG_LIBC_HAVE_STRCPY 1 -#define TB_CONFIG_LIBC_HAVE_WCSLCPY 1 -#define TB_CONFIG_SYSTEMV_HAVE_SEMGET 1 -#define TB_CONFIG_POSIX_HAVE_WAITPID 1 -#define TB_CONFIG_POSIX_HAVE_WRITEV 1 -#define TB_CONFIG_POSIX_HAVE_READV 1 -#define TB_CONFIG_LIBC_HAVE_GETTIMEOFDAY 1 -#define TB_CONFIG_LIBC_HAVE_SIGNAL 1 -#define TB_CONFIG_LIBC_HAVE_STRSTR 1 -#define TB_CONFIG_POSIX_HAVE_REGCOMP 1 -#define TB_CONFIG_LIBC_HAVE_WCSNCMP 1 -#define TB_CONFIG_POSIX_HAVE_SYSCONF 1 -#define TB_CONFIG_LIBM_HAVE_LOG2 1 -#define TB_CONFIG_LIBM_HAVE_COS 1 -#define TB_CONFIG_POSIX_HAVE_GETPAGESIZE 1 -#define TB_CONFIG_POSIX_HAVE_PTHREAD_MUTEX_INIT 1 -#define TB_CONFIG_LIBM_HAVE_FMODF 1 -#define TB_CONFIG_MODULE_HAVE_HASH 1 -#define TB_CONFIG_LIBC_HAVE_WCSTOMBS 1 -#define TB_CONFIG_LIBM_HAVE_FMOD 1 -#define TB_CONFIG_LIBC_HAVE_MEMCMP 1 -#define TB_CONFIG_POSIX_HAVE_SEM_INIT 1 -#define TB_CONFIG_POSIX_HAVE_GETHOSTNAME 1 -#define TB_CONFIG_POSIX_HAVE_OPENDIR 1 -#define TB_CONFIG_LIBM_HAVE_ATAN2F 1 -#define TB_CONFIG_LIBM_HAVE_ATAN2 1 -#define TB_CONFIG_LIBM_HAVE_EXP 1 -#define TB_CONFIG_LIBM_HAVE_SIN 1 -#define TB_CONFIG_LIBM_HAVE_COSF 1 -#define TB_CONFIG_POSIX_HAVE_PTHREAD_CREATE 1 -#define TB_CONFIG_LIBM_HAVE_ASIN 1 -#define TB_CONFIG_LIBM_HAVE_EXPF 1 -#define TB_CONFIG_LIBM_HAVE_ATAN 1 -#define TB_CONFIG_LIBM_HAVE_ASINF 1 -#define TB_CONFIG_MODULE_HAVE_THREAD 1 -#define TB_CONFIG_LIBC_HAVE_MEMMEM 1 -#define TB_CONFIG_LIBC_HAVE_WCSCASECMP 1 -#define TB_CONFIG_LIBC_HAVE_MBSTOWCS 1 -#define TB_CONFIG_LIBC_HAVE_SIGSETJMP 1 -#define TB_CONFIG_LIBM_HAVE_LOG2F 1 -#define TB_CONFIG_LIBC_HAVE_SRANDOM 1 -#define TB_CONFIG_LIBC_HAVE_SETJMP 1 -#define TB_CONFIG_LIBC_HAVE_STRCASESTR 1 -#define TB_CONFIG_LIBC_HAVE_WCSLEN 1 - -// undefines -#undef TB_CONFIG_TRACE_INFO_ONLY -#undef TB_CONFIG_EXCEPTION_ENABLE -#undef TB_CONFIG_MEMORY_UNALIGNED_ACCESS_ENABLE - -#endif diff --git a/core/pkg/tbox.pkg/inc/msvc/x86/tbox.config.h b/core/pkg/tbox.pkg/inc/msvc/x86/tbox.config.h deleted file mode 100644 index 3621ae4e2..000000000 --- a/core/pkg/tbox.pkg/inc/msvc/x86/tbox.config.h +++ /dev/null @@ -1,68 +0,0 @@ -#ifndef TB_CONFIG_H
-#define TB_CONFIG_H
-
-// version
-#define TB_CONFIG_VERSION "1.5.3"
-#define TB_CONFIG_VERSION_MAJOR 1
-#define TB_CONFIG_VERSION_MINOR 5
-#define TB_CONFIG_VERSION_ALTER 3
-#define TB_CONFIG_VERSION_BUILD 201608031342
-
-// defines
-#define TB_CONFIG_OS_WINDOWS 1
-#define _GNU_SOURCE 1
-#define _REENTRANT 1
-#define TB_CONFIG_SMALL 1
-#define TB_CONFIG_TYPE_HAVE_FLOAT 1
-#define TB_CONFIG_LIBC_HAVE_MEMMOVE 1
-#define TB_CONFIG_LIBC_HAVE_MKTIME 1
-#define TB_CONFIG_LIBM_HAVE_ACOS 1
-#define TB_CONFIG_LIBC_HAVE_SETLOCALE 1
-#define TB_CONFIG_LIBC_HAVE_WCSCPY 1
-#define TB_CONFIG_LIBM_HAVE_SQRT 1
-#define TB_CONFIG_LIBC_HAVE_STRCMP 1
-#define TB_CONFIG_LIBM_HAVE_ATAN2 1
-#define TB_CONFIG_LIBC_HAVE_MEMSET 1
-#define TB_CONFIG_LIBC_HAVE_WCSLEN 1
-#define TB_CONFIG_LIBC_HAVE_STRNCPY 1
-#define TB_CONFIG_LIBC_HAVE_LOCALTIME 1
-#define TB_CONFIG_LIBC_HAVE_WCSNCAT 1
-#define TB_CONFIG_LIBC_HAVE_STRCPY 1
-#define TB_CONFIG_LIBC_HAVE_SIGNAL 1
-#define TB_CONFIG_LIBC_HAVE_STRSTR 1
-#define TB_CONFIG_LIBC_HAVE_WCSNCMP 1
-#define TB_CONFIG_LIBC_HAVE_MBSTOWCS 1
-#define TB_CONFIG_LIBC_HAVE_WCSSTR 1
-#define TB_CONFIG_LIBC_HAVE_WCSCAT 1
-#define TB_CONFIG_LIBM_HAVE_POW 1
-#define TB_CONFIG_LIBC_HAVE_MEMCPY 1
-#define TB_CONFIG_MODULE_HAVE_HASH 1
-#define TB_CONFIG_LIBC_HAVE_WCSTOMBS 1
-#define TB_CONFIG_LIBC_HAVE_WCSNLEN 1
-#define TB_CONFIG_LIBC_HAVE_MEMCMP 1
-#define TB_CONFIG_LIBM_HAVE_EXP 1
-#define TB_CONFIG_LIBC_HAVE_STRNLEN 1
-#define TB_CONFIG_LIBM_HAVE_SIN 1
-#define TB_CONFIG_LIBM_HAVE_COS 1
-#define TB_CONFIG_LIBM_HAVE_ATAN 1
-#define TB_CONFIG_LIBM_HAVE_ASIN 1
-#define TB_CONFIG_LIBC_HAVE_SETJMP 1
-#define TB_CONFIG_LIBC_HAVE_STRNCAT 1
-#define TB_CONFIG_LIBC_HAVE_WCSNCPY 1
-#define TB_CONFIG_LIBM_HAVE_FMOD 1
-#define TB_CONFIG_LIBC_HAVE_GMTIME 1
-#define TB_CONFIG_LIBC_HAVE_FPUTS 1
-#define TB_CONFIG_LIBM_HAVE_TAN 1
-#define TB_CONFIG_LIBC_HAVE_STRCAT 1
-#define TB_CONFIG_LIBC_HAVE_STRLEN 1
-#define TB_CONFIG_MODULE_HAVE_NETWORK 1
-#define TB_CONFIG_MODULE_HAVE_THREAD 1
-#define TB_CONFIG_LIBC_HAVE_WCSCMP 1
-#define TB_CONFIG_LIBC_HAVE_STRNCMP 1
-
-// undefines
-#undef TB_CONFIG_TRACE_INFO_ONLY
-#undef TB_CONFIG_EXCEPTION_ENABLE
-#undef TB_CONFIG_MEMORY_UNALIGNED_ACCESS_ENABLE
-
-#endif
diff --git a/core/pkg/tbox.pkg/lib/linux/i386/libtbox.a b/core/pkg/tbox.pkg/lib/linux/i386/libtbox.a Binary files differnew file mode 100755 index 000000000..0f1a119f2 --- /dev/null +++ b/core/pkg/tbox.pkg/lib/linux/i386/libtbox.a diff --git a/core/pkg/tbox.pkg/lib/linux/x86_64/libtbox.a b/core/pkg/tbox.pkg/lib/linux/x86_64/libtbox.a Binary files differnew file mode 100755 index 000000000..94a5c2097 --- /dev/null +++ b/core/pkg/tbox.pkg/lib/linux/x86_64/libtbox.a diff --git a/core/pkg/tbox.pkg/lib/macosx/x86_64/libtbox.a b/core/pkg/tbox.pkg/lib/macosx/x86_64/libtbox.a Binary files differnew file mode 100755 index 000000000..107afe4ee --- /dev/null +++ b/core/pkg/tbox.pkg/lib/macosx/x86_64/libtbox.a diff --git a/core/pkg/tbox.pkg/lib/windows/x86/tbox.lib b/core/pkg/tbox.pkg/lib/windows/x86/tbox.lib Binary files differnew file mode 100644 index 000000000..c27b4af7d --- /dev/null +++ b/core/pkg/tbox.pkg/lib/windows/x86/tbox.lib diff --git a/core/plat/android/config.h b/core/plat/android/config.h deleted file mode 100755 index e55edbc80..000000000 --- a/core/plat/android/config.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef XM_CONFIG_H -#define XM_CONFIG_H - -// packages -// [packages] - -// major version -#define XM_CONFIG_VERSION_MAJOR [major] - -// minor version -#define XM_CONFIG_VERSION_MINOR [minor] - -// alter version -#define XM_CONFIG_VERSION_ALTER [alter] - -// build version -#define XM_CONFIG_VERSION_BUILD [build] - -// small -#define XM_CONFIG_SMALL [small] - -#endif diff --git a/core/plat/android/config.mak b/core/plat/android/config.mak deleted file mode 100755 index 8b1378917..000000000 --- a/core/plat/android/config.mak +++ /dev/null @@ -1 +0,0 @@ - diff --git a/core/plat/android/prefix.mak b/core/plat/android/prefix.mak deleted file mode 100755 index 648e487a6..000000000 --- a/core/plat/android/prefix.mak +++ /dev/null @@ -1,105 +0,0 @@ -# architecture makefile configure - -# prefix & suffix -BIN_PREFIX = -BIN_SUFFIX = .b - -OBJ_PREFIX = -OBJ_SUFFIX = .o - -LIB_PREFIX = lib -LIB_SUFFIX = .a - -DLL_PREFIX = lib -DLL_SUFFIX = .so - -ASM_SUFFIX = .S - -# tool -PRE_ := $(if $(PRE),$(PRE),arm-linux-androideabi-) -PRE_ := $(if $(BIN),$(BIN)/$(PRE_),$(PRE_)) -CC = $(PRE_)gcc -AR = $(PRE_)ar -STRIP = $(PRE_)strip -RANLIB = $(PRE_)ranlib -LD = $(PRE_)g++ -AS = -RM = rm -f -RMDIR = rm -rf -CP = cp -CPDIR = cp -r -MKDIR = mkdir -p -MAKE = make -r - -# cxflags: .c/.cc/.cpp files -CXFLAGS_RELEASE = -freg-struct-return -fno-bounds-check -fvisibility=hidden -CXFLAGS_DEBUG = -g -D__tb_debug__ -CXFLAGS = -c -Wall -fomit-frame-pointer -march=$(ARCH) \ - -I$(SDK)/platforms/android-8/arch-arm/usr/include -CXFLAGS-I = -I -CXFLAGS-o = -o - -# opti -ifeq ($(SMALL),y) -CXFLAGS_RELEASE += -Os -else -CXFLAGS_RELEASE += -O3 -endif - -# cflags: .c files -CFLAGS_RELEASE = -CFLAGS_DEBUG = -CFLAGS = \ - -std=c99 \ - -D_GNU_SOURCE=1 -D_REENTRANT \ - -Wno-parentheses \ - -Wno-switch -Wno-format-zero-length -Wdisabled-optimization \ - -Wpointer-arith -Wredundant-decls -Wno-pointer-sign -Wwrite-strings \ - -Wtype-limits -Wundef -Wmissing-prototypes -Wno-pointer-to-int-cast \ - -Wstrict-prototypes -fno-math-errno -fno-signed-zeros -fno-tree-vectorize \ - -Werror=implicit-function-declaration -Werror=missing-prototypes - -# ccflags: .cc/.cpp files -CCFLAGS_RELEASE = -CCFLAGS_DEBUG = -CCFLAGS = \ - -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ - -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 \ - -I$(SDK)/sources/cxx-stl/stlport/stlport - -# ldflags -LDFLAGS_RELEASE = -s -LDFLAGS_DEBUG = -LDFLAGS = -nostdlib \ - -L$(SDK)/platforms/android-8/arch-arm/usr/lib/ \ - $(SDK)/platforms/android-8/arch-arm/usr/lib/crtbegin_dynamic.o \ - $(SDK)/platforms/android-8/arch-arm/usr/lib/crtend_android.o -LDFLAGS-L = -L -LDFLAGS-l = -l -LDFLAGS-f = -LDFLAGS-o = -o - -# asflags -ASFLAGS_RELEASE = -ASFLAGS_DEBUG = -ASFLAGS = -ASFLAGS-I = -I -ASFLAGS-o = -o - -# arflags -ARFLAGS_RELEASE = -ARFLAGS_DEBUG = -ARFLAGS = -cr -ARFLAGS-o = - -# shflags -SHFLAGS_RELEASE = -s -SHFLAGS = -march=$(ARCH) -shared -Wl,-soname -nostdlib \ - -L$(SDK)/platforms/android-8/arch-arm/usr/lib/ \ - $(SDK)/platforms/android-8/arch-arm/usr/lib/crtbegin_so.o \ - $(SDK)/platforms/android-8/arch-arm/usr/lib/crtend_so.o - -# include sub-config -include $(PLAT_DIR)/config.mak - - diff --git a/core/plat/cygwin/config.h b/core/plat/cygwin/config.h deleted file mode 100755 index e55edbc80..000000000 --- a/core/plat/cygwin/config.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef XM_CONFIG_H -#define XM_CONFIG_H - -// packages -// [packages] - -// major version -#define XM_CONFIG_VERSION_MAJOR [major] - -// minor version -#define XM_CONFIG_VERSION_MINOR [minor] - -// alter version -#define XM_CONFIG_VERSION_ALTER [alter] - -// build version -#define XM_CONFIG_VERSION_BUILD [build] - -// small -#define XM_CONFIG_SMALL [small] - -#endif diff --git a/core/plat/cygwin/config.mak b/core/plat/cygwin/config.mak deleted file mode 100755 index 8b1378917..000000000 --- a/core/plat/cygwin/config.mak +++ /dev/null @@ -1 +0,0 @@ - diff --git a/core/plat/cygwin/prefix.mak b/core/plat/cygwin/prefix.mak deleted file mode 100755 index 06825b337..000000000 --- a/core/plat/cygwin/prefix.mak +++ /dev/null @@ -1,120 +0,0 @@ -# architecture makefile configure - -# prefix & suffix -BIN_PREFIX = -BIN_SUFFIX = .exe - -OBJ_PREFIX = -OBJ_SUFFIX = .obj - -LIB_PREFIX = -LIB_SUFFIX = .lib - -DLL_PREFIX = -DLL_SUFFIX = .dll - -ASM_SUFFIX = .S - -# prefix -PRE_ := $(if $(BIN),$(BIN)/$(PRE),) - -# cc -CC_ := ${shell if [ -f "/usr/bin/clang" ]; then echo "clang"; elif [ -f "/usr/local/bin/clang" ]; then echo "clang"; else echo "gcc"; fi } -CC_ := $(if $(findstring y,$(PROF)),gcc,$(CC_)) -CC = $(PRE_)$(CC_) - -# ld -LD_ := ${shell if [ -f "/usr/bin/clang++" ]; then echo "clang++"; elif [ -f "/usr/local/bin/clang++" ]; then echo "clang++"; else echo "g++"; fi } -LD_ := $(if $(findstring y,$(PROF)),g++,$(LD_)) -LD = $(PRE_)$(LD_) - -# cpu bits -BITS := $(if $(findstring x64,$(ARCH)),64,) -BITS := $(if $(findstring x86,$(ARCH)),32,) -BITS := $(if $(BITS),$(BITS),$(shell getconf LONG_BIT)) - -# tool -AR = $(PRE_)ar -STRIP = $(PRE_)strip -RANLIB = $(PRE_)ranlib -AS = yasm -RM = rm -f -RMDIR = rm -rf -CP = cp -CPDIR = cp -r -MKDIR = mkdir -p -MAKE = make -r - -# cxflags: .c/.cc/.cpp files -CXFLAGS_RELEASE = -freg-struct-return -fvisibility=hidden -CXFLAGS_DEBUG = -g -D__tb_debug__ -CXFLAGS = -m$(BITS) -c -Wall -Werror -Wno-error=deprecated-declarations -Wno-error=cpp -mssse3 -CXFLAGS-I = -I -CXFLAGS-o = -o - -# opti -ifeq ($(SMALL),y) -CXFLAGS_RELEASE += -Os -else -CXFLAGS_RELEASE += -O3 -endif - -# prof -ifeq ($(PROF),y) -CXFLAGS += -g -pg -fno-omit-frame-pointer -else -CXFLAGS_RELEASE += -fomit-frame-pointer -CXFLAGS_DEBUG += -fno-omit-frame-pointer -endif - -# cflags: .c files -CFLAGS_RELEASE = -CFLAGS_DEBUG = -CFLAGS = \ - -std=c99 \ - -D_GNU_SOURCE=1 -D_REENTRANT \ - -fno-math-errno -fno-signed-zeros -fno-tree-vectorize - -# ccflags: .cc/.cpp files -CCFLAGS_RELEASE = -fno-rtti -CCFLAGS_DEBUG = -CCFLAGS = -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 - -# ldflags -LDFLAGS_RELEASE = -static -LDFLAGS_DEBUG = -rdynamic -LDFLAGS = -m$(BITS) -LDFLAGS-L = -L -LDFLAGS-l = -l -LDFLAGS-f = -LDFLAGS-o = -o - -# prof -ifeq ($(PROF),y) -LDFLAGS += -pg -else -LDFLAGS_RELEASE += -s -LDFLAGS_DEBUG += -endif - -# asflags -ASFLAGS_RELEASE = -ASFLAGS_DEBUG = -ASFLAGS = -m$(BITS) -f elf -ASFLAGS-I = -I -ASFLAGS-o = -o - -# arflags -ARFLAGS_RELEASE = -ARFLAGS_DEBUG = -ARFLAGS = -cr -ARFLAGS-o = - -# shflags -SHFLAGS_RELEASE = -s -SHFLAGS = -m$(BITS) -shared -Wl,-soname - -# include sub-config -include $(PLAT_DIR)/config.mak - - diff --git a/core/plat/ios/config.h b/core/plat/ios/config.h deleted file mode 100755 index e55edbc80..000000000 --- a/core/plat/ios/config.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef XM_CONFIG_H -#define XM_CONFIG_H - -// packages -// [packages] - -// major version -#define XM_CONFIG_VERSION_MAJOR [major] - -// minor version -#define XM_CONFIG_VERSION_MINOR [minor] - -// alter version -#define XM_CONFIG_VERSION_ALTER [alter] - -// build version -#define XM_CONFIG_VERSION_BUILD [build] - -// small -#define XM_CONFIG_SMALL [small] - -#endif diff --git a/core/plat/ios/config.mak b/core/plat/ios/config.mak deleted file mode 100755 index 8b1378917..000000000 --- a/core/plat/ios/config.mak +++ /dev/null @@ -1 +0,0 @@ - diff --git a/core/plat/ios/prefix.mak b/core/plat/ios/prefix.mak deleted file mode 100755 index 08e2819cc..000000000 --- a/core/plat/ios/prefix.mak +++ /dev/null @@ -1,145 +0,0 @@ -# architecture makefile configure - -# prefix & suffix -BIN_PREFIX = -BIN_SUFFIX = .b - -OBJ_PREFIX = -OBJ_SUFFIX = .o - -LIB_PREFIX = lib -LIB_SUFFIX = .a - -DLL_PREFIX = lib -DLL_SUFFIX = .dylib - -ASM_SUFFIX = .S - -# prefix -PRE_ := $(if $(BIN),$(BIN)/$(PRE),xcrun -sdk iphoneos ) - -# toolchain -CC = $(PRE_)clang -MM = $(PRE_)clang -AR = $(PRE_)ar -STRIP = $(PRE_)strip -RANLIB = $(PRE_)ranlib -LD = $(PRE_)clang -AS = $(TOOL_DIR)/gas-preprocessor.pl $(PRE_)clang -RM = rm -f -RMDIR = rm -rf -CP = cp -CPDIR = cp -r -MKDIR = mkdir -p -MAKE = make -r - -# cxflags: .c/.cc/.cpp files -CXFLAGS_RELEASE = -fomit-frame-pointer -fvisibility=hidden -CXFLAGS_DEBUG = -g -D__tb_debug__ -CXFLAGS = \ - -arch $(ARCH) -c -Wall -mthumb $(CPU_CXFLAGS) \ - -Werror -Wno-error=deprecated-declarations -Qunused-arguments \ - -fmessage-length=0 -pipe -fpascal-strings -CXFLAGS-I = -I -CXFLAGS-o = -o - -# cflags: .c files -CFLAGS_RELEASE = -CFLAGS_DEBUG = -CFLAGS = -std=gnu99 - -# ccflags: .cc/.cpp files -CCFLAGS_RELEASE = -CCFLAGS_DEBUG = -CCFLAGS = - -# mxflags: .m/.mm files -MXFLAGS_RELEASE = -fomit-frame-pointer -fvisibility=hidden -MXFLAGS_DEBUG = -g -D__tb_debug__ -MXFLAGS = \ - -arch $(ARCH) -c -Wall -mthumb \ - -Werror -Wno-error=deprecated-declarations -Qunused-arguments \ - -fmessage-length=0 -pipe -fpascal-strings \ - "-DIBOutlet=__attribute__((iboutlet))" \ - "-DIBOutletCollection(ClassName)=__attribute__((iboutletcollection(ClassName)))" \ - "-DIBAction=void)__attribute__((ibaction)" -MXFLAGS-I = -I -MXFLAGS-o = -o - -# small -MXFLAGS-$(SMALL) += - -# mflags: .m files -MFLAGS_RELEASE = -MFLAGS_DEBUG = -MFLAGS = -std=gnu99 - -# mmflags: .mm files -MMFLAGS_RELEASE = -MMFLAGS_DEBUG = -MMFLAGS = - -# ldflags -LDFLAGS_RELEASE = -s -LDFLAGS_DEBUG = -LDFLAGS = -arch $(ARCH) -framework Foundation -LDFLAGS-L = -L -LDFLAGS-l = -l -LDFLAGS-f = -LDFLAGS-o = -o - -# asflags -ASFLAGS_RELEASE = -ASFLAGS_DEBUG = -ASFLAGS = -arch $(ARCH) -c -fPIC -ASFLAGS-I = -I -ASFLAGS-o = -o - -# arflags -ARFLAGS_RELEASE = -ARFLAGS_DEBUG = -ARFLAGS = -cr -ARFLAGS-o = - -# shflags -SHFLAGS_RELEASE = -s -SHFLAGS_DEBUG = -SHFLAGS = -arch $(ARCH) -dynamiclib -Wl,-single_module - -# cpu -ifeq ($(ARCH),armv6) -CXFLAGS += -mcpu=arm1176jzf-s -MXFLAGS += -mcpu=arm1176jzf-s -endif - -ifeq ($(ARCH),armv7) -CXFLAGS += -mcpu=cortex-a8 -MXFLAGS += -mcpu=cortex-a8 -endif - -ifeq ($(ARCH),armv7s) -CXFLAGS += -mcpu=cortex-a8 -MXFLAGS += -mcpu=cortex-a8 -endif - -# optimization -ifeq ($(SMALL),y) -CXFLAGS_RELEASE += -Os -MXFLAGS_RELEASE += -Os -else -CXFLAGS_RELEASE += -O3 -MXFLAGS_RELEASE += -O3 -endif - -# sdk -ifneq ($(SDK),) -CXFLAGS += -isysroot $(SDK) -MXFLAGS += -isysroot $(SDK) -LDFLAGS += -isysroot $(SDK) -SHFLAGS += -isysroot $(SDK) -endif - -# config -include $(PLAT_DIR)/config.mak - - diff --git a/core/plat/linux/prefix.mak b/core/plat/linux/prefix.mak index 2353b790a..c02a87119 100755 --- a/core/plat/linux/prefix.mak +++ b/core/plat/linux/prefix.mak @@ -41,8 +41,8 @@ MKDIR = mkdir -p MAKE = make -r # architecture flags -AHFLAGS := $(if $(AHFLAGS),$(AHFLAGS),$(if $(findstring x64,$(ARCH)),-m64,)) -AHFLAGS := $(if $(AHFLAGS),$(AHFLAGS),$(if $(findstring x86,$(ARCH)),-m32,)) +AHFLAGS := $(if $(AHFLAGS),$(AHFLAGS),$(if $(findstring x86_64,$(ARCH)),-m64,)) +AHFLAGS := $(if $(AHFLAGS),$(AHFLAGS),$(if $(findstring i386,$(ARCH)),-m32,)) # check flags for x64 or x86 ifneq ($(AHFLAGS),) diff --git a/core/plat/mac/config.h b/core/plat/mac/config.h deleted file mode 100755 index e55edbc80..000000000 --- a/core/plat/mac/config.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef XM_CONFIG_H -#define XM_CONFIG_H - -// packages -// [packages] - -// major version -#define XM_CONFIG_VERSION_MAJOR [major] - -// minor version -#define XM_CONFIG_VERSION_MINOR [minor] - -// alter version -#define XM_CONFIG_VERSION_ALTER [alter] - -// build version -#define XM_CONFIG_VERSION_BUILD [build] - -// small -#define XM_CONFIG_SMALL [small] - -#endif diff --git a/core/plat/mac/config.mak b/core/plat/mac/config.mak deleted file mode 100755 index 8b1378917..000000000 --- a/core/plat/mac/config.mak +++ /dev/null @@ -1 +0,0 @@ - diff --git a/core/plat/mac/prefix.mak b/core/plat/mac/prefix.mak deleted file mode 100755 index cd6d78560..000000000 --- a/core/plat/mac/prefix.mak +++ /dev/null @@ -1,171 +0,0 @@ -# architecture makefile configure - -# prefix & suffix -BIN_PREFIX = -BIN_SUFFIX = .b - -OBJ_PREFIX = -OBJ_SUFFIX = .o - -LIB_PREFIX = lib -LIB_SUFFIX = .a - -DLL_PREFIX = -DLL_SUFFIX = .dylib - -ASM_SUFFIX = .S - -# cpu bits -BITS := $(if $(findstring x64,$(ARCH)),64,) -BITS := $(if $(findstring x86,$(ARCH)),32,) -BITS := $(if $(BITS),$(BITS),$(shell getconf LONG_BIT)) - -# prefix -PRE_ := $(if $(BIN),$(BIN)/$(PRE),xcrun -sdk macosx ) - -# cc -CC = $(PRE_)clang -ifeq ($(CXFLAGS_CHECK),) -CC_CHECK = ${shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi } -CXFLAGS_CHECK := $(call CC_CHECK,-ftrapv,) $(call CC_CHECK,-fsanitize=address,) -export CXFLAGS_CHECK -endif - -# ld -LD = $(PRE_)clang -ifeq ($(LDFLAGS_CHECK),) -LD_CHECK = ${shell if $(LD) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi } -LDFLAGS_CHECK := $(call LD_CHECK,-ftrapv,) $(call LD_CHECK,-fsanitize=address,) -export LDFLAGS_CHECK -endif - -# tool -MM = $(PRE_)clang -AR = $(PRE_)ar -STRIP = $(PRE_)strip -RANLIB = $(PRE_)ranlib -AS = yasm -RM = rm -f -RMDIR = rm -rf -CP = cp -CPDIR = cp -r -MKDIR = mkdir -p -MAKE = make -r - -# cxflags: .c/.cc/.cpp files -CXFLAGS_RELEASE = -fvisibility=hidden -CXFLAGS_DEBUG = -g -D__tb_debug__ -CXFLAGS = -m$(BITS) -c -Wall -Werror -Wno-error=deprecated-declarations -Qunused-arguments -mssse3 -CXFLAGS-I = -I -CXFLAGS-o = -o - -# opti -ifeq ($(SMALL),y) -CXFLAGS_RELEASE += -Os -else -CXFLAGS_RELEASE += -O3 -endif - -# prof -ifeq ($(PROF),y) -CXFLAGS += -g -fno-omit-frame-pointer -else -CXFLAGS_RELEASE += -fomit-frame-pointer -CXFLAGS_DEBUG += -fno-omit-frame-pointer $(CXFLAGS_CHECK) -endif - -# cflags: .c files -CFLAGS_RELEASE = -CFLAGS_DEBUG = -CFLAGS = \ - -std=c99 \ - -D_GNU_SOURCE=1 -D_REENTRANT \ - -fno-math-errno -fno-tree-vectorize - -# ccflags: .cc/.cpp files -CCFLAGS_RELEASE = -CCFLAGS_DEBUG = -CCFLAGS = \ - -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ - -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 - -# mxflags: .m/.mm files -MXFLAGS_RELEASE = -fvisibility=hidden -MXFLAGS_DEBUG = -g -D__tb_debug__ -MXFLAGS = \ - -m$(BITS) -c -Wall -Werror -Wno-error=deprecated-declarations -Qunused-arguments \ - -mssse3 $(ARCH_CXFLAGS) -fmessage-length=0 -pipe -fpascal-strings \ - "-DIBOutlet=__attribute__((iboutlet))" \ - "-DIBOutletCollection(ClassName)=__attribute__((iboutletcollection(ClassName)))" \ - "-DIBAction=void)__attribute__((ibaction)" -MXFLAGS-I = -I -MXFLAGS-o = -o - -# opti -ifeq ($(SMALL),y) -MXFLAGS_RELEASE += -Os -else -MXFLAGS_RELEASE += -O3 -endif - -# prof -ifeq ($(PROF),y) -MXFLAGS += -g -fno-omit-frame-pointer -else -MXFLAGS_RELEASE += -fomit-frame-pointer -MXFLAGS_DEBUG += -fno-omit-frame-pointer $(LDFLAGS_CHECK) -endif - -# mflags: .m files -MFLAGS_RELEASE = -MFLAGS_DEBUG = -MFLAGS = -std=c99 - -# mmflags: .mm files -MMFLAGS_RELEASE = -MMFLAGS_DEBUG = -MMFLAGS = - -# ldflags -LDFLAGS_RELEASE = -LDFLAGS_DEBUG = -LDFLAGS = -m$(BITS) -all_load -pagezero_size 10000 -image_base 100000000 -mmacosx-version-min=10.7 -LDFLAGS-L = -L -LDFLAGS-l = -l -LDFLAGS-f = -LDFLAGS-o = -o - -# prof -ifeq ($(PROF),y) -else -LDFLAGS_RELEASE += -s -LDFLAGS_DEBUG += -ftrapv -endif - -# asflags -ASFLAGS_RELEASE = Wa,-march=native -ASFLAGS_DEBUG = -ASFLAGS = -m$(BITS) -f elf $(ARCH_ASFLAGS) -ASFLAGS-I = -I -ASFLAGS-o = -o - -# arflags -ARFLAGS_RELEASE = -ARFLAGS_DEBUG = -ARFLAGS = -cr -ARFLAGS-o = - -# shflags -SHFLAGS_RELEASE = -s -SHFLAGS = $(ARCH_LDFLAGS) -dynamiclib -mmacosx-version-min=10.7 - -# include directory -INC_DIR += /usr/include /usr/local/include - -# library directory -LIB_DIR += /usr/lib /usr/local/lib - -# config -include $(PLAT_DIR)/config.mak - - diff --git a/core/plat/mingw/config.h b/core/plat/mingw/config.h deleted file mode 100755 index e55edbc80..000000000 --- a/core/plat/mingw/config.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef XM_CONFIG_H -#define XM_CONFIG_H - -// packages -// [packages] - -// major version -#define XM_CONFIG_VERSION_MAJOR [major] - -// minor version -#define XM_CONFIG_VERSION_MINOR [minor] - -// alter version -#define XM_CONFIG_VERSION_ALTER [alter] - -// build version -#define XM_CONFIG_VERSION_BUILD [build] - -// small -#define XM_CONFIG_SMALL [small] - -#endif diff --git a/core/plat/mingw/config.mak b/core/plat/mingw/config.mak deleted file mode 100755 index 8b1378917..000000000 --- a/core/plat/mingw/config.mak +++ /dev/null @@ -1 +0,0 @@ - diff --git a/core/plat/mingw/prefix.mak b/core/plat/mingw/prefix.mak deleted file mode 100755 index 1d085fd63..000000000 --- a/core/plat/mingw/prefix.mak +++ /dev/null @@ -1,114 +0,0 @@ -# architecture makefile configure - -# prefix & suffix -BIN_PREFIX = -BIN_SUFFIX = .b - -OBJ_PREFIX = -OBJ_SUFFIX = .o - -LIB_PREFIX = lib -LIB_SUFFIX = .a - -DLL_PREFIX = lib -DLL_SUFFIX = .so - -ASM_SUFFIX = .S - -# prefix -ifeq ($(PRE_),) -PRE := $(if $(findstring x86,$(ARCH)),$(if $(findstring mac,$(HOST)),i386-mingw32-,$(if $(findstring msys,$(HOST)),,i686-w64-mingw32-)),$(PRE)) -PRE := $(if $(findstring x64,$(ARCH)),x86_64-w64-mingw32-,$(PRE)) -PRE_ := $(if $(BIN),$(BIN)/$(PRE),$(PRE)) -export PRE_ -endif - -# cpu bits -BITS := $(if $(findstring x64,$(ARCH)),64,) -BITS := $(if $(findstring x86,$(ARCH)),32,) - -# tool -CC = $(PRE_)gcc -AR = $(PRE_)ar -STRIP = $(PRE_)strip -RANLIB = $(PRE_)ranlib -LD = $(PRE_)g++ -AS = -RM = rm -f -RMDIR = rm -rf -CP = cp -CPDIR = cp -r -MKDIR = mkdir -p -MAKE = make -r - -# cxflags: .c/.cc/.cpp files -CXFLAGS_RELEASE = -freg-struct-return -CXFLAGS_DEBUG = -g -D__tb_debug__ -CXFLAGS = -m$(BITS) -c -Wall -Werror -Wno-error=deprecated-declarations -CXFLAGS-I = -I -CXFLAGS-o = -o - -# sse -ifneq ($(HOST),mac) -CXFLAGS += -mssse3 -endif - -# opti -ifeq ($(SMALL),y) -CXFLAGS_RELEASE += -Os -else -CXFLAGS_RELEASE += -O3 -endif - -# prof -ifeq ($(PROF),y) -CXFLAGS += -g -fno-omit-frame-pointer -else -CXFLAGS_RELEASE += -fomit-frame-pointer -CXFLAGS_DEBUG += -fno-omit-frame-pointer -endif - -# cflags: .c files -CFLAGS_RELEASE = -CFLAGS_DEBUG = -CFLAGS = \ - -std=gnu99 \ - -D_GNU_SOURCE=1 -D_REENTRANT -fno-math-errno - -# ccflags: .cc/.cpp files -CCFLAGS_RELEASE = -CCFLAGS_DEBUG = -CCFLAGS = \ - -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ - -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 - -# ldflags -LDFLAGS_RELEASE = $(if $(findstring y,$(PROF)),,-s) -LDFLAGS_DEBUG = -LDFLAGS = -m$(BITS) -static -LDFLAGS-L = -L -LDFLAGS-l = -l -LDFLAGS-f = -LDFLAGS-o = -o - -# asflags -ASFLAGS_RELEASE = -ASFLAGS_DEBUG = -ASFLAGS = -m$(BITS) -f elf $(ARCH_ASFLAGS) -ASFLAGS-I = -I -ASFLAGS-o = -o - -# arflags -ARFLAGS_RELEASE = -ARFLAGS_DEBUG = -ARFLAGS = -cr -ARFLAGS-o = - -# shflags -SHFLAGS_RELEASE = -s -SHFLAGS = -shared -Wl,-soname - -# include sub-config -include $(PLAT_DIR)/config.mak - - diff --git a/core/plat/msvc/config.h b/core/plat/msvc/config.h deleted file mode 100755 index e55edbc80..000000000 --- a/core/plat/msvc/config.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef XM_CONFIG_H -#define XM_CONFIG_H - -// packages -// [packages] - -// major version -#define XM_CONFIG_VERSION_MAJOR [major] - -// minor version -#define XM_CONFIG_VERSION_MINOR [minor] - -// alter version -#define XM_CONFIG_VERSION_ALTER [alter] - -// build version -#define XM_CONFIG_VERSION_BUILD [build] - -// small -#define XM_CONFIG_SMALL [small] - -#endif diff --git a/core/plat/msvc/config.mak b/core/plat/msvc/config.mak deleted file mode 100755 index 8b1378917..000000000 --- a/core/plat/msvc/config.mak +++ /dev/null @@ -1 +0,0 @@ - diff --git a/core/plat/msvc/prefix.mak b/core/plat/msvc/prefix.mak deleted file mode 100755 index 7cbc0be34..000000000 --- a/core/plat/msvc/prefix.mak +++ /dev/null @@ -1,100 +0,0 @@ -# architecture makefile configure - -# prefix & suffix -BIN_PREFIX = -BIN_SUFFIX = .exe - -OBJ_PREFIX = -OBJ_SUFFIX = .obj - -LIB_PREFIX = -LIB_SUFFIX = .lib - -DLL_PREFIX = -DLL_SUFFIX = .dll - -ASM_SUFFIX = .S - -# tool -CC = cl.exe -AR = link.exe -STRIP = -RANLIB = -LD = link.exe -AS = -RM = rm -f -RMDIR = rm -rf -CP = cp -CPDIR = cp -r -MKDIR = mkdir -p -MAKE = make -r -PWD = pwd - -# cxflags: .c/.cc/.cpp files -CXFLAGS_RELEASE = -MT -Gy -Zi -CXFLAGS_DEBUG = -Od -GS -MTd -ZI -RTC1 -D__tb_debug__ -CXFLAGS = \ - -SSE2 \ - -D_MBCS -D_CRT_SECURE_NO_WARNINGS -DNOCRYPT -DNOGDI -Gd -Gm -W3 -WX -nologo -c -TP -EHsc \ - -I'/usr/local/inc' -CXFLAGS-I = -I -CXFLAGS-o = -Fo - -# opti -ifeq ($(SMALL),y) -CXFLAGS_RELEASE += -Os -else -CXFLAGS_RELEASE += -Ox -endif - -# cflags: .c files -CFLAGS_RELEASE = -CFLAGS_DEBUG = -CFLAGS = - -# ccflags: .cc/.cpp files -CCFLAGS_RELEASE = -CCFLAGS_DEBUG = -CCFLAGS = - -# ldflags -LDFLAGS_RELEASE = -LDFLAGS_DEBUG = -debug -LDFLAGS = \ - -nodefaultlib:"msvcrt.lib" \ - -manifest -manifestuac:"level='asInvoker' uiAccess='false'" \ - -nologo -machine:x86 -dynamicbase -nxcompat -libpath:'$(HOME)tool\msys\local\lib' -LDFLAGS-L = -libpath: -LDFLAGS-l = -LDFLAGS-f = .lib -LDFLAGS-o = -out: - -# asflags -ASFLAGS_RELEASE = -ASFLAGS_DEBUG = -ASFLAGS = -ASFLAGS-I = -ASFLAGS-o = - -# arflags -ARFLAGS_RELEASE = -ARFLAGS_DEBUG = -debug -ARFLAGS = -lib -nologo -machine:x86 -libpath:'$(HOME)tool\msys\local\lib' -ARFLAGS-o = -out: - -# shflags -SHFLAGS_RELEASE = -SHFLAGS_DEBUG = -debug -SHFLAGS = -dll -nologo -machine:x86 -libpath:'$(HOME)tool\msys\local\lib' - -# prof -ifeq ($(PROF),y) -LDFLAGS_RELEASE += -debug -ARFLAGS_RELEASE += -debug -SHFLAGS_RELEASE += -debug -endif - -# include sub-config -include $(PLAT_DIR)/config.mak - - diff --git a/core/src/xmake/machine.c b/core/src/xmake/machine.c index 280069f7b..3f33f58ef 100755 --- a/core/src/xmake/machine.c +++ b/core/src/xmake/machine.c @@ -187,6 +187,15 @@ static tb_bool_t xm_machine_main_get_program_directory(xm_machine_impl_t* impl, tb_bool_t ok = tb_false; do { + // get it from the environment variable first + tb_char_t data[TB_PATH_MAXN] = {0}; + if (tb_environment_first("XMAKE_PROGRAM_DIR", data, sizeof(data)) && tb_path_absolute(data, path, maxn)) + { + // ok + ok = tb_true; + break; + } + #ifdef TB_CONFIG_OS_WINDOWS // get the program directory tb_size_t size = GetModuleFileName(tb_null, path, maxn); @@ -204,30 +213,23 @@ static tb_bool_t xm_machine_main_get_program_directory(xm_machine_impl_t* impl, break; } } -#else - // get it from the environment variable - tb_char_t data[TB_PATH_MAXN] = {0}; - if (!tb_environment_first("XMAKE_PROGRAM_DIR", data, sizeof(data))) - { - // error - tb_printf("error: please set XMAKE_PROGRAM_DIR first!\n"); - break; - } - - // get the full path - if (!tb_path_absolute(data, path, maxn)) break; + + // ok + ok = tb_true; #endif + + } while (0); + + // ok? + if (ok) + { // trace tb_trace_d("program: %s", path); // save the directory to the global variable: _PROGRAM_DIR lua_pushstring(impl->lua, path); lua_setglobal(impl->lua, "_PROGRAM_DIR"); - - // ok - ok = tb_true; - - } while (0); + } // ok? return ok; diff --git a/install.bat b/install.bat index 4015a9566..c82634001 100644 --- a/install.bat +++ b/install.bat @@ -35,13 +35,14 @@ if not exist "%xmake_dir_install%" mkdir "%xmake_dir_install%" rem compile xmake-core
echo compiling xmake-core...
+set XMAKE_PROGRAM_DIR=%~dp0\xmake
cd core
-cmd /K build.bat
+..\tools\xmake.exe
cd ..
rem install the xmake core file
echo installing xmake-core...
-set xmake_core=core\bin\demo.pkg\bin\msvc\x86\demo.exe
+set xmake_core=core\build\demo.exe
set xmake_core_install=%xmake_dir_install%\xmake.exe
copy /Y "%xmake_core%" "%xmake_core_install%" > install.log
diff --git a/tools/xmake.exe b/tools/xmake.exe Binary files differnew file mode 100644 index 000000000..5cd5d3479 --- /dev/null +++ b/tools/xmake.exe |
