Commit Graph

133 Commits

Author SHA1 Message Date
dave
1a8568cf24 Added the -i flag for nasm ... now it won't crap out
This was SVN commit r4228.
2006-08-19 16:32:30 +00:00
efb9c3d7dd Automatically add .inl files to the workspace.
This was SVN commit r4178.
2006-07-28 17:26:54 +00:00
397a350e45 svn:ignore auto-generated test .cpp files.
Territories: Fixed memory leaks.
Atlas: New section-toolbar. Fixed colour of brush grid. Moved open/save
into File menu. Added 3D-ish lighting control. Added 'busy'
notifications.

This was SVN commit r4079.
2006-07-12 14:49:10 +00:00
aeed96dafa # improvements to build system for asm files
split ia32_asm code up into memcpy, color
premake: add (windows-only so far) support for NASM include paths -
required when using %include. see rationale in vs.c
refs #124

This was SVN commit r4039.
2006-06-25 20:58:03 +00:00
7cb82ada2f # lots of housekeeping/fixes
premake: document extra_params
ogl: remove EXT_ symbols, use glext instead
adts: move cache into separate file (also remove old cache impl)
move SDL files in sysdep/win to libraries/SDL
ScopeTimerAccrue: change #ifdef spaghetti into templated policy class
app_hooks, define VOID_FUNC to FUNC(.., (void) )
look at stalk walk code; any reason not to work on Win64?
replace ERR_TEX_CODEC_CANNOT_HANDLE with INFO_* - not an error. also
ERR_SYM_SUPPRESS_OUTPUT ERR_SYM_SINGLE_SYMBOL_LIMIT
wdbg_sym: only import RtlCaptureContext once (not every walk_stack)
add sys_last_error (!GetLastError on win32); converts to text in
display_error, also show sys_last_error and errno
app_hooks: move i18n impl out (belongs in pyrogenesis)
fixes to string_s test.

refs #124

This was SVN commit r4020.
2006-06-23 17:41:55 +00:00
039f26f0c3 Fixed editor brokenness.
# More useful environment (water, lighting) editing
(now saved into the map files).
Fixed no-PCH a bit.

This was SVN commit r4002.
2006-06-11 07:03:59 +00:00
52077dfec5 no longer create vc2002 project
This was SVN commit r3994.
2006-06-09 20:01:25 +00:00
d39a4fac21 Premake: include precompiled.h in the project; set up dependencies for Atlas projects.
# Attempted to make compilation faster
by including as little as possible in some .h files, and moving it into
.cpp.
Fixed BaseTechCollection memory leak.

This was SVN commit r3992.
2006-06-09 16:44:16 +00:00
00bff41113 Recompiled Premake in Release, to make it faster
This was SVN commit r3986.
2006-06-09 00:56:40 +00:00
c3669cb137 "update-workspaces.bat --without-tests", particularly for the autobuilder while everything crashes and requires manual clicking of OK buttons
This was SVN commit r3984.
2006-06-08 22:33:59 +00:00
cf44963cbf Exefied cxxtestgen.pl
This was SVN commit r3983.
2006-06-08 22:28:23 +00:00
48f0794a4f improvement to test project generation: avoid having to recreate workspace twice after adding test files.
add error_dialog.rc to test.exe and use entry() to do normal lib init.

This was SVN commit r3978.
2006-06-08 18:48:40 +00:00
c59de80915 # Integrated our new unit testing framework with premake to get automated testing after every re-compile.
Trac #117

This was SVN commit r3975.
2006-06-07 22:19:42 +00:00
74cfa7dd4d This was SVN commit r3970. 2006-06-07 22:14:11 +00:00
cb9857185e more tiny fixes/improvements (finished on that front)
This was SVN commit r3967.
2006-06-07 14:22:26 +00:00
8ebf16749f fix: don't use debug mode suffix on *nix
This was SVN commit r3962.
2006-06-07 04:44:21 +00:00
ec6ed39d0d further cleanup+documentation; move external library code into separate file
This was SVN commit r3961.
2006-06-07 04:34:48 +00:00
137487c521 add initial self-test project creation
This was SVN commit r3960.
2006-06-07 03:02:20 +00:00
82dc962a56 # further cleanup to build system
remove platform specific code, provide "external library" definitions,
automatically add static libs to main EXE project.

This was SVN commit r3955.
2006-06-07 01:40:24 +00:00
61f40e4775 Minor modifications to port new build setup to linux
This was SVN commit r3943.
2006-06-04 00:26:36 +00:00
54c1508db6 Renamed autobuilt ps.exe to pyrogenesis.exe, to match the new project layout.
Fixed Atlas project creation.
Improved VS2005 linking speed.
Added work-in-progress environment (water, sun) editing to Atlas.

This was SVN commit r3935.
2006-06-03 05:08:32 +00:00
7f7c74a2b3 slight improvement: make pyrogenesis the default project.
This was SVN commit r3933.
2006-06-02 04:13:37 +00:00
41e9830504 massive cleanup together with philip (collaborating in real-time :D)
- restructure+cleanup; move copy-pasted code into common functions.
- split project up into subpackages
- documented build system and rationale

This was SVN commit r3932.
2006-06-02 04:07:18 +00:00
16b94e5604 Added CppDoc. Updated autobuilder to use it.
This was SVN commit r3839.
2006-05-04 03:59:51 +00:00
235e19c58f # Atlas: Updated Atlas DLL with fixed manifest. Double-click resizable panels to reset to default size. Moved player selection into extremely ugly drop-down list. Fixed culling when changing visible window's aspect ratio. Added manifest to VS2003 builds, to enable XP themes.
This was SVN commit r3814.
2006-04-25 05:10:47 +00:00
f791a61c46 # Fixed SxS CRT usage.
Also added wx's .rc file to Atlas.

This was SVN commit r3812.
2006-04-24 18:01:01 +00:00
5d9615da50 Modified version of Premake 3.1. Changes are:
* support for NASM .asm files
* -MF option to compiler
* non-automatic PCH support
* no-edit-and-continue flag
* (no-)native-wchar_t
* no-manifest
* trimprefix, to avoid wasteful deep nesting in project files

This was SVN commit r3783.
2006-04-20 01:28:20 +00:00
3fbc464857 # Updated build system
to use Premake 3.1 (slightly modified - see next commit), and to
properly support VS2005. Should still be compatible with GCC, though
there may be differences I haven't noticed.
Removed option to build ScEd (because it won't work anyway).

This was SVN commit r3782.
2006-04-20 01:20:24 +00:00
13897010d5 Premake workspace: use native wchar_t type in VC7.1/8
This was SVN commit r3467.
2006-02-03 22:29:53 +00:00
f942ea15e6 More DevIL library things
This was SVN commit r3172.
2005-11-26 03:46:21 +00:00
5c9501830c Fix some more warnings.
This was SVN commit r3156.
2005-11-19 16:43:20 +00:00
64f98cccc0 remove /QIfist setting from premake (see previous commits).
wsdl: remove APP_NAME, a relict of previously incomplete sdl emulation.

This was SVN commit r3121.
2005-11-09 01:20:33 +00:00
a450f59455 premake.lua changes:
Add alternative X11 include path (e.g. on Ubuntu).
Increase warning level on Linux build.

This was SVN commit r3109.
2005-11-06 17:38:57 +00:00
f439b81e1a add -ffast-math and comment on that and /QIfist
This was SVN commit r3102.
2005-11-06 03:37:05 +00:00
6668ad6e1c CTerrain, Brushes: made CalcFromPosition static and added float x,y overload
minimap, PatchRData, renderer: fix ELOSState comparison vs & and use
SAFE_DELETE
ia32: add rounding control constants (for FISTP)
premake: set /QIfist compiler setting which causes float->int casts to
go through FISTP instruction instead of _ftol2() (much faster, but
requires CPU state to have been set)
LOSManager.cpp: cache m_TilesPerSize; use MIN/MAX; use
CTerrain::CalcFromPosition; clean up GetUnitState a bit. now runs at
203ns, down from 222

This was SVN commit r3099.
2005-11-06 01:33:16 +00:00
dd031d5367 Force proper target file name in automatically generated dependency file.
Distributed compiles via Icecream should now really work with proper
dependency
file generation.

This was SVN commit r3059.
2005-10-30 20:58:12 +00:00
f2b662d12d Build: generate Atlas project files (with "update-workspaces --atlas") (for VS2003 only).
Premake: allow slight separation of files' locations on disk vs in the
project tree.
Atlas: require fewer include directories.

This was SVN commit r2956.
2005-10-17 01:11:12 +00:00
cfb0bb597c Fixed premake quote bug that was causing it to generate incorrect vcproj XML files.
This was SVN commit r2818.
2005-09-30 06:23:03 +00:00
88f78b9ea2 committed Simon's fix for building asm files in dirs containing spaces
This was SVN commit r2811.
2005-09-29 18:41:40 +00:00
d77d9e8346 moved PDB files to system/ : 1) no longer clutters up data/ dir 2) they are found anyway since EXE stores absolute path to its PDB 3) allows conflict-free update of data/
+manual build :)

This was SVN commit r2810.
2005-09-29 17:47:55 +00:00
41068dc97d Add a note that Icecream is supported for distributed builds.
This was SVN commit r2799.
2005-09-28 23:07:09 +00:00
4146e3465c Use gcc/g++ -MF to explicitly give the name of the dependency file.
This fixes the interaction with Icecream for distributed compiling.

This was SVN commit r2797.
2005-09-28 21:59:35 +00:00
a7e0c3d0ac fix for the underscore problem in the assembler symbols
This was SVN commit r2766.
2005-09-26 05:39:58 +00:00
82f663e5a2 Renamed output files in the generated GNU makefiles so that e.g. ia32.asm and ia32.cpp don't generate the same object file
This was SVN commit r2728.
2005-09-14 23:55:56 +00:00
4a7d0e9038 Config: Changed -e to -entgraph (to avoid conflicts with -editor).
Premake: Don't compile Atlas when compiling ScEd, though I can't
remember why.
Atlas: Load existing maps.

This was SVN commit r2720.
2005-09-14 05:37:52 +00:00
2ab9584840 snd.cpp: initialize listener orientation and position (my OpenAL drivers complained about the old random values)
premake stuff: call assembler objects *.asm.obj instead of *.obj (so
that ia32.asm doesn't collide with ia32.cpp)
ia32.asm: use .text section for proper linkage

This was SVN commit r2709.
2005-09-13 20:42:01 +00:00
35591f4d24 Premake support for assemblying .asm-files with nasm (now also on windows!)
This was SVN commit r2704.
2005-09-13 03:51:48 +00:00
884418aed9 Linux support for including nasm in the build process
This was SVN commit r2703.
2005-09-13 00:16:47 +00:00
5d62c3f3f7 Atlas: Simple undo system
This was SVN commit r2627.
2005-08-20 15:44:50 +00:00
b4ad393ee4 moved ps/X* to ps/XML/
premake: reflect 2 added and 1 removed source dir
add ps/Util - some helpful functions that were previously in main.cpp

This was SVN commit r2624.
2005-08-14 23:50:37 +00:00
be9bdcc308 /W4 in Premake
This was SVN commit r2617.
2005-08-14 01:16:11 +00:00
e8e532803b fix missing , (didn't notice because console window closed immediately, doh)
This was SVN commit r2611.
2005-08-13 17:23:05 +00:00
6c4aab2e55 cleaned up a bit and activated W4 warnings on windows
This was SVN commit r2608.
2005-08-13 17:07:05 +00:00
ac034f3733 add new res/ dirs
This was SVN commit r2603.
2005-08-12 16:59:19 +00:00
f9b9e46436 Updated Errors.cpp-generating program: stopped use of external DLL, added parameters and help and file/LOC count
This was SVN commit r2558.
2005-07-27 21:51:43 +00:00
2ea40a23a3 VS2005 compatibility fixes and warning adjustments:
Updated DLLs.
Added DirectX headers/libraries, since they're not in the platform SDK.
Fixed invalid STL iterator usage.
Disabled STL in stack trace, since it breaks.
Added comments for some reported warnings.
Corrected some apparent off-by-one errors.
Defined strlen_s to strnlen.
Probably broke pre-beta2 versions of VC2005.

This was SVN commit r2454.
2005-07-02 21:42:55 +00:00
9007d77030 ScEd/lib compatibility - USE_WINMAIN (since it uses WinMain instead of main) and NO_MAIN_REDIRECT (so it can use MFC's WinMain)
This was SVN commit r2442.
2005-06-26 17:12:48 +00:00
a3b599fb1e Unbroke build
This was SVN commit r2397.
2005-06-17 01:03:40 +00:00
426368f401 enable PDB debug info in release mode (required for stack trace). in final builds, private symbols can be stripped (no risk of "open-sourcing" our code).
add a some delay-loaded DLLs and a few comments

This was SVN commit r2362.
2005-05-31 19:02:38 +00:00
c9506c5e34 removed no longer needed EXCEPTION_HACK_0AD - wdbg exception handler is now production-quality :)
This was SVN commit r2359.
2005-05-30 06:17:36 +00:00
982e051c54 Changed PSERROR to inherit from std::exception
This was SVN commit r2344.
2005-05-24 00:00:40 +00:00
08921f56b4 Moved icon, so that compilation doesn't depend on anything in 'binaries'
This was SVN commit r2155.
2005-04-20 20:18:20 +00:00
bfe7c1b491 Made icon implementation less bad, so that it doesn't conflict with ScEd
This was SVN commit r2065.
2005-03-27 14:03:30 +00:00
414015ca57 Deleted redundant required-libraries.txt
This was SVN commit r1918.
2005-02-09 23:36:05 +00:00
8e9f0a8202 Disabled RTTI on Windows
This was SVN commit r1863.
2005-01-29 17:44:57 +00:00
f2758699d6 Some fixes for the unix parts of premake.lua
This was SVN commit r1849.
2005-01-28 17:37:21 +00:00
f6c95b259d include exception handler code only if EXCEPTION_HACK_0AD is required. (since some PS-specific code leaked into wdbg.cpp, have to disable that until i get around to cleaning it up)
This was SVN commit r1836.
2005-01-27 15:22:47 +00:00
228f225e8d Made the compiler find dbghelp.(lib|h)
This was SVN commit r1823.
2005-01-26 00:37:03 +00:00
71a6caf3e7 Made ScEd actually compile (I hope)
This was SVN commit r1701.
2005-01-10 22:14:19 +00:00
016bd1dc5e add delayload entry for the (now dynamic) libjpg
This was SVN commit r1664.
2005-01-07 12:41:55 +00:00
3c2b7aa24c added libraries/libjpgadd
This was SVN commit r1650.
2005-01-07 00:24:54 +00:00
fb14adc68b Added the ScEd project into the default solution/workspace (but set to not be built)
This was SVN commit r1603.
2004-12-31 13:50:53 +00:00
f4fe8c8543 Sky colour, plus skycolor config value
This was SVN commit r1583.
2004-12-28 11:16:05 +00:00
05c4ec0365 Alterations to ScEd, so that it almost works (except for saving/loading maps). Change the bottom of premake.lua if you want to build it.
This was SVN commit r1580.
2004-12-27 23:27:26 +00:00
6885cb2d83 Moved xmbcleanup so that non-programmers can reach it
This was SVN commit r1534.
2004-12-19 00:42:44 +00:00
2f809325d9 Removed deprecated FMOD section in library readme
This was SVN commit r1492.
2004-12-12 23:49:18 +00:00
aa1442e8f8 Fix for mesh manager crashes (plus some parts of Boost, which may be a little excessive)
This was SVN commit r1488.
2004-12-12 18:40:00 +00:00
61705f7caf XMB cleanup program (to remove old unused .xmb files)
This was SVN commit r1487.
2004-12-12 12:51:24 +00:00
2e0bb04882 Linux fixes for new workspace layout
This was SVN commit r1486.
2004-12-11 21:50:03 +00:00
cf7f9dcc47 Made premake put ps_test.pdb into binaries/data
This was SVN commit r1458.
2004-12-05 19:10:57 +00:00
761261880a Correction to restructuring (part 2 of 2)
This was SVN commit r1455.
2004-12-05 18:05:16 +00:00
0014c3140b Correction to restructuring (part 1 of 2)
This was SVN commit r1454.
2004-12-05 18:04:15 +00:00
ec3452679c Restructuring
This was SVN commit r1453.
2004-12-05 17:59:29 +00:00