Commit graph

54 commits

Author SHA1 Message Date
alexey.lysiuk
caeeeaa4cf Add missing files to Visual Studio projects
Remove duplicate `AdditionalIncludeDirectories` attribute from SDL2 project as it breaks upgrade to .vcxproj format
2023-11-07 10:05:17 +02:00
Shpoike
a3ce19fa74 Merge tag 'quakespasm-0.94.4' into qss 2022-07-15 13:24:04 +01:00
Ozkan Sezer
03b7ef9f05 switch from libmikmod to libxmp for tracker music. 2022-05-14 10:37:10 +03:00
Shpoike
26f0bc4682 Merge remote-tracking branch 'sf/master' into qss
(cl_startdemos stripped in favour of QSS's existing cl_demoreel cvar. osx project files ignored.)
2022-04-27 22:32:40 +01:00
Ozkan Sezer
b0767dbc90 add back snd_modplug (disabled, for future ref.), update project files. 2022-03-29 17:04:02 +03:00
Ozkan Sezer
6cf4bbc198 reverted the previous NO_WINSDKVER_H patch - not needed after latest SDL 2021-11-06 12:00:00 +03:00
Ozkan Sezer
2492689d9e define NO_WINSDKVER_H for windows SDL2 builds
SDL_config_windows.h from development version of SDL added inclusion of
winsdkver.h which may not be available in old SDKs.  we have no use for
the functionality provided by it, therefore disable it.
2021-11-05 10:51:10 +03:00
Ozkan Sezer
3af9ad4e04 2021 rerelease support: read the localization file from QuakeEX.kpf
uses a customized and highly stripped down miniz version. also move
localization file reads to SDL_RWops, and update the documentation.
2021-09-01 14:00:00 +03:00
clickdevin
7bc708c607 Add mdfour.c to VS projects 2021-08-31 04:59:13 +01:00
Eric Wasylishen
dd0d414b17 VS project: Fix failure to find "winsock2.h" (#8)
and undefined reference to __imp__freeaddrinfo@4 (link Ws2_32.lib)
2021-08-31 04:59:12 +01:00
Spike
fe63ebc870 Windows... Messed up access modes. 2021-08-31 04:59:11 +01:00
Spike
d76ca606bf All changes present in QSS-R7, plus
md3 support
quoth/etc bug fix
strzone bug fix
png/jpg replacement wall textures
rewrote mdl rendering to always use arrays, relaxing vertex+tri limits.
removed static ents limit
fixed ambient_level not working at high framerates.
2021-08-31 04:59:11 +01:00
Ozkan Sezer
ffe43cf024 snd_mp3.c: moved mp3 tag stuff into a separate module snd_mp3tag.c
so that it can be used in snd_mpg123.c, too, if needed.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1658 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-12-12 11:37:32 +00:00
Ozkan Sezer
01b01c0a13 SDL windows: move SDL_main sources into their own directory
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1455 af15c1b1-3010-417e-b628-4374ebc0bcbd
2017-07-29 05:36:30 +00:00
Ozkan Sezer
d1f391b383 remove all libmodplug code
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1435 af15c1b1-3010-417e-b628-4374ebc0bcbd
2017-07-27 12:50:17 +00:00
Ozkan Sezer
3d4c9cd2b5 added _WINSOCK_DEPRECATED_NO_WARNINGS among the preprocessor definitions
in Visual Studio project files.  fixes C4996 warnings: "'inet_ntoa': Use
inet_ntop() or InetNtop() instead" from VS2013 and newer.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1377 af15c1b1-3010-417e-b628-4374ebc0bcbd
2017-02-14 11:00:29 +00:00
Ozkan Sezer
306b04044e work-around VS2015 stdio issue for SDL1.2 builds: add SDL_win32_main.c
to the source tree, build it everytime with MSVC in SDL1.2 builds, and
remove SDLmain.lib. (see: http://stackoverflow.com/questions/30412951 )

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1376 af15c1b1-3010-417e-b628-4374ebc0bcbd
2017-02-13 14:39:37 +00:00
Ozkan Sezer
5025e9e457 added tracker music support using libxmp >= v4.2.0 (off by default.)
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1364 af15c1b1-3010-417e-b628-4374ebc0bcbd
2016-12-07 09:24:49 +00:00
Ozkan Sezer
859eefccc4 minor reorganization of windows includes
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1194 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-18 00:00:05 +00:00
Eric Wasylishen
2e792e917d Windows/VS projects: add post build event to copy dll files to build target directory, to avoid having to do it by hand
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1176 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-02 03:13:48 +00:00
Eric Wasylishen
85c0d47043 Unzip SDL2.zip, SDL.zip into quakespasm/Windows
Update .cbp and .vcproj file to refer to our copy of SDL/SDL2 rather than looking in C:\

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1174 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-02 03:13:16 +00:00
Ozkan Sezer
fdb39f3206 oslibs (macosx, windows): recompile SDL2 from hg-20150202 snapshot
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1159 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-02-04 00:00:45 +00:00
Ozkan Sezer
42def503ff recompiled SDL2
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1124 af15c1b1-3010-417e-b628-4374ebc0bcbd
2014-10-18 11:04:29 +00:00
Ozkan Sezer
3de3dc97ad add an sdl2 target to msvc builds
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1104 af15c1b1-3010-417e-b628-4374ebc0bcbd
2014-10-12 12:38:07 +00:00
Ozkan Sezer
b2eebb0fe0 recompiled SDL1.2 for windows
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1102 af15c1b1-3010-417e-b628-4374ebc0bcbd
2014-10-12 09:27:44 +00:00
Ozkan Sezer
9f8f2865f6 remove dirent stuff from msvc project after r946.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@947 af15c1b1-3010-417e-b628-4374ebc0bcbd
2014-08-01 11:25:11 +00:00
Ozkan Sezer
24644fc262 more project file updates.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@920 af15c1b1-3010-417e-b628-4374ebc0bcbd
2014-06-21 17:55:41 +00:00
Ozkan Sezer
d941ee83db revert r903 and the old conback hack commits. change the engine
to load id1/quakespasm.pak for content customizations.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@904 af15c1b1-3010-417e-b628-4374ebc0bcbd
2014-04-27 08:28:16 +00:00
Ozkan Sezer
a99f95af94 add mikmod/modplug codec libs for windows and macosx.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@870 af15c1b1-3010-417e-b628-4374ebc0bcbd
2013-09-28 07:28:17 +00:00
Ozkan Sezer
7f41bfa64a added flac music support.
it is not enabled by default, edit the Makefile for USE_CODEC_FLAC,
or add USE_CODEC_FLAC=1 to your make command line arguments. Xcode
project file still needs updating for this.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@857 af15c1b1-3010-417e-b628-4374ebc0bcbd
2013-07-21 14:02:06 +00:00
Ozkan Sezer
21258e595c merged the opus codec support patch
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@856 af15c1b1-3010-417e-b628-4374ebc0bcbd
2013-07-18 07:03:11 +00:00
Ozkan Sezer
0116a1ba90 oslibs: updated msinttypes to r29 from mainstream googlecode.com
repository.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@852 af15c1b1-3010-417e-b628-4374ebc0bcbd
2013-06-24 08:10:12 +00:00
Ozkan Sezer
3e1b97a64f recompiled SDL for win32 and win64 from latest v1.2.15 (hg:rev/5273dfd19a5e)
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@620 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-01-22 15:50:35 +00:00
Ozkan Sezer
6f3a30351f Recompiled all win64 dlls and import libraries.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@596 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-01-05 10:00:25 +00:00
Ozkan Sezer
ee951cfd44 recompiled SDL for windows from HG snapshot 19c7412a6345
(v1.2.15, 2011-12-30, SDL-1.2 branch. this time for x86.)

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@587 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-30 16:00:18 +00:00
Ozkan Sezer
3f82cf4c91 recompiled SDL for windows from HG snapshot 19c7412a6345
(v1.2.15, 2011-12-30, SDL-1.2 branch.)

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@586 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-30 15:33:08 +00:00
Ozkan Sezer
b1d6e4c8d7 deleted winquake.h from visual studio project file
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@585 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-30 14:12:10 +00:00
Ozkan Sezer
05e0d3b331 recompiled SDL for windows from HG snapshot adbed7ec5704
(v1.2.15, 2011-12-29, SDL-1.2 branch)

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@581 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-30 09:16:00 +00:00
Ozkan Sezer
1ff7413631 added strlcat.c and strlcpy.c to build.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@559 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-27 11:11:24 +00:00
Ozkan Sezer
cdf1f6eef0 updated visual studio project file for newly added files
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@537 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-24 09:10:49 +00:00
Ozkan Sezer
4ff1f1f5bb recompiled SDL library from git snapshot a04171d6fa11 (2011-11-07, SDL-1.2 branch)
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@501 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-11-07 23:02:02 +00:00
Ozkan Sezer
433f753405 recompiled all windows x64 dlls using a new gcc-4.5-based toolchain.
also updated the SDL library to HG/1.2 branch 2011-10-14 with
patch from http://bugzilla.libsdl.org/show_bug.cgi?id=1254#c15.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@497 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-10-26 12:11:25 +00:00
Ozkan Sezer
187ec835c3 updated windows SDL libraries to HG/1.2 branch 2011-09-21 with two
patches applied:
http://bugzilla.libsdl.org/show_bug.cgi?id=1254#c15
http://bugzilla.libsdl.org/show_bug.cgi?id=1310

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@491 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-10-03 14:00:16 +00:00
Ozkan Sezer
cf3c092a1d recompiled all windows x64 libraries using the latest mingw-w64 v1.0 runtime rev.4360.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@478 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-08-10 05:05:36 +00:00
Ozkan Sezer
3fd7356571 fixed vorbisfile link order for static linkage if one chooses to do so.
deleted unused vorbisenc.h header.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@472 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-07-21 09:03:35 +00:00
Ozkan Sezer
d546301342 Recompiled all windows x64 libraries using the latest mingw-w64 tools.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@456 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-06-02 07:56:15 +00:00
Ozkan Sezer
d8abc078e1 recompiled SDL.dll for windows x64 from 2010-11-11 snapshot.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@453 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-05-15 10:33:26 +00:00
Ozkan Sezer
2bcdb4b39f just properly use (u)intptr_t where necessary and don't do the cheap hack
of using size_t instead of it.  include stdint.h in q_stdinc.h for it.
for Visual Studio earlier than version 2010, use the header provided by
the msinttypes project.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@439 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-04-01 14:55:45 +00:00
Ozkan Sezer
45cc82c25d updated visual studio project file.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@399 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-01-13 14:10:16 +00:00
Ozkan Sezer
11270d5b2c changed makefiles to use 1/0 instead of yes/no for the codec options.
made quakespasm custom conback embedding optional, still defaulting to 1.
the code requires USE_QS_CONBACK preprocessor definition.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@392 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-01-12 09:32:22 +00:00