Commit graph

91 commits

Author SHA1 Message Date
Christoph Oelckers
998ac01157 - manual merge of all NBlood changes that couldn't get cherry picked. 2019-09-21 13:02:17 +02:00
nukeykt
b13bdf50be RFS parser wip
# Conflicts:
#	.gitignore
#	platform/Windows/nblood.vcxproj.filters
2019-09-21 11:46:37 +02:00
nukeykt
9c5cbd6308 Delete pqueue.cpp 2019-09-21 10:18:20 +02:00
nukeykt
75d2e81e98 Move midi stuff to audiolib
# Conflicts:
#	platform/Windows/eduke32.vcxproj
#	platform/Windows/nblood.vcxproj.filters
#	source/audiolib/include/al_midi.h
#	source/audiolib/include/opl3.h
#	source/audiolib/include/oplmidi.h
#	source/audiolib/src/_al_midi.h
#	source/audiolib/src/_oplmidi.h
#	source/audiolib/src/al_midi.cpp
#	source/audiolib/src/opl3.cpp
#	source/audiolib/src/oplmidi.cpp
#	source/duke3d/Dependencies.mak
#	source/duke3d/src/sdlmusic.cpp
2019-09-21 09:37:07 +02:00
terminx
8de955053c Update libxmp-lite
git-svn-id: https://svn.eduke32.com/eduke32@8132 1a8010ca-5511-0410-912e-c29ae57300e0
2019-09-20 23:29:40 +02:00
hendricks266
475743424f Make sjson its own object
git-svn-id: https://svn.eduke32.com/eduke32@8091 1a8010ca-5511-0410-912e-c29ae57300e0
2019-09-20 23:19:58 +02:00
Christoph Oelckers
d0a49c3278 - moved 4 more. 2019-09-20 23:12:07 +02:00
Christoph Oelckers
b34c48962a - removed some unused files. 2019-09-20 22:55:44 +02:00
Christoph Oelckers
3b8b2b1fe0 - it compiles again. 2019-09-20 22:44:42 +02:00
Christoph Oelckers
be29d3a2df - removed the remains of the polymer renderer.
This cannot be reused in its current form, maybe it can help later.
2019-09-20 22:37:24 +02:00
Christoph Oelckers
1b20e5d4da - 3 more files moved out of 'build' folder.
# Conflicts:
#	platform/Windows/build.vcxproj
2019-09-20 22:34:34 +02:00
Christoph Oelckers
977614dea8 - two more headers to move to Thirdparty. 2019-09-20 22:33:47 +02:00
Christoph Oelckers
c9111a6c7a - one more.
# Conflicts:
#	platform/Windows/build.vcxproj.filters
2019-09-20 22:33:35 +02:00
Christoph Oelckers
ce260526cb - moved fix16 to thirdparty as well and removed the now unused assembly files.
# Conflicts:
#	platform/Windows/build.vcxproj
2019-09-20 22:21:31 +02:00
Christoph Oelckers
f3d01e8244 - moved compression utilities to a 'thirdparty' folder to get them out of the way.
# Conflicts:
#	platform/Windows/build.vcxproj
#	platform/Windows/props/build_common.props
2019-09-20 22:20:53 +02:00
terminx
04811f21f4 Replace separate timer implementations in SDL and Winlayer with a shared implementation based on std::chrono
git-svn-id: https://svn.eduke32.com/eduke32@7976 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	platform/Windows/build.vcxproj
#	platform/Windows/build.vcxproj.filters
#	source/build/src/mdsprite.cpp
2019-09-20 16:09:24 +02:00
hendricks266
6b3a6434e3 Add SetupAPI.lib to VS build system for SDL 2.0.10
git-svn-id: https://svn.eduke32.com/eduke32@7965 1a8010ca-5511-0410-912e-c29ae57300e0
2019-09-20 16:06:02 +02:00
hendricks266
d11c71c39d VS made me update the platform toolset here
git-svn-id: https://svn.eduke32.com/eduke32@7962 1a8010ca-5511-0410-912e-c29ae57300e0
2019-09-20 16:04:59 +02:00
pogokeen
e1f4800e3a build.vcxproj: Execute custom build tools & step before BuildGenerateSources
git-svn-id: https://svn.eduke32.com/eduke32@7885 1a8010ca-5511-0410-912e-c29ae57300e0
2019-09-20 15:34:33 +02:00
hendricks266
0cd74a6782 Add sjson to project
git-svn-id: https://svn.eduke32.com/eduke32@7812 1a8010ca-5511-0410-912e-c29ae57300e0
2019-09-20 15:17:43 +02:00
pogokeen
12ce6a78fe Fix parallel build by switching to generating .obj files from .glsl files and treat the shader source as an externed global resolved at link time.
Additionally, remove the no longer necessary shader generated headers folder from .gitignore

git-svn-id: https://svn.eduke32.com/eduke32@7793 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	.gitignore
#	source/build/src/polymost.cpp
2019-09-20 15:10:56 +02:00
pogokeen
4a0071d3ef Support separate .glsl shaders in Windows MSVC builds
git-svn-id: https://svn.eduke32.com/eduke32@7785 1a8010ca-5511-0410-912e-c29ae57300e0
2019-09-20 15:10:07 +02:00
terminx
0556fe1738 Simplify map structure tracker overloads
Due to less branching, this is actually faster than trying to be clever.

git-svn-id: https://svn.eduke32.com/eduke32@7690 1a8010ca-5511-0410-912e-c29ae57300e0
2019-09-20 10:15:17 +02:00
Christoph Oelckers
81ca063f06 - fixed SDK versions. 2019-09-20 09:19:11 +02:00
Christoph Oelckers
0254bf82d3 - added NBlood source. 2019-09-20 00:42:45 +02:00
terminx
0f613a227d Exclude vfs.cpp from VS project to suppress linker warning about an object without symbols
git-svn-id: https://svn.eduke32.com/eduke32@7605 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	platform/Windows/build.vcxproj.filters
2019-09-19 14:52:28 +02:00
Christoph Oelckers
795f25bd68 - manually fix conflict 2019-09-19 14:32:05 +02:00
terminx
e59f8e3b71 Use FORCE_INLINE and CONSTEXPR where appropriate in the Q16 fixed point math library
git-svn-id: https://svn.eduke32.com/eduke32@7588 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	platform/Windows/build.vcxproj.filters
2019-09-19 14:30:22 +02:00
hendricks266
b6d794ddba Add VoidSW VS project files.
Patch from Striker.

git-svn-id: https://svn.eduke32.com/eduke32@7498 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	platform/Windows/eduke32.sln
2019-09-19 14:05:02 +02:00
hendricks266
ac8dabb0fb Rename net.* to network.*
git-svn-id: https://svn.eduke32.com/eduke32@7443 1a8010ca-5511-0410-912e-c29ae57300e0
2019-09-19 12:20:45 +02:00
Christoph Oelckers
588fbc26f9 - added RedNukem project. 2019-09-19 00:27:46 +02:00
Christoph Oelckers
e0f823a492 - refactored texture setup to use an intermediate layer. 2019-09-18 22:16:15 +02:00
Christoph Oelckers
a49fe10a61 - we do not need WII and iOS. 2019-09-17 20:30:06 +02:00
Christoph Oelckers
4df159378b - more uselessness eliminated 2019-09-17 20:28:28 +02:00
Christoph Oelckers
d63cf04e06 - removed the compressed texture cache.
This is a pointless relic from the past and makes zero sense with modern graphics hardware.
2019-09-17 20:18:18 +02:00
Christoph Oelckers
b1763a8f4a - hooked up the texture management.
Not in active use yet!
2019-09-17 19:03:42 +02:00
Christoph Oelckers
9edf6be10d - texture sampler class added, not used yet. 2019-09-16 22:56:48 +02:00
Christoph Oelckers
318009fd69 - added a centralized drawer and converted the main geometry drawer to use it. 2019-09-16 19:35:04 +02:00
Christoph Oelckers
524f6cf5e5 - crap 2019-09-13 22:18:37 +02:00
Christoph Oelckers
aecdd9b4c5 - this is the state I want to build. 2019-09-13 21:43:05 +02:00
terminx
1a90903cda Add vfs.cpp and vfs.h to the VS projects
git-svn-id: https://svn.eduke32.com/eduke32@7385 1a8010ca-5511-0410-912e-c29ae57300e0
2019-03-03 11:15:16 +00:00
hendricks266
7414f29348 Add buildvfs, abstraction layer for file I/O.
Currently it passes calls through to the system libraries as before.

Also adds an incomplete implementation on PhysFS.

git-svn-id: https://svn.eduke32.com/eduke32@7359 1a8010ca-5511-0410-912e-c29ae57300e0
2019-03-01 08:51:50 +00:00
terminx
43d140eaee Revert "SDL 2.0.9"
git-svn-id: https://svn.eduke32.com/eduke32@7318 1a8010ca-5511-0410-912e-c29ae57300e0
2019-01-23 23:00:03 +00:00
terminx
ccebff2c85 Update libcompat-to-msvc.a for 32-bit so we can link against SDL 2.0.9
git-svn-id: https://svn.eduke32.com/eduke32@7225 1a8010ca-5511-0410-912e-c29ae57300e0
2018-11-18 18:13:40 +00:00
terminx
7403ff229e Fix Polymer checkbox not showing up in the startup window in Visual Studio builds
git-svn-id: https://svn.eduke32.com/eduke32@7217 1a8010ca-5511-0410-912e-c29ae57300e0
2018-11-18 18:12:49 +00:00
terminx
af7c8efaf8 Add a couple missing headers to build.vcxproj
git-svn-id: https://svn.eduke32.com/eduke32@7192 1a8010ca-5511-0410-912e-c29ae57300e0
2018-11-18 18:10:27 +00:00
terminx
6a97d4ea46 SDL 2.0.9
git-svn-id: https://svn.eduke32.com/eduke32@7185 1a8010ca-5511-0410-912e-c29ae57300e0
2018-11-18 18:09:27 +00:00
hendricks266
fd175086a3 Move the LZW compression functions out of cache1d.cpp into their own object, klzw.cpp.
This eliminates the hackiness of libcache1d.so (now libkzlw.so) and CACHE1D_COMPRESS_ONLY.

git-svn-id: https://svn.eduke32.com/eduke32@7140 1a8010ca-5511-0410-912e-c29ae57300e0
2018-11-05 07:28:07 +00:00
terminx
c49ff8696d Drop C++ standard used in Visual Studio builds from C++17 to C++14, to be more consistent with our GNU makefile.
git-svn-id: https://svn.eduke32.com/eduke32@7136 1a8010ca-5511-0410-912e-c29ae57300e0
2018-10-25 23:34:15 +00:00
terminx
2160d22788 Move editor headers into correct VS project
git-svn-id: https://svn.eduke32.com/eduke32@7118 1a8010ca-5511-0410-912e-c29ae57300e0
2018-10-25 23:32:21 +00:00