Buginator
0af6d3fcef
Fix VS2k10 files for Qt
2011-04-17 15:42:14 -04:00
Per Inge Mathisen
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
Cyp
23f318fe39
Merge branch 'master' into qt
...
Conflicts:
lib/exceptionhandler/exceptionhandler.vcproj
lib/framework/frame.h
lib/framework/framework.vcproj
lib/framework/input.h
lib/gamelib/gamelib.vcproj
lib/iniparser/iniparser.vcproj
lib/ivis_opengl/ivis_opengl.vcproj
lib/netplay/netplay.vcproj
lib/script/script.vcproj
lib/sequence/sequence.vcproj
lib/sound/sound.vcproj
lib/widget/widget.vcproj
macosx/Warzone.xcodeproj/project.pbxproj (resolved in favour of qt)
src/Makefile.am
win32/Warzone2100.vcproj
2011-03-22 00:01:28 +01:00
Buginator
5cfd2e9dbe
Initial VS2k10 changes.
...
VS2k5 (no longer supported with platform SDK)& VS2k8 are NOT supported anymore.
Redo other aspects as well in preparation of moving libs out of the main codebase.
NOTE: You *must* have msysgit installed, and it should be in your system path,
or you can modify the local property sheet to point to it.
This is needed to generate the autorevision.h file, (that fix is next)
2011-03-17 21:35:00 -04:00
safety0ff
7e571f559d
Add cmake toolchain file to files included with make dist.
2011-03-13 20:30:33 -04:00
Cyp
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
safety0ff
d3e993da31
Use patch instead of sed to fix extraneous comma in quesoglc pkg-config file.
2011-03-04 12:33:06 -05:00
safety0ff
eb60d35864
Add physfs 2+ cross compilation.
2011-03-01 20:45:29 -05:00
safety0ff
bfe900b78e
Use QuesoGLC's pkg-config file for build configuration.
...
Closes #2458 .
2011-02-26 14:38:04 -05:00
Cyp
dc4cf90ce5
Merge branch 'master' into qt
...
Conflicts:
lib/framework/input.cpp
lib/ivis_opengl/screen.cpp
lib/ivis_opengl/screen.h
lib/widget/scrap.cpp
lib/widget/scrap.h
macosx/Warzone.xcodeproj/project.pbxproj
src/multiint.cpp
2011-02-25 18:59:41 +01:00
cybersphinx
7232b97fc8
Use a tarball for quesoglc instead of svn export.
2011-02-09 22:55:23 +01:00
cybersphinx
d3219d93cf
Change the backup download location for the cross-build.
...
Use wzhost.wz2100.net instead of fontys.nl.
2011-02-09 21:58:41 +01:00
Per Inge Mathisen
fccc40dfb3
Merge branch 'master' into qt
2011-02-06 16:19:53 +01:00
cybersphinx
7d18ab826d
Fix cross-build.
2011-02-06 03:38:28 +01:00
cybersphinx
dc2385368c
Merge branch 'master' into qt
...
Conflicts:
lib/framework/frame.cpp
lib/framework/frame.h
2011-02-05 18:44:00 +01:00
cybersphinx
ce3de81d64
Configurable downloads directory for the cross-build script.
...
Can be set as "DOWNLOADS=/where/ever/you/want" in win32/__BUILD_CONFIG.USER.
2011-02-05 18:00:39 +01:00
Per Inge Mathisen
27741a2200
Merge branch 'master' into qt
...
Conflicts:
macosx/Warzone.xcodeproj/project.pbxproj
tests/astartest.c
2011-01-30 23:45:39 +01:00
buginator
fb626e0b59
Removed neglected project files for VS2k8.
...
Use VS2k5 project files to convert to VS2k8 or VS2k10.
NOTE: If you are using VS2K10, you *MUST* recompile all libs in the devpackage, or it will not work.
At this time, I am currently keeping VS2k5 files up-to-date.
2011-01-30 01:26:44 -05:00
Cyp
e6e252f565
Work around broken cross-compiler with -fstack-protector.
...
Fixes ticket:2448. Fixes ticket:2451. Fixes ticket:2452.
Broken compiler i586-mingw32msvc-g++ version 4.4.2 and version 4.4.4.
With -O0 -fstack-protector and i586-mingw32msvc-g++ version 4.4.4, theCompilerWorks() returns false.
struct TheCompilerWorks
{
TheCompilerWorks() {} // Does absolutely nothing.
~TheCompilerWorks() {} // Does absolutely nothing.
char unusedArray[340]; // Unused.
};
bool theCompilerWorks() // This function unconditionally returns true, since there's nothing else it could possibly do... Unless cross-compiling with -O0 -fstack-protector, of course.
{
TheCompilerWorks harmlessObject; // Unused variable, and no side effects whatsoever.
printf("%s", ""); // Do nothing.
return true; // Return true.
}
2011-01-27 16:46:22 +01:00
Cyp
d39112244b
Merge remote branch 'origin/master' into qt
...
Conflicts:
lib/framework/frame.h
src/main.cpp
2011-01-22 23:05:36 +01:00
cybersphinx
826a0ef374
Exit the cross-build script if cross-compiler not installed.
2011-01-18 03:54:14 +01:00
Cyp
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
buginator
4ececd8e49
Fix a plethora of issues for MSVC builds
...
Rename MERGECOPY to MERGECOPYSYNC to prevent clobbering of a windows function named that.
2011-01-01 13:46:12 -05:00
cybersphinx
e6324cd4c4
Update Windows cross-build dependencies.
...
freetype 2.4.4
libogg 1.2.2
libpng 1.4.5
2010-12-30 23:34:15 +01:00
buginator
e8d5913372
Apply patch — kill some more warnings, and fix a few issues that Buginator found.
2010-12-25 00:38:06 +01:00
Cyp
91ee0f7655
Merge branch 'master' into qt
...
Conflicts:
lib/framework/frame.h
lib/framework/types.h
lib/widget/editbox.cpp
macosx/Warzone.xcodeproj/project.pbxproj
macosx/configs/Warzone-Debug.xcconfig
2010-12-21 03:59:22 +01:00
Cyp
36484909d6
Try to fix Windows exception handler and makefiles.
2010-12-20 01:07:12 +01:00
Cyp
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
Cyp
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
Cyp
12e8e5bc80
Rename *.lex.c to *.lex.cpp and *.tab.c to *.tab.cpp.
2010-12-16 23:28:56 +01:00
Cyp
0646b37603
Rename *.c to *.cpp.
2010-12-16 23:28:56 +01:00
cybersphinx
f378c9eb2d
Move download.pl from build_tools to win32.
2010-12-11 16:21:08 +01:00
Cyp
fccb548124
Remove completely useless src/environ.[ch], and all references to it.
2010-11-24 21:19:34 +01:00
Cyp
60d7cb6127
Merge remote branch 'origin/master' into qt
...
Conflicts:
.hgignore (manual merge)
lib/framework/wzapp_c.h (used qt)
macosx/Warzone.xcodeproj/project.pbxproj (used qt)
po/*.po (used master)
2010-11-21 21:46:08 +01:00
cybersphinx
aa48d4c069
Fix last commit (libpng).
2010-11-02 16:28:37 +01:00
cybersphinx
17a9973597
Update the dependencies for the Windows cross build.
...
DejaVu fonts: 2.31 -> 2.32
freetype: 2.3.12 -> 2.4.3
gettext: 1.18.1 -> 1.18.1.1
libogg: 1.2.0 -> 1.2.1
libpng: 1.2.44 -> 1.4.4
libvorbis: 1.3.1 -> 1.3.2
2010-11-02 16:13:24 +01:00
buginator
5bbe90df6b
Update files from TRUNK->master
2010-10-30 20:47:36 -04:00
Cyp
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
buginator
0b9861ed64
Fix MSVC build
2010-10-30 20:42:25 -04:00
Cyp
6e1771e319
Merge remote branch 'origin/master' into qt
...
Conflicts:
lib/ivis_common/piemode.h
lib/ivis_common/rendmode.h
lib/ivis_common/textdraw.h
macosx/Warzone.xcodeproj/project.pbxproj
macosx/configs/Project-All.xcconfig
2010-10-30 20:04:42 +02:00
buginator
a11d60774e
Fix MSVC builds
2010-10-17 18:46:06 -04:00
Cyp
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
Cyp
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
Buginator
48bad7a5a1
Update project file multibot.c -> multibot.cpp
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11466 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-15 00:10:51 +02:00
Cyp
b59b089ca5
Merge remote branch 'origin/master' into newnet
...
Conflicts:
lib/netplay/nettypes.c
src/multibot.c
2010-07-30 22:51:33 +02:00
Cyp
6957b04072
astar.c → astar.cpp in .vcproj file.
2010-07-24 13:32:09 +02:00
Christian Ohm
9d553bccab
Add missing file for r11247.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11251 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-22 09:34:23 +02:00
Christian Ohm
e27ccca05c
Windows cross-build: Make quesoglc compile on Ubuntu.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11247 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-22 09:34:22 +02:00
Cyp
695a2b35ae
Merge remote branch 'origin/master' into newnet
...
Conflicts:
lib/netplay/netplay.c
2010-07-13 20:50:37 +02:00
Buginator
096c257052
Commit these project settings defines to disable extra checking which causes a huge performance hit. (VS2k8 was already committed in r9639, this was forgotten.)
...
_HAS_ITERATOR_DEBUGGING=0
http://msdn.microsoft.com/en-us/library/aa985939(VS.80).aspx
_SECURE_SCL=0
http://msdn.microsoft.com/en-us/library/aa985896(VS.80).aspx
For more info on checked iterators see:
http://msdn.microsoft.com/en-us/library/aa985965(v=VS.80).aspx
and
http://msdn.microsoft.com/en-us/library/aa985982(v=VS.80).aspx
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11184 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-13 11:30:56 +02:00