71ad7a8742
Various cross-compile and win32 stuff needed for glew. From patches by Safety0ff and cybersphinx. Untested.
2011-04-02 10:19:08 +02:00
1fe2cc8f4d
Use GLEW instead of GLee. Based on patch by cybersphinx.
2011-04-02 10:08:26 +02:00
d78a8eb8ad
Use QSettings instead of our homebrewed version of iniparser to reduce maintenance load.
2011-04-01 20:31:15 +02:00
0ee8b860f8
Merge remote branch 'origin/qt' into qtscript
2011-03-30 18:05:40 +02:00
e689ad51d5
Merge remote branch 'origin/master' into qt
...
Conflicts:
configure.ac
lib/exceptionhandler/exceptionhandler.h
lib/framework/SDL_framerate.h
lib/framework/cursors.h
lib/framework/input.cpp
lib/framework/input.h
lib/ivis_opengl/pieclip.h
lib/ivis_opengl/screen.cpp
macosx/Warzone.xcodeproj/project.pbxproj (used qt version)
src/console.cpp
src/console.h
src/frontend.cpp
win32/libs/Makefile
and src/Makefile.am (resolved by Safety0ff)
2011-03-13 22:31:19 +01:00
0af9d47a34
Call autorevision.sh instead of compiling and running the C++ autorevision.
2011-03-07 01:18:18 +01:00
509fe7bb83
Use WIN32_LIBS instead of IBERTY_LIBS when configuring libbfd.
...
Fixes statically linking libbfd. Closes #2514 .
2011-03-04 12:43:00 -05:00
92db46314f
Remove -Wc++-compat, since everything that will be C++ is now already C++.
2011-03-03 17:51:22 +01:00
bfe900b78e
Use QuesoGLC's pkg-config file for build configuration.
...
Closes #2458 .
2011-02-26 14:38:04 -05:00
c1f1c3e31d
Initial test of qtscript
2011-01-23 22:30:57 +01:00
d39112244b
Merge remote branch 'origin/master' into qt
...
Conflicts:
lib/framework/frame.h
src/main.cpp
2011-01-22 23:05:36 +01:00
e8a065f6a0
Use empty CXXFLAGS by default, not whatever autoconf thinks we should use.
2011-01-18 19:53:37 +01:00
53ae8b198c
Revert "Force -O0 to the end of the flag list to override autohell's default -O2"
...
This reverts commit e65751e43b
2011-01-18 19:53:37 +01:00
e65751e43b
Force -O0 to the end of the flag list to override autohell's default -O2
2011-01-18 17:59:55 +01:00
28f9830a63
Merge remote branch 'origin/master' into qt
...
Conflicts:
lib/framework/SDL_framerate.h
lib/framework/cursors.h
lib/framework/input.h
lib/ivis_common/Makefile.am
lib/ivis_common/piestate.cpp
lib/ivis_common/pietypes.h
lib/ivis_opengl/imd.h
lib/ivis_opengl/piestate.cpp
lib/ivis_opengl/piestate.h
lib/ivis_opengl/pietypes.h
lib/sound/audio.h
lib/sound/sound.vcproj
lib/sound/track.h
lib/widget/editbox.cpp
lib/widget/scrap.h
macosx/Warzone.xcodeproj/project.pbxproj
macosx/configs/Warzone-All.xcconfig
src/Makefile.am
2011-01-14 19:26:55 +01:00
67e9635f9f
Merge the ivis_common and ivis_opengl directories, only five years and two months after I originally split them apart.
2010-12-31 22:37:14 +01:00
bd6b96315b
Merge branch 'cpp' into qtcpp
...
Conflicts:
lib/framework/Makefile.am
lib/framework/frame.cpp
lib/framework/framework.vcproj
lib/framework/input.cpp
lib/ivis_opengl/piestate.cpp
lib/ivis_opengl/screen.cpp
lib/ivis_opengl/textdraw.cpp
lib/widget/Makefile.am
lib/widget/editbox.cpp
lib/widget/scrap.cpp
lib/widget/widget.vcproj
macosx/Warzone.xcodeproj/project.pbxproj
src/Makefile.am
src/main.cpp
src/makefile.win32
2010-12-19 16:51:27 +01:00
80cc971b61
Merge remote branch 'origin/master' into qt
...
Fixed gameTime → realTime in lib/framework/wzapp.cpp, since the menus were messed up due to interpreting everything as a double-click.
Conflicts:
lib/framework/debug.c
lib/framework/input.c (became wzapp.cpp)
lib/ivis_opengl/screen.c
lib/ivis_opengl/screen.h
lib/ivis_opengl/textdraw.c
macosx/Warzone.xcodeproj/project.pbxproj (used qt version)
src/display.c
src/main.cpp
src/terrain.c
2010-12-17 00:36:10 +01:00
0646b37603
Rename *.c to *.cpp.
2010-12-16 23:28:56 +01:00
a2cd7b0592
Make everything compile successfully with g++, without -fpermissive.
2010-12-16 23:24:40 +01:00
dd4391990d
Get rid of a few unnecessary Makefile.ams.
2010-12-11 16:41:57 +01:00
74c3872aa0
Fix broken FIXME_CAST_ASSIGN pointer-int cast magic being broken on 64-bit big-endian platforms.
...
Don't know whether anyone was actually building this on 64-bit big-endian, but better to fix it.
Was undefined behaviour anyway, due to pointer-aliasing rules.
Fixed the remaining pointer-aliasing errors and removed -Wno-strict-aliasing and -Wno-pointer-to-int-cast.
2010-12-05 20:59:04 +01:00
5bbe90df6b
Update files from TRUNK->master
2010-10-30 20:47:36 -04:00
95b4cff1b8
Merge remote branches 'origin/qt-trunk' and 'origin/master' into qt
...
Conflicts:
macosx/Warzone.xcodeproj/project.pbxproj
2010-10-31 22:27:42 +01:00
828c0f72ae
Revert 9e29aa5210 which reverted the removal of QuesoGLC, to start
...
working on fixing the font rendering with Qt.
2010-10-30 13:20:16 +02:00
0794c5a674
Merge remote branch 'origin/master' into qt-trunk
...
Conflicts:
.hgignore
configure.ac
lib/framework/SDL_framerate.h
lib/framework/cursors.h
lib/framework/endian_hack.h
lib/framework/frame.c
lib/framework/input.c
lib/framework/input.h
lib/framework/opengl.h
lib/framework/wzapp_c.h
lib/gamelib/gtime.c
lib/gamelib/gtime.h
lib/ivis_common/Makefile.am
lib/ivis_common/ivispatch.h
lib/ivis_common/png_util.h
lib/ivis_opengl/screen.c
lib/ivis_opengl/screen.h
lib/netplay/netlog.c
lib/netplay/netlog.h
lib/netplay/netplay.c
lib/netplay/netplay.vcproj
lib/netplay/netsocket.cpp
lib/netplay/nettypes.c
lib/sequence/sequence.c
lib/sound/oggvorbis.c
lib/widget/scrap.c
macosx/Resources/wzlocal/lt.lproj/InfoPlist.strings
macosx/Warzone.xcodeproj/project.pbxproj
macosx/configs/Bison-Debug.xcconfig
macosx/configs/Bison-Release.xcconfig
macosx/configs/FetchPrebuilt.sh
macosx/configs/FetchSource.sh
macosx/configs/Project-All.xcconfig
macosx/configs/SDLmain-All.xcconfig
macosx/configs/SDLmain-Debug.xcconfig
macosx/configs/SDLmain-Release.xcconfig
macosx/configs/Warzone-All.xcconfig
macosx/configs/Warzone-Debug.xcconfig
po/cs.po
po/da.po
po/de.po
po/en_GB.po
po/es.po
po/et_EE.po
po/fi.po
po/fr.po
po/fy.po
po/ga.po
po/hr.po
po/it.po
po/ko.po
po/la.po
po/lt.po
po/nb.po
po/nl.po
po/pl.po
po/pt.po
po/pt_BR.po
po/ro.po
po/ru.po
po/sk.po
po/sl.po
po/uk_UA.po
po/zh_CN.po
po/zh_TW.po
src/astar.c
src/data.c
src/fpath.c
src/frontend.c
src/hci.c
src/main.cpp
src/move.c
src/move.h
src/multibot.c
src/multiint.c
src/multijoin.c
src/multiplay.c
src/multisync.c
src/terrain.c
2010-10-09 14:44:15 +02:00
69028fb461
Remove gcc warnings the cross compiler doesn't know.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11611 4a71c877-e1ca-e34f-864e-861f7616d084
2010-09-05 00:21:01 +02:00
a977d77208
Readd -lz to the win32 libraries.
...
Got lost in the newnet merge.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11610 4a71c877-e1ca-e34f-864e-861f7616d084
2010-09-05 00:21:01 +02:00
e1a812fd2e
Check if zip understands --filesync, else use -u.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11554 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-30 14:31:04 +02:00
0b2c7b2973
Disable warnings that shouldn't be caught by -Werror, unless enabled with ./configure --enable-warnings=yes.
2010-08-15 14:26:36 +02:00
59e98903b8
Remove -Wc++-compat, since there are too many malloc cast warnings.
2010-08-15 13:37:09 +02:00
438a4d5aff
Enable warnings, make warnings consistent, fix some warnings, use -Wno-error=squeak to allow squeaky warnings to compile without squelching them.
2010-08-15 12:30:46 +02:00
0c2015425c
Merge remote branch 'origin/newnet'
...
Conflicts:
lib/gamelib/gtime.c
lib/gamelib/gtime.h
lib/netplay/netplay.c
Closes ticket:1573. Closes ticket:805. Probably fixes 100 more issues.
2010-08-14 22:34:30 +02:00
b3054d87d0
Add --enable-debug=optimised for Cyp, debug build with optimizations turned on.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11460 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-14 14:38:16 +02:00
7d5f1271a9
Merge remote branch 'origin/master' into newnet
...
Conflicts:
.gitignore
lib/iniparser/Makefile.am
macosx/Resources/wzlocal/pt_BR.lproj/InfoPlist.strings
2010-08-14 11:26:09 +02:00
94320034ae
Assume that SDL headers are directly in the #include path, instead of assuming the SDL directory is in the #include path.
...
Closes #1941 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11385 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-05 20:05:02 +02:00
1cb0cf5cf9
newnet: Add -lz to configure. (Patch by Per.)
2010-07-21 18:28:41 +02:00
23cbd537f7
Merge remote branch 'origin/master' into newnet
...
Conflicts:
configure.ac
2010-07-16 18:01:22 +02:00
0c95725a23
Backport warnings from newnet branch, fix a warning that was stopping mac build.
2010-07-13 21:04:32 +02:00
9e29aa5210
qt branch: Bring back quesoglc for text drawing for now. We can then spend some more time
...
perfecting the Qt-based text drawing without the stress of not being able to merge this branch.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10868 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:49 +02:00
9b131541e1
Fix configure.ac again.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10828 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:47 +02:00
9094f32914
Update a missing file
...
Try to fix configure.ac
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10825 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:46 +02:00
e65f2688e7
Stage two merge.
...
Add new files for Qt.
Remove old files
Update build system (linux).
Remove SDL.
Remove QuesoGLC.
Remove Fontconfig & other all dependencies it had.
CC & mingw (windows) & MSVC build systems are *NOT* updated / working yet.
**NOTE** MSVC people check types.h, "bool" != "BOOL" ! "bool" is a byte, "BOOL" is a int.
r8503 - r10787 (from Qt branch)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10813 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:44 +02:00
d7db005f71
Merge remote branch 'origin/master' into newnet
...
Conflicts:
.gitignore
configure.ac
data/base/images/intfac.img
data/base/images/intfac5.png
lib/netplay/makefile.win32
lib/netplay/netlog.c
lib/netplay/netplay.c
lib/netplay/netplay.h
lib/netplay/netplay.vcproj
macosx/Warzone.xcodeproj/project.pbxproj
macosx/configs/Warzone-All.xcconfig
po/POTFILES.in
src/hci.c
src/intfac.h
src/keybind.c
src/multibot.c
src/multiint.c
src/multijoin.c
src/multiplay.c
src/multistruct.c
src/multisync.c
src/scriptai.c
2010-06-15 08:35:52 +02:00
a993c51db9
Improve GLee detection.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10734 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-28 07:52:19 +02:00
ccd4264005
Enhanced GLee detection.
...
Since the pkg-config script Debian ships is a custom addition, test for GLee
manually as well.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10731 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-28 07:52:19 +02:00
e7183c700f
Use a different macro for the gettext version check.
...
Also remove an accidentally committed line from POTFILES.in.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10712 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-25 21:24:57 +02:00
4c67b3d6ef
Correctly escape brackets in configure help
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10638 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-19 12:52:42 +02:00
f99a338ea6
Fix compilation with gcc 4.5.
...
gcc 4.5 enables some warnings with -Wall that didn't even exist in previous
versions (so we can't just disable them generally). This adds a new autoconf
macro to check for compiler flags, and adds -Wno-switch and -Wno-enum-compare
to the compiler flags if they exist.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10597 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-16 19:56:25 +02:00
fa9451b25a
Check for (un)zip in configure.ac.
...
Fixes #1434 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10585 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-15 21:38:52 +02:00
Per Inge Mathisen
Cyp
cybersphinx
safety0ff
buginator
Giel van Schijndel