064566085e
get rid of '$Rev$'
2016-02-04 19:29:25 +01:00
4b0e11daa7
more portable installers [ci skip]
...
https://forum.megaglest.org/index.php?topic=9789.msg92373#msg92373
2016-01-30 21:45:44 +01:00
2cfb985441
fix for missing 'others' directory
2016-01-25 23:52:51 +01:00
570a49164e
version number returns to 'dev'
2016-01-24 15:46:49 +01:00
aa2d9f7de4
version number for release
2016-01-24 12:00:38 +01:00
034576d403
we are searching for wx3.0.X only
2016-01-23 21:47:56 +01:00
1125a2b405
added switch for compilation [W]ithout wxWidgets; updated list of deps related with curl
2016-01-18 20:59:21 +01:00
83ece3d7c8
Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop
2016-01-09 20:03:21 -08:00
fc729e9f70
- added compile support for ubuntu 16.04
2016-01-09 20:02:39 -08:00
bf1ef05531
fixed linux installer
2016-01-10 00:57:57 +01:00
e611dfe4a5
this may help for C:\megaglestinstallscreen.jpg left after uninstall & reverse order may help for wrong 'last installed app' issues [ci skip]
2016-01-09 13:54:34 +01:00
b30d6f9483
let's try to live without those odd duplicates [ci skip]
2016-01-09 13:42:31 +01:00
a7d2ca99e1
let's try to follow upstream's method [ci skip]
2016-01-09 13:38:27 +01:00
1ed6b6b835
few fixes for .nsi script [ci skip]
2016-01-09 08:38:51 +01:00
3edbff630d
- added x64 based binaries
2016-01-06 19:00:48 -08:00
a64c9f7519
- make windows isntall skip .git folders and linux binaries for glexemel
2016-01-06 15:53:31 -08:00
721c48036b
- upgraded msvc to v2015 sp1
2015-12-28 17:57:47 -08:00
07d0e36f49
Merge branch 'develop' of https://github.com/MegaGlest/megaglest-source into develop
2015-12-28 12:59:32 -08:00
165a6a55ec
- testing
2015-12-28 12:59:09 -08:00
53d1f63741
Make git a bit more usable
2015-12-27 00:53:09 +01:00
0cad944118
implemented appdata 2/2
2015-12-14 23:57:05 +01:00
66ad196b74
better method for handling rolling releases [ci skip]
2015-12-14 01:57:41 +01:00
c47add1ef1
no static builds for rolling releases by default
2015-12-13 23:50:43 +01:00
a5a1e2b717
tiny polishing related with gcc & wxWidgets
2015-12-07 17:20:58 +01:00
fe77c32cfa
updated list of the libs [ci skip]
2015-12-06 10:54:47 +01:00
b23ea6bfdd
removed missing files (VLC related, 32 bit) from the list
2015-12-03 22:05:08 +01:00
6ff1668b89
list of the libs for linux mint 17
2015-11-25 20:39:43 +01:00
d71e0270dd
fix typo
...
[no ci]
2015-11-23 01:10:48 +01:00
d5f1debabd
Coverity Scan / Linux: fix $hostname
...
[no ci]
2015-11-23 00:52:07 +01:00
794e13b907
Update Linux Coverity Scan script
...
new submission URL
[no ci]
2015-11-23 00:42:43 +01:00
d9b5f89c7a
Update coverity-scan.bat
...
* new submission URL
* make script work with VC2015
* support both 32-bit and 64-bit builds (configurable)
2015-11-22 21:47:49 +01:00
1a698f0225
tiny improvements related with CI & submodules
2015-11-22 20:00:56 +01:00
e3d2cfb09b
- proper path for win32 openal when building binary archive
2015-11-21 12:03:35 -08:00
fcbf254a05
linux's installer based on binary and data files (no parallel configuration anymore)
2015-11-20 20:09:39 +01:00
72b3d3008d
- updated windows projects to new version of curl to fix crashes (requires downloading updated deps, delete old dep folder and 7z)
2015-11-17 14:04:06 -08:00
9b7bb4246c
simplified procedure for determining why 'vlc is not found'; ubuntu 14.04 also requires libvlccore-dev
2015-11-16 23:55:03 +01:00
5b3d3baa81
tiny fix for mac [ci skip]
2015-11-16 19:33:19 +01:00
2b06670b10
linux: improved script for headless servers; other scripts more friendly for mods
2015-11-14 00:13:45 +01:00
0f546567bd
and data archive as 7z for snapshots [ci skip]
2015-11-10 23:37:57 +01:00
f6f05e4b9d
tiny fix for data script [ci skip]
2015-11-10 22:15:36 +01:00
884c11e41d
lets check how those improvements work with jenkins
2015-11-10 21:25:29 +01:00
05ca47574d
fix related with 'single install directory' [ci skip]
2015-11-08 22:44:32 +01:00
81df224573
tiny fix for mac [ci skip]
2015-11-08 20:30:37 +01:00
652cf1c5eb
updated .ignore for windows
2015-11-08 19:42:24 +01:00
fe96ce94a8
attempt fo fix compilation mac+jenkins
2015-11-08 15:06:50 +01:00
6b56813281
new parameter for CI
2015-11-08 08:31:40 +01:00
d3c193a7c8
- g2xml output path consistent with rest of projects
2015-11-07 04:22:07 -08:00
f25dc505a5
- added w32 binary archive
2015-11-07 04:08:36 -08:00
db814b7609
- added missing windows project file
2015-11-07 03:22:37 -08:00
ae6f522917
- fixed win32 script url
2015-11-06 15:18:29 -08:00
232e24cfa6
fix VC2015 deps download URI
2015-11-07 00:13:31 +01:00
8a4ee15e59
Merge branch 'develop' into feature/sdl2
2015-11-05 20:45:53 +01:00
75aaed1b3d
- changed win64 build to use streflop by default
2015-11-04 17:36:22 -08:00
ef18b0e974
default compiller for mac is Clang when seems like Gcc was oficially killed on mac 10.11+; (killers should be really ashamed by this) hmm maybe we should drop support for whole bsd family?... :D
2015-11-02 20:04:26 +01:00
b83fab237b
- speed up msvc compile
2015-10-28 22:43:38 -07:00
8aa7928567
- correct msvc intermediate folders for some projects to avoid compile collisions
2015-10-28 22:34:30 -07:00
952e0a6315
- editor and g3d viewer work in wxwidgets 3.0.2
2015-10-26 19:49:25 -07:00
584b991f5c
- few updates to the msvc 2015 build scripts to fix some issues
2015-10-26 16:37:57 -07:00
18020e3f90
- added support for xp compatible 32 bit windows builds
2015-10-26 15:45:38 -07:00
465e718637
and one more fix for mac
2015-10-26 21:19:31 +01:00
9932920712
few improvements in compilation on mac
2015-10-26 20:56:55 +01:00
719029358f
- msvc 2015 build script works
2015-10-24 23:48:40 -07:00
81346ba6b9
- updated msvc 2015 build script to point to new dependency url
2015-10-24 22:41:10 -07:00
86912ce2a6
- added support for vc 2015
2015-10-24 22:02:49 -07:00
75077c4a50
- added support for miniupnpc 1.9, this fixes #79 (cherry-pick to develop & RC)
2015-10-22 17:34:14 +02:00
49ce8e729b
- added support for miniupnpc 1.9
2015-10-21 18:11:19 -07:00
fb0ac449be
- more windows updates for compiling sdl2
2015-10-17 21:09:53 -07:00
92aa2a7e04
- updated windows build for sdl2
2015-10-17 17:58:25 -07:00
41baf43bf5
moved mojosetup to submodule; synchronized with updated mojosetup version [ci skip]
2015-10-11 19:25:42 +02:00
48d0d2afbf
updated deployment target for macos; added info about used wxWidgests' libs [ci skip]
2015-10-09 18:16:12 +02:00
563837ba7a
new dependency related with curl in the deb family; fixed bug related with unrecognized translated option
2015-10-06 19:31:10 +02:00
c5b12fa266
- remove sdl from deps on ubuntu 12.04 since we compile on travis
2015-09-29 02:05:26 -07:00
a9ce962f46
- update deps file so travis uses sdl2
2015-09-28 23:35:00 -07:00
23ea9f6201
first steps for sdl2 ( still many compile errors )
2015-09-29 01:30:28 +02:00
5c5493397a
fix for old cmake version
2015-09-27 19:58:30 +02:00
4bef525bf3
removed not required CURL module, renamed several cmake-build options for be more easy sortable by name
2015-09-27 19:46:35 +02:00
4ad684deaf
updated modules: LUA, GLEW
2015-09-22 01:04:22 +02:00
ca5cd29ef1
removed not required modules: LUAJIT, wxWidgets, PackageHandleStandardArgs
2015-09-21 23:56:55 +02:00
6ac255095a
implemented basic support for SDL2 in cmake files (only); changed a general idea of how and where are showed deprecation warnings
2015-09-18 19:17:52 +02:00
617bc9a89e
extended support for lua to v5.3; removed some duplicate messages showing up during 'cmake configuration' time
2015-08-20 16:43:14 +02:00
7018deef4a
added some echo about branch and commit useful for CI
2015-07-06 20:16:00 +02:00
08d71327ed
collecting also vlc's plugins
2015-06-30 19:24:18 +02:00
007e8098a3
for some reason recently 'vlccore-dev' is required in debian family
2015-06-28 19:52:29 +02:00
64a749d4cc
useful log for creating mini update
2015-06-15 22:59:20 +02:00
d323d58027
older problem with fontconfig
2015-06-14 20:01:43 +02:00
fd5a71ac52
improved configuration in the scripts
2015-06-14 19:42:48 +02:00
74cbbba6ba
improvements for static build and a bit of cleaning
2015-06-14 19:24:08 +02:00
fecf89f295
Cosmetics
...
[CI skip]
2015-06-10 12:02:45 +02:00
0510e338c1
Auxiliary files have moved to GitHib
2015-06-08 02:59:37 +02:00
a63eeee356
looking for required libs reqursively, #63
2015-06-07 17:59:33 +02:00
f926285bf6
since now required dynamic libs from non standard locations will be added to the mac packages, #63
2015-06-04 23:26:50 +02:00
969b3d897b
implemented new scripts into release scripts-tools; fixed content of blender directory
2015-05-24 17:16:25 +02:00
5495bd1ba8
added new script which helps to improve .desktop files' configuration for standalone linux's client
2015-05-24 17:13:35 +02:00
4d4b227229
added new script which helps to prepare mini update package for standalone linux's client
2015-05-24 17:12:23 +02:00
1f09c212e7
improved version of basic linux's scripts
2015-05-24 17:06:47 +02:00
4df898cd70
removed redundant script
2015-05-17 16:06:18 +02:00
b07b65e6f8
removed outdated fedora related data
2015-05-17 14:18:50 +02:00
34d52e40d7
updated support for new versions of ubuntu
2015-04-29 20:23:03 +02:00
397be04584
Merge pull request #10 from filux/develop
...
Masterserver's code in the separate repository 2/2.
almost year since pr :)
2015-03-19 20:56:40 +01:00
fbd8937762
New git utility script
...
[skip ci]
2015-03-19 20:51:34 +01:00
5046d4c4a7
improved scripts
2015-03-16 21:07:36 +01:00
b50efbb75e
updated version number for development
2015-03-09 01:05:24 +01:00
90c307182e
updated version number for release
2015-03-09 00:34:59 +01:00
2eb3f7f6d3
Merge remote-tracking branch 'upstream/develop' into develop
2015-02-27 21:02:51 +01:00
61ea9e6c06
fixed tiny bug in condition
2015-02-25 18:11:51 +01:00
81ace6abbd
updated servers' list
2015-02-25 16:51:28 +01:00
473bde8865
improved nasty default settings
2015-02-25 16:50:23 +01:00
d3911ea45e
initial version of scripts for macos
2015-02-25 16:48:53 +01:00
966da32472
better support for macos, this also closes #36
2015-02-24 09:45:17 +01:00
e7ae5d2ca2
ini files for macos
2015-02-23 19:32:27 +01:00
e934a48fe2
added "mac ports" path
2015-02-23 19:24:53 +01:00
60fb61937d
bundle resources
2015-02-23 19:17:14 +01:00
f2b9a25198
support also for macos
2015-02-23 19:10:32 +01:00
92b599a291
Merge pull request #58 from goetzk/buildable-package
...
Changes to make package build and run on osx
2015-02-17 22:35:19 +01:00
c21db67721
Changes to make package build and run on osx
...
MegaGlest is the correct spelling, the process of building a package upper
cases the binary so I'm removing my modification via an earlier branch.
This also sets CUSTOM_DATA_INSTALL_PATH to /Applications - this is the final
step in getting MegaGlest.app to launch after building and installing.
The previously hard coded path was ok for gnumake but failed when Xcode got
involved as it has build types (release/debug/et al) which the hard coding
didn't support. I've added an if/else catch for the two build types that i've
seen while working on megaglest and it should be trivial to add any others that
may be desirable.
There is still an outstanding issue of embedding dependencies or using system
provided dependancies which I haven't sorted out.
2015-02-15 18:33:56 +11:00
06bb4104dc
Run dos2unix on COPYRIGHT.source_code.txt
...
COPYRIGHT.source_code.txt is inlined during the package building stage on OSX
when built using Xcode. To prevent it causing Rez to fail due to CRLF line
endings we unconditionally run dos2unix against the file during build. In the
cases where this wouldn't have caused a problem there is no regression and in
the cases where its necesary the file is fixed without manual intervention
2015-02-14 10:31:24 +11:00
c453aa778b
eliminated ugly icons from installer in linux's menu
2015-02-07 13:11:24 +01:00
615cac7138
Merge pull request #54 from filux/feature/new-version-management
...
changed version number management and same versioning for game, map-editor and g3dviewer
2015-02-02 22:37:04 +01:00
7451e49213
mapeditor and g3dviever will have always same version number as game, also game and binary packages will have always same version
2015-02-02 22:20:57 +01:00
da33c43230
a bit more manual but also cleaner way of updating version number
2015-02-02 22:13:17 +01:00
adb71b4add
get rid of AccessControl.dll in repository
...
this is now downloaded on demand.
2015-02-02 00:17:05 +01:00
5192c3f87f
proposition of different version number management
2015-02-01 15:45:07 +01:00
69e9dff754
better support for static build on debian
2015-01-31 11:53:59 +01:00
5eeac92fb4
refreshed list of dependencies
2015-01-31 11:49:07 +01:00
045f171b9a
linux's binary without glest-dev.ini
2015-01-25 12:57:12 +01:00
509266e9a9
Merge remote-tracking branch 'upstream/develop' into develop
...
Conflicts:
source/masterserver/flags/ad.png
source/masterserver/flags/af.png
source/masterserver/flags/ag.png
source/masterserver/flags/ai.png
source/masterserver/flags/al.png
source/masterserver/flags/am.png
source/masterserver/flags/ar.png
source/masterserver/flags/as.png
source/masterserver/flags/at.png
source/masterserver/flags/au.png
source/masterserver/flags/aw.png
source/masterserver/flags/ax.png
source/masterserver/flags/az.png
source/masterserver/flags/ba.png
source/masterserver/flags/bb.png
source/masterserver/flags/bd.png
source/masterserver/flags/be.png
source/masterserver/flags/bf.png
source/masterserver/flags/bg.png
source/masterserver/flags/bi.png
source/masterserver/flags/bj.png
source/masterserver/flags/bm.png
source/masterserver/flags/bn.png
source/masterserver/flags/bo.png
source/masterserver/flags/br.png
source/masterserver/flags/bs.png
source/masterserver/flags/bt.png
source/masterserver/flags/bv.png
source/masterserver/flags/bw.png
source/masterserver/flags/by.png
source/masterserver/flags/bz.png
source/masterserver/flags/ca.png
source/masterserver/flags/cc.png
source/masterserver/flags/cf.png
source/masterserver/flags/cg.png
source/masterserver/flags/ci.png
source/masterserver/flags/ck.png
source/masterserver/flags/cl.png
source/masterserver/flags/cm.png
source/masterserver/flags/cn.png
source/masterserver/flags/co.png
source/masterserver/flags/cr.png
source/masterserver/flags/cs.png
source/masterserver/flags/cu.png
source/masterserver/flags/cv.png
source/masterserver/flags/cx.png
source/masterserver/flags/cz.png
source/masterserver/flags/de.png
source/masterserver/flags/dj.png
source/masterserver/flags/dk.png
source/masterserver/flags/dm.png
source/masterserver/flags/do.png
source/masterserver/flags/dz.png
source/masterserver/flags/ec.png
source/masterserver/flags/eg.png
source/masterserver/flags/eh.png
source/masterserver/flags/er.png
source/masterserver/flags/es.png
source/masterserver/flags/et.png
source/masterserver/flags/fi.png
source/masterserver/flags/fj.png
source/masterserver/flags/fk.png
source/masterserver/flags/fm.png
source/masterserver/flags/fr.png
source/masterserver/flags/ga.png
source/masterserver/flags/gb.png
source/masterserver/flags/gd.png
source/masterserver/flags/ge.png
source/masterserver/flags/gf.png
source/masterserver/flags/gh.png
source/masterserver/flags/gl.png
source/masterserver/flags/gm.png
source/masterserver/flags/gn.png
source/masterserver/flags/gp.png
source/masterserver/flags/gq.png
source/masterserver/flags/gr.png
source/masterserver/flags/gs.png
source/masterserver/flags/gt.png
source/masterserver/flags/gu.png
source/masterserver/flags/gw.png
source/masterserver/flags/gy.png
source/masterserver/flags/hk.png
source/masterserver/flags/hm.png
source/masterserver/flags/hn.png
source/masterserver/flags/hr.png
source/masterserver/flags/ht.png
source/masterserver/flags/hu.png
source/masterserver/flags/ie.png
source/masterserver/flags/in.png
source/masterserver/flags/io.png
source/masterserver/flags/iq.png
source/masterserver/flags/ir.png
source/masterserver/flags/is.png
source/masterserver/flags/jm.png
source/masterserver/flags/jo.png
source/masterserver/flags/ke.png
source/masterserver/flags/kg.png
source/masterserver/flags/kh.png
source/masterserver/flags/ki.png
source/masterserver/flags/km.png
source/masterserver/flags/kn.png
source/masterserver/flags/kp.png
source/masterserver/flags/kr.png
source/masterserver/flags/kw.png
source/masterserver/flags/ky.png
source/masterserver/flags/kz.png
source/masterserver/flags/la.png
source/masterserver/flags/lb.png
source/masterserver/flags/lc.png
source/masterserver/flags/li.png
source/masterserver/flags/lk.png
source/masterserver/flags/ls.png
source/masterserver/flags/lt.png
source/masterserver/flags/lu.png
source/masterserver/flags/lv.png
source/masterserver/flags/ly.png
source/masterserver/flags/ma.png
source/masterserver/flags/md.png
source/masterserver/flags/me.png
source/masterserver/flags/mg.png
source/masterserver/flags/mh.png
source/masterserver/flags/mk.png
source/masterserver/flags/ml.png
source/masterserver/flags/mm.png
source/masterserver/flags/mn.png
source/masterserver/flags/mo.png
source/masterserver/flags/mp.png
source/masterserver/flags/mq.png
source/masterserver/flags/mr.png
source/masterserver/flags/ms.png
source/masterserver/flags/mu.png
source/masterserver/flags/mv.png
source/masterserver/flags/mw.png
source/masterserver/flags/mx.png
source/masterserver/flags/my.png
source/masterserver/flags/mz.png
source/masterserver/flags/na.png
source/masterserver/flags/nc.png
source/masterserver/flags/ne.png
source/masterserver/flags/nf.png
source/masterserver/flags/ng.png
source/masterserver/flags/ni.png
source/masterserver/flags/nl.png
source/masterserver/flags/no.png
source/masterserver/flags/np.png
source/masterserver/flags/nr.png
source/masterserver/flags/nu.png
source/masterserver/flags/nz.png
source/masterserver/flags/om.png
source/masterserver/flags/pa.png
source/masterserver/flags/pf.png
source/masterserver/flags/pg.png
source/masterserver/flags/ph.png
source/masterserver/flags/pk.png
source/masterserver/flags/pm.png
source/masterserver/flags/pn.png
source/masterserver/flags/pr.png
source/masterserver/flags/pt.png
source/masterserver/flags/pw.png
source/masterserver/flags/py.png
source/masterserver/flags/re.png
source/masterserver/flags/ro.png
source/masterserver/flags/rs.png
source/masterserver/flags/ru.png
source/masterserver/flags/rw.png
source/masterserver/flags/sa.png
source/masterserver/flags/sb.png
source/masterserver/flags/sc.png
source/masterserver/flags/sd.png
source/masterserver/flags/se.png
source/masterserver/flags/sg.png
source/masterserver/flags/sh.png
source/masterserver/flags/si.png
source/masterserver/flags/sj.png
source/masterserver/flags/sk.png
source/masterserver/flags/sl.png
source/masterserver/flags/sm.png
source/masterserver/flags/sn.png
source/masterserver/flags/so.png
source/masterserver/flags/sr.png
source/masterserver/flags/st.png
source/masterserver/flags/sv.png
source/masterserver/flags/sz.png
source/masterserver/flags/tc.png
source/masterserver/flags/td.png
source/masterserver/flags/tf.png
source/masterserver/flags/tg.png
source/masterserver/flags/th.png
source/masterserver/flags/tk.png
source/masterserver/flags/tl.png
source/masterserver/flags/tm.png
source/masterserver/flags/tn.png
source/masterserver/flags/tr.png
source/masterserver/flags/tt.png
source/masterserver/flags/tv.png
source/masterserver/flags/tw.png
source/masterserver/flags/tz.png
source/masterserver/flags/ua.png
source/masterserver/flags/ug.png
source/masterserver/flags/um.png
source/masterserver/flags/us.png
source/masterserver/flags/uy.png
source/masterserver/flags/uz.png
source/masterserver/flags/va.png
source/masterserver/flags/vc.png
source/masterserver/flags/ve.png
source/masterserver/flags/vg.png
source/masterserver/flags/vi.png
source/masterserver/flags/vn.png
source/masterserver/flags/vu.png
source/masterserver/flags/wf.png
source/masterserver/flags/ws.png
source/masterserver/flags/ye.png
source/masterserver/flags/yt.png
source/masterserver/flags/za.png
source/masterserver/flags/zm.png
source/masterserver/flags/zw.png
source/masterserver/images/game_icon.png
2015-01-23 21:52:03 +01:00
ae5668ab52
version set to 3.12-dev
2015-01-23 21:18:57 +01:00
30a8667307
version set to 3.11.0
2015-01-20 23:10:36 +01:00
49bde874fc
linux installer tests
2015-01-20 00:51:57 +01:00
7a34b3ea20
linux script to build windows installer
2015-01-20 00:51:31 +01:00
1a9c48fd3c
windows installer without ebanner
...
ebanner has unclear license and you always had to install it.
The AccessControl pugin is now added, so it gets much more easy to
create windows installers on linux.
2015-01-20 00:24:07 +01:00
d3d0fbf9bf
lossless images compression
...
keeping file formats, comments + EXIV meta data intact
2015-01-14 23:58:30 +01:00
172dfe3411
- update a few scripts to exclude cegui data
2014-12-29 17:23:20 -08:00
74e522b2f8
"v" was too much in the version string
2014-12-26 21:58:07 +01:00
11b766b5bc
v3.11-beta2.0
2014-12-26 21:33:54 +01:00
7f0b199929
- disable use of streflop in x64 windows build
2014-12-22 16:30:49 -08:00
70e10c610e
Change Mac specific CMakeLists for CPack
...
This commit includes several fixes and some shuffling of entries to improve
readability. The major changes are Removing MG_VERSION_H_CONTENTS which
*includes* the file with the version in it in favour of VER_* variables and
removing the CPack include at the end of the file.
CPack has to be included after all variables are set and this file is sourced
before all the common options are configured.
One more fixme is added - this and other runtime issues will have to be dealt
with when i test the packaging, so far I've only got it to build.
2014-12-23 07:17:48 +11:00
1d591d4a8c
Fix some erors in Info.plist
...
This fixes a couple of issues, none too major:
- The MegaGlest executable is `megaglest` so that string was updated
- MG_VERSION_H_CONTENTS *includes* the file with the version in it (which I
didn't realise when I changed it last time as I couldn't get things building
still). This changes to using VER_* variables
- Update copyright to 2015 (I'm gambling on the project lasting another 2 weeks)
- Change CFBundleSignature to MGGL; a four letter contraction of MeGaGLest
2014-12-23 07:17:34 +11:00
17a45c8da3
Merge pull request #40 from goetzk/remove-mac-specific-version-detection-code
...
Remove mac specific version detection code
2014-12-17 06:47:35 -08:00
ada9b55740
Revert change to quoting
...
Accidentally included a change of quoting which isn't related to the diff at
hand; reverted with this commit.
2014-12-17 20:28:20 +11:00
5b4b382d2c
Remove unneeded comments
...
These comments indicated TODO items and are no longer needed in the final change.
2014-12-17 20:25:21 +11:00
0ce6fd3c5d
Change library search path on MacOS
...
When using mac ports GL/gl.h ends up outside the cmake search paths for
libraries and includes. By adding them to mk/macos/CMakeLists.txt they are now
available and make it possible to build g3d_viewer along with the rest of
megaglest. To make this work properly I had to move the inclusion of
mk/macos/CMakeLists.txt further up the master CMakeLists.txt so merged both IF
APPLE tests in to one.
This has built successfully through xcode and gnumake.
2014-12-17 20:21:22 +11:00
4c10c9c2b3
Remove MEGAGLEST_VERSION for MG_VERSION_H_CONTENTS
...
I noticed that mk/macos/CMakeLists.txt has special code for extracting the
megaglest version , but its already done in CMakeLists.txt. This removes the
duplicate detection and changes the users of MEGAGLEST_VERSION to
MG_VERSION_H_CONTENTS.
2014-12-17 20:20:34 +11:00
58cba20cf4
update version in script
2014-12-03 01:30:03 +01:00
829f23db4e
- updated deps for ubuntu 14.04 and higher
2014-11-29 22:45:31 -08:00
645778a490
- added new files to vc2012 project
2014-11-28 20:05:33 -08:00
86ce576a45
include more info in coverity build "description"
2014-11-10 09:39:19 +01:00
9f633ada18
key settings to toggle HP bars
2014-11-07 02:00:36 +01:00
250294bc9e
fix for librtmp.so.0 missing
...
https://forum.megaglest.org/index.php?topic=9578.0
2014-11-02 22:26:38 +01:00
1724fddb65
Merge remote-tracking branch 'upstream/develop' into develop
2014-10-16 21:16:49 +00:00
filux