Merge branch 'master' into cooking

This commit is contained in:
Dale Weiler 2013-11-30 13:14:04 -05:00
commit 2024b3bd71
4 changed files with 25 additions and 8 deletions

View file

@ -7,4 +7,4 @@ Thanks to:
Rudolf `divVerent` Polzer - Technical support and assistance Rudolf `divVerent` Polzer - Technical support and assistance
Matthias `matthiaskrgr` Krüger - Miscellaneous assistance Matthias `matthiaskrgr` Krüger - Miscellaneous assistance
Samual `Samual` Lenks - Preprocessor assistance Samual `Samual` Lenks - Preprocessor assistance
Igor `ignatenkobrian` Gnatenko - Fedora packages Igor `ignatenkobrain` Gnatenko - Fedora packages

View file

@ -8,6 +8,9 @@ For install gmqcc do this:
For install qcvm do this: For install qcvm do this:
# yum install qcvm # yum install qcvm
For install gmqpak do this:
# yum install gmqpak
To use the spec files in this fedora directory you need the core To use the spec files in this fedora directory you need the core
development tools , building enviroment for the user, and development tools , building enviroment for the user, and
the directory structure for it. If you don't already have these, issue the directory structure for it. If you don't already have these, issue
@ -21,8 +24,7 @@ $ rpmdev-setuptree
Prepare and build the RPMs. Prepare and build the RPMs.
$ cp gmqcc.spec ~/rpmbuild/SPECS/ $ cp gmqcc.spec ~/rpmbuild/SPECS/
$ wget https://github.com/graphitemaster/gmqcc/archive/0.2.9.tar.gz -o ~/rpmbuild/SOURCES/gmqcc-0.2.9.tar.gz $ wget https://github.com/graphitemaster/gmqcc/archive/0.3.5.tar.gz -o ~/rpmbuild/SOURCES/gmqcc-0.3.5.tar.gz
$ wget https://raw.github.com/graphitemaster/gmqcc/master/distro/archlinux/release/build_fix.patch -o ~/rpmbuild/SPECS/build_fix.patch
$ rpmbuild -ba ~/rpmbuild/SPECS/gmqcc.spec $ rpmbuild -ba ~/rpmbuild/SPECS/gmqcc.spec
Now we have RPMs in ~/rpmbuild/RPMS/ and you can install it via yum. Now we have RPMs in ~/rpmbuild/RPMS/ and you can install it via yum.

View file

@ -1,10 +1,15 @@
Name: gmqcc Name: gmqcc
Version: 0.3.0 Version: 0.3.5
Release: 2%{?dist} Release: 2%{?dist}
Summary: Improved Quake C Compiler Summary: Improved Quake C Compiler
License: MIT License: MIT
URL: http://graphitemaster.github.io/gmqcc/ URL: http://graphitemaster.github.io/gmqcc/
Source0: https://github.com/graphitemaster/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source0: https://github.com/graphitemaster/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
# fix build on big endian arches - stdlib.h required for exit()
Patch0: %{name}-0.3.5-stdlib.patch
# tests fail on big endians
ExclusiveArch: %{ix86} x86_64 %{arm}
%description %description
Modern written-from-scratch compiler for the QuakeC language with Modern written-from-scratch compiler for the QuakeC language with
@ -28,8 +33,9 @@ directories, or whole PAKs, as well as the opposite (creation of PAK files).
%prep %prep
%setup -q %setup -q
%patch0 -p1
echo '#!/bin/sh' > ./configure echo '#!/bin/sh' > ./configure
chmod +x ./configure chmod +x ./configure
# and for all for all of those switches they increase the runtime of the compile # and for all for all of those switches they increase the runtime of the compile
# making compiles of code slower # making compiles of code slower
@ -61,20 +67,28 @@ make check
%files %files
%doc LICENSE README AUTHORS CHANGES TODO %doc LICENSE README AUTHORS CHANGES TODO
%doc gmqcc.ini.example %doc gmqcc.ini.example
%{_mandir}/man1/gmqcc.1.gz %{_mandir}/man1/gmqcc.1*
%{_bindir}/gmqcc %{_bindir}/gmqcc
%files -n qcvm %files -n qcvm
%doc LICENSE README AUTHORS CHANGES TODO %doc LICENSE README AUTHORS CHANGES TODO
%{_mandir}/man1/qcvm.1.gz %{_mandir}/man1/qcvm.1*
%{_bindir}/qcvm %{_bindir}/qcvm
%files -n gmqpak %files -n gmqpak
%doc LICENSE README AUTHORS CHANGES TODO %doc LICENSE README AUTHORS CHANGES TODO
%{_mandir}/man1/gmqpak.1.gz %{_mandir}/man1/gmqpak.1*
%{_bindir}/gmqpak %{_bindir}/gmqpak
%changelog %changelog
* Sat Nov 16 2013 Dan Horák <dan[at]danny.cz> - 0.3.5-2
- fix build on big endian arches
- use the standard wildcarded filename for man pages
- and make it Exclusive for little endians because tests fail on big endians
* Thu Nov 14 2013 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.3.5-1
- 0.3.5 upstream release
* Thu Sep 26 2013 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.3.0-2 * Thu Sep 26 2013 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.3.0-2
- Optimizing compile flags - Optimizing compile flags

1
util.c
View file

@ -22,6 +22,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
#define GMQCC_PLATFORM_HEADER #define GMQCC_PLATFORM_HEADER
#include <stdlib.h>
#include "gmqcc.h" #include "gmqcc.h"
#include "platform.h" #include "platform.h"