Skip to content

Commit

Permalink
Updated win32 build (dependencies, Python 2.5 => 2.6).
Browse files Browse the repository at this point in the history
  • Loading branch information
skyjake committed Jul 31, 2009
1 parent 6fa27b8 commit bdae104
Show file tree
Hide file tree
Showing 10 changed files with 599 additions and 581 deletions.
1 change: 1 addition & 0 deletions distrib/win32/.gitignore
@@ -0,0 +1 @@
packages
10 changes: 5 additions & 5 deletions distrib/win32/setup.iss
@@ -1,10 +1,10 @@
; Script generated by the Inno Setup Script Wizard.

[Setup]
OutputBaseFilename=deng-1.9.0-beta6-setup
OutputBaseFilename=deng-1.9.0-beta6.5-setup
VersionInfoVersion=1.9.0.6
AppName=Doomsday Engine
AppVerName=Doomsday Engine 1.9.0-beta6
AppVerName=Doomsday Engine 1.9.0-beta6.5
AppPublisher=deng Team
AppPublisherURL=http://sourceforge.net/projects/deng/
AppSupportURL=http://www.dengine.net/dew/
Expand Down Expand Up @@ -58,10 +58,10 @@ Source: "SDL.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engin
Source: "SDL_net.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
Source: "SDL_mixer.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
Source: "eax.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
Source: "ogg.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
Source: "smpeg.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
Source: "vorbis.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
Source: "vorbisfile.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
Source: "libogg-0.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
Source: "libvorbis-0.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
Source: "libvorbisfile-3.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
Source: "..\..\external\lzss\win32\lzss.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
Source: "..\..\external\zlib\win32\zlib1.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
Source: "..\..\external\libpng\win32\libpng13.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
Expand Down
4 changes: 4 additions & 0 deletions doomsday/build/win32/.gitignore
@@ -1 +1,5 @@
vcconfig.bat
*.pk3
*.dll
obj
bin
6 changes: 3 additions & 3 deletions doomsday/build/win32/vcbuild.bat
Expand Up @@ -199,10 +199,10 @@ GOTO Done
copy "%SDL_LIB%\SDL.dll" .
copy "%SDLNET_LIB%\SDL_net.dll" .
copy "%SDLMIXER_LIB%\SDL_mixer.dll" .
copy "%SDLMIXER_LIB%\ogg.dll" .
copy "%SDLMIXER_LIB%\smpeg.dll" .
copy "%SDLMIXER_LIB%\vorbis.dll" .
copy "%SDLMIXER_LIB%\vorbisfile.dll" .
copy "%SDLMIXER_LIB%\libogg-0.dll" .
copy "%SDLMIXER_LIB%\libvorbis-0.dll" .
copy "%SDLMIXER_LIB%\libvorbisfile-3.dll" .
copy "%EAX_DLL%\eax.dll" .
copy "%DENG_ENGINE_DIR%\doc\LICENSE" license.txt
GOTO Done
Expand Down
158 changes: 79 additions & 79 deletions doomsday/engine/api/dd_maptypes.h
@@ -1,79 +1,79 @@
/* Generated by .\..\..\engine\scripts\makedmt.py */

#ifndef __DOOMSDAY_PLAY_PUBLIC_MAP_DATA_TYPES_H__
#define __DOOMSDAY_PLAY_PUBLIC_MAP_DATA_TYPES_H__

#define DMT_VERTEX_POS DDVT_FLOAT


#define DMT_SEG_SIDEDEF DDVT_PTR

#define DMT_SEG_V DDVT_PTR // [Start, End] of the segment.
#define DMT_SEG_LINEDEF DDVT_PTR
#define DMT_SEG_SEC DDVT_PTR
#define DMT_SEG_SUBSECTOR DDVT_PTR
#define DMT_SEG_BACKSEG DDVT_PTR
#define DMT_SEG_ANGLE DDVT_ANGLE
#define DMT_SEG_SIDE DDVT_BYTE // 0=front, 1=back
#define DMT_SEG_FLAGS DDVT_BYTE
#define DMT_SEG_LENGTH DDVT_FLOAT // Accurate length of the segment (v1 -> v2).
#define DMT_SEG_OFFSET DDVT_FLOAT

#define DMT_SUBSECTOR_SEGCOUNT DDVT_UINT
#define DMT_SUBSECTOR_SEGS DDVT_PTR // [segcount] size.
#define DMT_SUBSECTOR_POLYOBJ DDVT_PTR // NULL, if there is no polyobj.
#define DMT_SUBSECTOR_SECTOR DDVT_PTR

#define DMT_MATERIAL_MNAMESPACE DDVT_INT
#define DMT_MATERIAL_FLAGS DDVT_SHORT // MATF_* flags
#define DMT_MATERIAL_WIDTH DDVT_SHORT // Defined width & height of the material (not texture!).
#define DMT_MATERIAL_HEIGHT DDVT_SHORT

#define DMT_SURFACE_FLAGS DDVT_INT // SUF_ flags
#define DMT_SURFACE_MATERIAL DDVT_PTR
#define DMT_SURFACE_BLENDMODE DDVT_BLENDMODE
#define DMT_SURFACE_NORMAL DDVT_FLOAT // Surface normal
#define DMT_SURFACE_OFFSET DDVT_FLOAT // [X, Y] Planar offset to surface material origin.
#define DMT_SURFACE_RGBA DDVT_FLOAT // Surface color tint

#define DMT_PLANE_SOUNDORG DDVT_PTR // Sound origin for plane
#define DMT_PLANE_SECTOR DDVT_PTR // Owner of the plane (temp)
#define DMT_PLANE_HEIGHT DDVT_FLOAT // Current height
#define DMT_PLANE_GLOW DDVT_FLOAT // Glow amount
#define DMT_PLANE_GLOWRGB DDVT_FLOAT // Glow color
#define DMT_PLANE_TARGET DDVT_FLOAT // Target height
#define DMT_PLANE_SPEED DDVT_FLOAT // Move speed

#define DMT_SECTOR_VALIDCOUNT DDVT_INT // if == validCount, already checked.
#define DMT_SECTOR_LIGHTLEVEL DDVT_FLOAT
#define DMT_SECTOR_RGB DDVT_FLOAT
#define DMT_SECTOR_MOBJLIST DDVT_PTR // List of mobjs in the sector.
#define DMT_SECTOR_LINEDEFCOUNT DDVT_UINT
#define DMT_SECTOR_LINEDEFS DDVT_PTR // [lineDefCount+1] size.
#define DMT_SECTOR_SSECTORCOUNT DDVT_UINT
#define DMT_SECTOR_SSECTORS DDVT_PTR // [ssectorCount+1] size.
#define DMT_SECTOR_SOUNDORG DDVT_PTR
#define DMT_SECTOR_PLANECOUNT DDVT_UINT
#define DMT_SECTOR_REVERB DDVT_FLOAT

#define DMT_SIDEDEF_SEGCOUNT DDVT_UINT
#define DMT_SIDEDEF_SEGS DDVT_PTR // [segcount] size, segs arranged left>right
#define DMT_SIDEDEF_LINE DDVT_PTR
#define DMT_SIDEDEF_SECTOR DDVT_PTR
#define DMT_SIDEDEF_FLAGS DDVT_SHORT

#define DMT_LINEDEF_SEC DDVT_PTR

#define DMT_LINEDEF_V DDVT_PTR
#define DMT_LINEDEF_SIDEDEFS DDVT_PTR
#define DMT_LINEDEF_FLAGS DDVT_INT // Public DDLF_* flags.
#define DMT_LINEDEF_SLOPETYPE DDVT_INT
#define DMT_LINEDEF_VALIDCOUNT DDVT_INT
#define DMT_LINEDEF_DX DDVT_FLOAT
#define DMT_LINEDEF_DY DDVT_FLOAT
#define DMT_LINEDEF_BBOX DDVT_FLOAT

#define DMT_NODE_BBOX DDVT_FLOAT // Bounding box for each child.
#define DMT_NODE_CHILDREN DDVT_UINT // If NF_SUBSECTOR it's a subsector.

#endif
/* Generated by .\..\..\engine\scripts\makedmt.py */

#ifndef __DOOMSDAY_PLAY_PUBLIC_MAP_DATA_TYPES_H__
#define __DOOMSDAY_PLAY_PUBLIC_MAP_DATA_TYPES_H__

#define DMT_VERTEX_POS DDVT_FLOAT


#define DMT_SEG_SIDEDEF DDVT_PTR

#define DMT_SEG_V DDVT_PTR // [Start, End] of the segment.
#define DMT_SEG_LINEDEF DDVT_PTR
#define DMT_SEG_SEC DDVT_PTR
#define DMT_SEG_SUBSECTOR DDVT_PTR
#define DMT_SEG_BACKSEG DDVT_PTR
#define DMT_SEG_ANGLE DDVT_ANGLE
#define DMT_SEG_SIDE DDVT_BYTE // 0=front, 1=back
#define DMT_SEG_FLAGS DDVT_BYTE
#define DMT_SEG_LENGTH DDVT_FLOAT // Accurate length of the segment (v1 -> v2).
#define DMT_SEG_OFFSET DDVT_FLOAT

#define DMT_SUBSECTOR_SEGCOUNT DDVT_UINT
#define DMT_SUBSECTOR_SEGS DDVT_PTR // [segcount] size.
#define DMT_SUBSECTOR_POLYOBJ DDVT_PTR // NULL, if there is no polyobj.
#define DMT_SUBSECTOR_SECTOR DDVT_PTR

#define DMT_MATERIAL_MNAMESPACE DDVT_INT
#define DMT_MATERIAL_FLAGS DDVT_SHORT // MATF_* flags
#define DMT_MATERIAL_WIDTH DDVT_SHORT // Defined width & height of the material (not texture!).
#define DMT_MATERIAL_HEIGHT DDVT_SHORT

#define DMT_SURFACE_FLAGS DDVT_INT // SUF_ flags
#define DMT_SURFACE_MATERIAL DDVT_PTR
#define DMT_SURFACE_BLENDMODE DDVT_BLENDMODE
#define DMT_SURFACE_NORMAL DDVT_FLOAT // Surface normal
#define DMT_SURFACE_OFFSET DDVT_FLOAT // [X, Y] Planar offset to surface material origin.
#define DMT_SURFACE_RGBA DDVT_FLOAT // Surface color tint

#define DMT_PLANE_SOUNDORG DDVT_PTR // Sound origin for plane
#define DMT_PLANE_SECTOR DDVT_PTR // Owner of the plane (temp)
#define DMT_PLANE_HEIGHT DDVT_FLOAT // Current height
#define DMT_PLANE_GLOW DDVT_FLOAT // Glow amount
#define DMT_PLANE_GLOWRGB DDVT_FLOAT // Glow color
#define DMT_PLANE_TARGET DDVT_FLOAT // Target height
#define DMT_PLANE_SPEED DDVT_FLOAT // Move speed

#define DMT_SECTOR_VALIDCOUNT DDVT_INT // if == validCount, already checked.
#define DMT_SECTOR_LIGHTLEVEL DDVT_FLOAT
#define DMT_SECTOR_RGB DDVT_FLOAT
#define DMT_SECTOR_MOBJLIST DDVT_PTR // List of mobjs in the sector.
#define DMT_SECTOR_LINEDEFCOUNT DDVT_UINT
#define DMT_SECTOR_LINEDEFS DDVT_PTR // [lineDefCount+1] size.
#define DMT_SECTOR_SSECTORCOUNT DDVT_UINT
#define DMT_SECTOR_SSECTORS DDVT_PTR // [ssectorCount+1] size.
#define DMT_SECTOR_SOUNDORG DDVT_PTR
#define DMT_SECTOR_PLANECOUNT DDVT_UINT
#define DMT_SECTOR_REVERB DDVT_FLOAT

#define DMT_SIDEDEF_SEGCOUNT DDVT_UINT
#define DMT_SIDEDEF_SEGS DDVT_PTR // [segcount] size, segs arranged left>right
#define DMT_SIDEDEF_LINE DDVT_PTR
#define DMT_SIDEDEF_SECTOR DDVT_PTR
#define DMT_SIDEDEF_FLAGS DDVT_SHORT

#define DMT_LINEDEF_SEC DDVT_PTR

#define DMT_LINEDEF_V DDVT_PTR
#define DMT_LINEDEF_SIDEDEFS DDVT_PTR
#define DMT_LINEDEF_FLAGS DDVT_INT // Public DDLF_* flags.
#define DMT_LINEDEF_SLOPETYPE DDVT_INT
#define DMT_LINEDEF_VALIDCOUNT DDVT_INT
#define DMT_LINEDEF_DX DDVT_FLOAT
#define DMT_LINEDEF_DY DDVT_FLOAT
#define DMT_LINEDEF_BBOX DDVT_FLOAT

#define DMT_NODE_BBOX DDVT_FLOAT // Bounding box for each child.
#define DMT_NODE_CHILDREN DDVT_UINT // If NF_SUBSECTOR it's a subsector.

#endif

0 comments on commit bdae104

Please sign in to comment.