Commit Graph

274 Commits (master)

Author SHA1 Message Date
vexed c1b29c1f5e Portable Warzone fixes for windows.
Fix windows paths.

Windows portable icon by forum member Duda.
Portable header & welcome images from forum member Aubergine.
Image fixes supplied by Berg.

Note: In configure stage (Windows only!), you can specify --enable-portable [default no] to
      create a portable installer. (That is, everything is self-contained in the directory
      you install Warzone 2100 to.  It will *not* use any other directory on the system.)
      If you pass --with-videos [default no], then it will add the videos with the portable
      installer and looks for the video file in \opt\sequences.wz

FIXME: Need: RUSSIAN, GERMAN, DUTCH, tranlations fixes for the warzone2100.nsi file.
2013-08-10 19:20:18 -04:00
vexed 372eff6693 Simplify build process by getting rid of bison/flex dependencies.
Fixes both MSVC and autotools (automake 1.12+).

Revert "Abort autogen.sh when automake 1.12+ is found."

This reverts commit 978ed8f1f9.
Should now work with automake 1.11+

fixes ticket:3887
fixes ticket:3538
closes ticket:3950
2013-02-17 20:15:15 -05:00
vexed 193552de92 Update MSVC solution for building both SDL & Qt backends.
Note:
Highly recommend to use STLport, (www.stlport.org).  MS's version is too slow.
Qt finally released libs for 2010, but I have no idea if they compile with openSSL support,
which is REQUIRED at the time I write this, so you need to build Qt with SSL support yourself
if the pre-built don't support it.

Don't forget to setup the environment variable QTDIR correctly when using Qt builds!
Hack note: configuration type of 'utility' was needed to pick which lib to link to--yes, that is lame,
but I see no other fix for now.
Default builds are set for SDL.
2012-01-07 01:33:40 -05:00
vexed de28a736ef Updates for the red headed stepsister.
Refs #2936.
2011-11-08 14:01:40 +01:00
cybersphinx 2dbd06e9b1 Get rid of the unmaintained makefile.win32s.
Closes #2900.
2011-09-25 19:58:13 +02:00
vexed f31e223626 Fix all builds, they should now all compile assuming everything is set up correctly.
You have both Debug & Release builds, using MS's STL, and the you have Debug & Release builds using STLport.
The STLport version is prefered.
2011-09-03 00:21:40 -04:00
Buginator f76e960f7d Fix various build issues for both 'qtgame' and the bson /new lobby stuff
for MSVC.

Nothing here should break other platforms.
2011-07-08 21:51:16 -04:00
Buginator be2c105b7a Update build for Release builds & using STLport.
Update release builds to SSE2 + STLport.
2011-06-25 19:48:46 -04:00
cybersphinx 7e96946d8f Make win32/__BUILD_SCRIPT point at the instructions for cross-compiling master. 2011-05-03 12:40:20 +02:00
Buginator 199a6d3c27 Move GLEW out of the project, and put it into the dev-package instead. 2011-05-02 20:02:12 -04:00
Per Inge Mathisen 3f8cecb841 Merge branch 'master' into qt
Conflicts:
	configure.ac
	lib/ivis_opengl/Makefile.am
	lib/ivis_opengl/glew/glew.vcxproj
	lib/ivis_opengl/glew/glew.vcxproj.filters
	lib/ivis_opengl/piedraw.cpp
	lib/ivis_opengl/piemode.cpp
	lib/ivis_opengl/piestate.cpp
	lib/ivis_opengl/screen.cpp
	lib/ivis_opengl/tex.cpp
	lib/sequence/Makefile.am
	macosx/Warzone.xcodeproj/project.pbxproj
	macosx/configs/Glew-All.xcconfig
	macosx/configs/QuesoGLC-All.xcconfig
	macosx/configs/Warzone-All.xcconfig
	src/Makefile.am
	src/texture.cpp
	win32/libs/Makefile
	win32/libs/glew/Makefile
	win32/libs/glew/patches/glew_pkgconfig.diff
2011-04-25 00:51:13 +02:00
safety0ff 366ae73a30 Embed glew into quesoglc. 2011-04-20 16:28:41 +02:00
safety0ff 2855175eff Don't hardcode the sourcebase path in the quesoglc patch. 2011-04-20 16:28:41 +02:00
safety0ff ade752d0d4 Glew win32 cross compilation pkgconfig stuff. 2011-04-20 16:28:41 +02:00
safety0ff 1f8736e292 glew cross compiling patch by cybersphinx.
Refs. #2378.
2011-04-20 16:28:41 +02:00
safety0ff 6f689accb6 Use QuesoGLC's pkg-config file for build configuration. 2011-04-20 16:28:41 +02:00
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